Update to 2.24.0.

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

8 files changed, 13 insertions, 63 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 47ecc2f..5285aed 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	glib
-PORTVERSION=	2.39.91
-PORTREVISION=	1
+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.3991.0
+LIBVERSION=	0.4000.0
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 OPTIONS_DEFINE=	COLLATION_FIX DEBUG GDB
@@ -111,13 +110,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|inotify_support=yes|inotify_support=no| ; \
 		s|-Werror|| ; \
 		s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-2.0.so.0.$$(LT_CURRENT).$$(LT_REVISION)-gdb.py|-2.0.so.0-gdb.py|g' \
-		${WRKSRC}/glib/Makefile.in \
-		${WRKSRC}/gobject/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/GConf/gsettings
-#	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.${LIBVERSION}
 
 .include <bsd.port.post.mk>
 
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 1ac9904..f7385a5 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.39.91.tar.xz) = 925cfb341167693e8c0ad3ab8ceb46b80d8d2dc10332bcffcf310e0963bf0ad1
-SIZE (gnome2/glib-2.39.91.tar.xz) = 6994916
+SHA256 (gnome2/glib-2.40.0.tar.xz) = 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5
+SIZE (gnome2/glib-2.40.0.tar.xz) = 7016228
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-configure
index 331a771..331a771 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-configure
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-docs_reference_Makefile.in
index 8e3dfab..8e3dfab 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 033ff3f..0000000
--- 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_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c
index b225630..21316e0 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-gobject_gtype.h b/devel/glib20/files/patch-gobject_gtype.h
deleted file mode 100644
index f549fb2..0000000
--- 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 62291f0..7d8fe2f 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -299,8 +299,8 @@ share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
 share/bash-completion/completions/gapplication
-%%GDB%%share/gdb/auto-load/libglib-2.0.so.0-gdb.py
-%%GDB%%share/gdb/auto-load/libgobject-2.0.so.0-gdb.py
+%%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