Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

13 files changed, 35 insertions, 157 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 4c2676220..5285aed4e 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,10 +1,9 @@
 # Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
-# $FreeBSD: head/devel/glib20/Makefile 344586 2014-02-16 15:40:34Z kwm $
+# $FreeBSD$
 #   $MCom$
 
 PORTNAME=	glib
-PORTVERSION=	2.38.2
-PORTREVISION=	2
+PORTVERSION=	2.40.0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -14,7 +13,7 @@ COMMENT=	Some useful routines of C programming (current stable version)
 
 LICENSE=	LGPL20
 
-USE_XZ=		yes
+USES=		tar:xz
 PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
@@ -26,7 +25,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 # iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
 # (wchar_t is used by glibmm, rawtherapee triggered this)
-USES=		gettext gmake iconv:wchar_t libtool pathfix perl5 pkgconfig \
+USES+=		gettext gmake iconv:wchar_t libtool pathfix perl5 pkgconfig \
 		shebangfix
 USE_PYTHON=	yes
 PYTHON_PY3K_PLIST_HACK=	yes
@@ -41,7 +40,7 @@ INSTALL_TARGET=	install-strip
 
 SHEBANG_FILES=	*/*.pl glib/gen-iswide-table.py
 
-LIBVERSION=	0.3800.2
+LIBVERSION=	0.4000.0
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 OPTIONS_DEFINE=	COLLATION_FIX DEBUG GDB
@@ -99,8 +98,6 @@ PLIST_SUB+=	GDB="@comment "
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug=yes \
 			--disable-silent-rules
-.else
-CONFIGURE_ARGS+=	--disable-modular-tests
 .endif
 
 post-patch:
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index b77c4405f..f7385a578 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.38.2.tar.xz) = 056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734
-SIZE (gnome2/glib-2.38.2.tar.xz) = 6718296
+SHA256 (gnome2/glib-2.40.0.tar.xz) = 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5
+SIZE (gnome2/glib-2.40.0.tar.xz) = 7016228
diff --git a/devel/glib20/files/extra-glib_gdbscripts b/devel/glib20/files/extra-glib_gdbscripts
index 0d82e625a..bdde1c66c 100644
--- a/devel/glib20/files/extra-glib_gdbscripts
+++ b/devel/glib20/files/extra-glib_gdbscripts
@@ -1,6 +1,6 @@
---- glib/Makefile.in.orig	2013-09-26 18:20:03.000000000 +0200
-+++ glib/Makefile.in	2013-09-26 18:21:19.000000000 +0200
-@@ -2824,7 +2824,7 @@
+--- glib/Makefile.in.orig	2014-03-09 10:06:29.765325337 +0000
++++ glib/Makefile.in	2014-03-09 10:06:46.935323979 +0000
+@@ -2834,7 +2834,7 @@
  info-am:
  
  install-data-am: install-data-local install-deprecatedincludeHEADERS \
@@ -9,7 +9,7 @@
  	install-glibsubincludeHEADERS \
  	install-installed_testLTLIBRARIES \
  	install-installed_testPROGRAMS install-installed_testSCRIPTS \
-@@ -3125,8 +3125,6 @@
+@@ -3084,8 +3084,6 @@
  	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
  
  install-data-hook: libglib-gdb.py
diff --git a/devel/glib20/files/extra-gobject_gdbscripts b/devel/glib20/files/extra-gobject_gdbscripts
index 57daae32c..8501b6f61 100644
--- a/devel/glib20/files/extra-gobject_gdbscripts
+++ b/devel/glib20/files/extra-gobject_gdbscripts
@@ -1,6 +1,6 @@
---- gobject/Makefile.in.orig	2013-09-26 18:22:19.000000000 +0200
-+++ gobject/Makefile.in	2013-09-26 18:23:11.000000000 +0200
-@@ -2001,7 +2001,7 @@
+--- gobject/Makefile.in.orig	2014-03-09 10:09:41.628312066 +0000
++++ gobject/Makefile.in	2014-03-09 10:09:48.181311433 +0000
+@@ -2003,7 +2003,7 @@
  
  info-am:
  
@@ -9,7 +9,7 @@
  	install-installed_testLTLIBRARIES \
  	install-installed_testPROGRAMS install-installed_testSCRIPTS \
  	install-installed_test_metaDATA \
-@@ -2279,9 +2279,7 @@
+@@ -2230,9 +2230,7 @@
  uninstall-gdb:
  	-rm -r $(DESTDIR)$(datadir)/gdb
  
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-configure
index 2a22839ea..331a77152 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-configure
@@ -1,24 +1,5 @@
 --- configure.orig	2013-09-26 18:07:07.000000000 +0200
 +++ configure	2013-09-26 18:08:15.000000000 +0200
-@@ -603,6 +603,9 @@
- #ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
-@@ -5977,7 +5980,7 @@
- fi
- 
- GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
--ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
-+ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
- 
- 
-  if test "x$with_runtime_libdir" != "x"; then
 @@ -7643,13 +7646,12 @@
  
        ;;
@@ -43,15 +24,6 @@
  $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
  
      ;;
-@@ -23369,7 +23372,7 @@
- fi
- done
- 
--for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
-+for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 @@ -27013,10 +27016,10 @@
    *android*)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-docs_reference_Makefile.in
index 8e3dfab92..8e3dfab92 100644
--- a/devel/glib20/files/patch-ah
+++ b/devel/glib20/files/patch-docs_reference_Makefile.in
diff --git a/devel/glib20/files/patch-gio_fam_Makefile.in b/devel/glib20/files/patch-gio_fam_Makefile.in
deleted file mode 100644
index 033ff3f5d..000000000
--- a/devel/glib20/files/patch-gio_fam_Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- gio/fam/Makefile.in.orig	2012-03-07 21:07:42.000000000 +0100
-+++ gio/fam/Makefile.in	2012-03-07 21:08:30.000000000 +0100
-@@ -87,9 +87,7 @@
- am__installdirs = "$(DESTDIR)$(giomoduledir)"
- LTLIBRARIES = $(giomodule_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
--	$(top_builddir)/gobject/libgobject-2.0.la \
--	$(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
-+libgiofam_la_DEPENDENCIES =  \
- 	$(am__DEPENDENCIES_1)
- am__objects_1 =
- am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
-@@ -402,9 +400,9 @@
- 
- libgiofam_la_LDFLAGS = $(module_flags)
- libgiofam_la_LIBADD = \
--		$(top_builddir)/gio/libgio-2.0.la \
--		$(top_builddir)/gobject/libgobject-2.0.la \
--		$(top_builddir)/glib/libglib-2.0.la \
-+		-lgio-2.0 \
-+		-lgobject-2.0 \
-+		-lglib-2.0 \
- 		$(GLIB_LIBS) \
- 		$(FAM_LIBS) \
- 		$(NULL)
-@@ -843,7 +841,7 @@
- 
- install-data-hook:
- 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
--		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
-+		gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
- 	fi
- 
- uninstall-local:
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
index debd8a926..30247a52e 100644
--- a/devel/glib20/files/patch-gio_gunixmounts.c
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -27,47 +27,6 @@
  #include <sys/ucred.h>
  #include <sys/mount.h>
  #include <fstab.h>
-@@ -243,22 +249,29 @@ g_unix_is_mount_path_system_internal (co
-     "/",              /* we already have "Filesystem root" in Nautilus */ 
-     "/bin",
-     "/boot",
-+    "/compat/linux/proc",
-+    "/compat/linux/sys",
-     "/dev",
-     "/etc",
-     "/home",
-     "/lib",
-     "/lib64",
-+    "/libexec",
-     "/live/cow",
-     "/live/image",
-     "/media",
-     "/mnt",
-     "/opt",
-+    "/rescue",
-     "/root",
-     "/sbin",
-     "/srv",
-     "/tmp",
-     "/usr",
-     "/usr/local",
-+    "/usr/obj",
-+    "/usr/ports",
-+    "/usr/src",
-     "/var",
-     "/var/crash",
-     "/var/local",
-@@ -299,8 +312,10 @@ guess_system_internal (const char *mount
-     "devfs",
-     "devpts",
-     "ecryptfs",
-+    "fdescfs",
-     "kernfs",
-     "linprocfs",
-+    "nullfs",
-     "proc",
-     "procfs",
-     "ptyfs",
 @@ -1126,6 +1141,10 @@ get_mounts_timestamp (void)
        if (stat (monitor_file, &buf) == 0)
  	return (guint64)buf.st_mtime;
diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c
index b22563047..21316e02f 100644
--- a/devel/glib20/files/patch-gio_gunixvolume.c
+++ b/devel/glib20/files/patch-gio_gunixvolume.c
@@ -1,14 +1,14 @@
---- gio/gunixvolume.c.orig	2009-11-30 04:35:27.000000000 +0100
-+++ gio/gunixvolume.c	2009-12-08 19:32:03.000000000 +0100
-@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume            
+--- gio/gunixvolume.c.orig	2014-03-20 04:50:45.000000000 +0100
++++ gio/gunixvolume.c	2014-03-24 20:44:40.000000000 +0100
+@@ -356,9 +356,14 @@
                       gpointer             user_data)
  {
    GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
 +#ifdef __FreeBSD__
-+  char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
++  const gchar *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
 +  argv[2] = unix_volume->device_path;
 +#else
-   char *argv[] = { "eject", NULL, NULL };
+   const gchar *argv[] = { "eject", NULL, NULL };
  
    argv[1] = unix_volume->device_path;
 +#endif
diff --git a/devel/glib20/files/patch-glib_deprecated_gthread.h b/devel/glib20/files/patch-glib_deprecated_gthread.h
deleted file mode 100644
index 889976f1f..000000000
--- a/devel/glib20/files/patch-glib_deprecated_gthread.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./glib/deprecated/gthread.h.orig	2012-05-27 17:07:04.000000000 +0200
-+++ ./glib/deprecated/gthread.h	2012-05-27 17:07:19.000000000 +0200
-@@ -120,6 +120,7 @@
-                                 gpointer          user_data);
- 
- #ifndef G_OS_WIN32
-+#include <sys/types.h>
- #include <pthread.h>
- #endif
- 
diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c
index e86fb7ffd..3904e106a 100644
--- a/devel/glib20/files/patch-glib_tests_gdatetime.c
+++ b/devel/glib20/files/patch-glib_tests_gdatetime.c
@@ -1,20 +1,20 @@
---- glib/tests/gdatetime.c.orig	2013-03-13 13:39:09.000000000 +0000
-+++ glib/tests/gdatetime.c	2013-03-28 10:15:49.000000000 +0000
-@@ -1276,7 +1276,7 @@
+--- glib/tests/gdatetime.c.orig	2014-03-09 10:29:13.925231275 +0000
++++ glib/tests/gdatetime.c	2014-03-09 10:30:18.235227107 +0000
+@@ -1322,7 +1322,7 @@
    gint i1, i2;
  
  #ifdef G_OS_UNIX
--  tz = g_time_zone_new ("Canada/Eastern");
-+  tz = g_time_zone_new ("America/Montreal");
+-  tz = g_time_zone_new ("America/Toronto");
++  tz = g_time_zone_new ("America/Toronto Eastern");
  #elif defined G_OS_WIN32
    tz = g_time_zone_new ("Eastern Standard Time");
  #endif
-@@ -1309,7 +1309,7 @@
+@@ -1355,7 +1355,7 @@
    gint i1, i2;
  
  #ifdef G_OS_UNIX
--  tz = g_time_zone_new ("Canada/Eastern");
-+  tz = g_time_zone_new ("America/Montreal");
+-  tz = g_time_zone_new ("America/Toronto");
++  tz = g_time_zone_new ("America/Toronto Eastern");
  #elif defined G_OS_WIN32
    tz = g_time_zone_new ("Eastern Standard Time");
  #endif
diff --git a/devel/glib20/files/patch-gobject_gtype.h b/devel/glib20/files/patch-gobject_gtype.h
deleted file mode 100644
index f549fb2d2..000000000
--- a/devel/glib20/files/patch-gobject_gtype.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- gobject/gtype.h.orig	2014-03-08 01:02:56.790527382 +0000
-+++ gobject/gtype.h	2014-03-08 01:03:33.934524502 +0000
-@@ -1674,6 +1674,7 @@
- \
- _G_DEFINE_TYPE_EXTENDED_CLASS_INIT(TypeName, type_name) \
- \
-+G_GNUC_UNUSED \
- static inline gpointer \
- type_name##_get_instance_private (TypeName *self) \
- { \
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 7075c86cf..7d8fe2f37 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,3 +1,4 @@
+bin/gapplication
 bin/gdbus
 bin/gdbus-codegen
 bin/gio-querymodules
@@ -109,6 +110,7 @@ include/glib-2.0/gio/gnetworkaddress.h
 include/glib-2.0/gio/gnetworking.h
 include/glib-2.0/gio/gnetworkmonitor.h
 include/glib-2.0/gio/gnetworkservice.h
+include/glib-2.0/gio/gnotification.h
 include/glib-2.0/gio/goutputstream.h
 include/glib-2.0/gio/gpermission.h
 include/glib-2.0/gio/gpollableinputstream.h
@@ -141,6 +143,8 @@ include/glib-2.0/gio/gsocketcontrolmessage.h
 include/glib-2.0/gio/gsocketlistener.h
 include/glib-2.0/gio/gsocketservice.h
 include/glib-2.0/gio/gsrvtarget.h
+include/glib-2.0/gio/gsubprocess.h
+include/glib-2.0/gio/gsubprocesslauncher.h
 include/glib-2.0/gio/gtask.h
 include/glib-2.0/gio/gtcpconnection.h
 include/glib-2.0/gio/gtcpwrapperconnection.h
@@ -294,8 +298,9 @@ libdata/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-%%GDB%%share/gdb/auto-load/libglib-2.0.so.0-gdb.py
-%%GDB%%share/gdb/auto-load/libgobject-2.0.so.0-gdb.py
+share/bash-completion/completions/gapplication
+%%GDB%%share/gdb/auto-load/libglib-2.0.so.%%LIBVERSION%%-gdb.py
+%%GDB%%share/gdb/auto-load/libgobject-2.0.so.%%LIBVERSION%%-gdb.py
 share/glib-2.0/codegen/__init__.py
 share/glib-2.0/codegen/__init__.pyc
 share/glib-2.0/codegen/__init__.pyo