[Midnightbsd-cvs] mports: devel/glib20: Update to 2.16.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 30 21:09:04 EDT 2008 

Log Message:
-----------
Update to 2.16.3

Modified Files:
--------------
    mports/devel/glib20:
        Makefile (r1.7 -> r1.8)
        distinfo (r1.3 -> r1.4)
        pkg-plist (r1.3 -> r1.4)
    mports/devel/glib20/files:
        patch-ae (r1.1.1.1 -> r1.2)
        patch-ag (r1.3 -> r1.4)
        patch-ah (r1.1.1.1 -> r1.2)
        patch-glib::libcharset::Makefile.in (r1.1.1.1 -> r1.2)

Removed Files:
-------------
    mports/devel/glib20/files:
        extra-patch-gthread_gthread-posix.c
        patch-glib_gatomic.c

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/glib20/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/glib20/pkg-plist -L devel/glib20/pkg-plist -u -r1.3 -r1.4
--- devel/glib20/pkg-plist
+++ devel/glib20/pkg-plist
@@ -2,6 +2,52 @@
 bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query
+bin/gtester
+bin/gtester-report
+include/gio-unix-2.0/gio/gdesktopappinfo.h
+include/gio-unix-2.0/gio/gunixinputstream.h
+include/gio-unix-2.0/gio/gunixmounts.h
+include/gio-unix-2.0/gio/gunixoutputstream.h
+include/glib-2.0/gio/gappinfo.h
+include/glib-2.0/gio/gasyncresult.h
+include/glib-2.0/gio/gbufferedinputstream.h
+include/glib-2.0/gio/gbufferedoutputstream.h
+include/glib-2.0/gio/gcancellable.h
+include/glib-2.0/gio/gcontenttype.h
+include/glib-2.0/gio/gdatainputstream.h
+include/glib-2.0/gio/gdataoutputstream.h
+include/glib-2.0/gio/gdrive.h
+include/glib-2.0/gio/gfile.h
+include/glib-2.0/gio/gfileattribute.h
+include/glib-2.0/gio/gfileenumerator.h
+include/glib-2.0/gio/gfileicon.h
+include/glib-2.0/gio/gfileinfo.h
+include/glib-2.0/gio/gfileinputstream.h
+include/glib-2.0/gio/gfilemonitor.h
+include/glib-2.0/gio/gfilenamecompleter.h
+include/glib-2.0/gio/gfileoutputstream.h
+include/glib-2.0/gio/gfilterinputstream.h
+include/glib-2.0/gio/gfilteroutputstream.h
+include/glib-2.0/gio/gicon.h
+include/glib-2.0/gio/ginputstream.h
+include/glib-2.0/gio/gio.h
+include/glib-2.0/gio/gioenumtypes.h
+include/glib-2.0/gio/gioerror.h
+include/glib-2.0/gio/giomodule.h
+include/glib-2.0/gio/gioscheduler.h
+include/glib-2.0/gio/gloadableicon.h
+include/glib-2.0/gio/gmemoryinputstream.h
+include/glib-2.0/gio/gmemoryoutputstream.h
+include/glib-2.0/gio/gmount.h
+include/glib-2.0/gio/gmountoperation.h
+include/glib-2.0/gio/gnativevolumemonitor.h
+include/glib-2.0/gio/goutputstream.h
+include/glib-2.0/gio/gseekable.h
+include/glib-2.0/gio/gsimpleasyncresult.h
+include/glib-2.0/gio/gthemedicon.h
+include/glib-2.0/gio/gvfs.h
+include/glib-2.0/gio/gvolume.h
+include/glib-2.0/gio/gvolumemonitor.h
 include/glib-2.0/glib-object.h
 include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
@@ -12,6 +58,7 @@
 include/glib-2.0/glib/gbase64.h
 include/glib-2.0/glib/gbookmarkfile.h
 include/glib-2.0/glib/gcache.h
+include/glib-2.0/glib/gchecksum.h
 include/glib-2.0/glib/gcompletion.h
 include/glib-2.0/glib/gconvert.h
 include/glib-2.0/glib/gdataset.h
@@ -52,12 +99,14 @@
 include/glib-2.0/glib/gstdio.h
 include/glib-2.0/glib/gstrfuncs.h
 include/glib-2.0/glib/gstring.h
+include/glib-2.0/glib/gtestutils.h
 include/glib-2.0/glib/gthread.h
 include/glib-2.0/glib/gthreadpool.h
 include/glib-2.0/glib/gtimer.h
 include/glib-2.0/glib/gtree.h
 include/glib-2.0/glib/gtypes.h
 include/glib-2.0/glib/gunicode.h
+include/glib-2.0/glib/gurifuncs.h
 include/glib-2.0/glib/gutils.h
 include/glib-2.0/glib/gwin32.h
 include/glib-2.0/glibconfig.h
@@ -79,6 +128,10 @@
 include/glib-2.0/gobject/gvaluearray.h
 include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
+lib/libgio-2.0.a
+lib/libgio-2.0.la
+lib/libgio-2.0.so
+lib/libgio-2.0.so.0
 lib/libglib-2.0.a
 lib/libglib-2.0.la
 lib/libglib-2.0.so
@@ -95,6 +148,8 @@
 lib/libgthread-2.0.la
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
+libdata/pkgconfig/gio-2.0.pc
+libdata/pkgconfig/gio-unix-2.0.pc
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gmodule-export-2.0.pc
@@ -153,6 +208,7 @@
 share/locale/mk/LC_MESSAGES/glib20.mo
 share/locale/ml/LC_MESSAGES/glib20.mo
 share/locale/mn/LC_MESSAGES/glib20.mo
+share/locale/mr/LC_MESSAGES/glib20.mo
 share/locale/ms/LC_MESSAGES/glib20.mo
 share/locale/nb/LC_MESSAGES/glib20.mo
 share/locale/ne/LC_MESSAGES/glib20.mo
@@ -167,6 +223,7 @@
 share/locale/ro/LC_MESSAGES/glib20.mo
 share/locale/ru/LC_MESSAGES/glib20.mo
 share/locale/rw/LC_MESSAGES/glib20.mo
+share/locale/si/LC_MESSAGES/glib20.mo
 share/locale/sk/LC_MESSAGES/glib20.mo
 share/locale/sl/LC_MESSAGES/glib20.mo
 share/locale/sq/LC_MESSAGES/glib20.mo
@@ -193,7 +250,10 @@
 @dirrm share/glib-2.0
 @dirrm include/glib-2.0/gobject
 @dirrm include/glib-2.0/glib
+ at dirrm include/glib-2.0/gio
 @dirrm include/glib-2.0
+ at dirrm include/gio-unix-2.0/gio
+ at dirrm include/gio-unix-2.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES
@@ -208,10 +268,14 @@
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr at ije/LC_MESSAGES
 @dirrmtry share/locale/sr at ije
+ at dirrmtry share/locale/si/LC_MESSAGES
+ at dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+ at dirrmtry share/locale/mr/LC_MESSAGES
+ at dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/glib20/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L devel/glib20/Makefile -L devel/glib20/Makefile -u -r1.7 -r1.8
--- devel/glib20/Makefile
+++ devel/glib20/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	glib
 PKGNAMESUFFIX=	20
-PORTVERSION=	2.14.6
+PORTVERSION=	2.16.3
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -38,11 +38,13 @@
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig ltverhack
 USE_GMAKE=	yes
+USE_PYTHON=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
-		--with-pcre=system
+		--with-pcre=system \
+		--disable-fam
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/glib20/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/glib20/distinfo -L devel/glib20/distinfo -u -r1.3 -r1.4
--- devel/glib20/distinfo
+++ devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.14.6.tar.bz2) = 3b340946d6916ee9cbf2c348e7c099f1
-SHA256 (gnome2/glib-2.14.6.tar.bz2) = 78dfbbd339ff1049275f76a2a6e6c8f0cf124d5cdbea62a2b36e9d76c0ea24ba
-SIZE (gnome2/glib-2.14.6.tar.bz2) = 3406651
+MD5 (gnome2/glib-2.16.3.tar.bz2) = 195f9a803cc5279dbb39afdf985f44cb
+SHA256 (gnome2/glib-2.16.3.tar.bz2) = 562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d
+SIZE (gnome2/glib-2.16.3.tar.bz2) = 4540919
--- devel/glib20/files/extra-patch-gthread_gthread-posix.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- gthread/gthread-posix.c.orig	Thu Jun  9 11:25:01 2005
-+++ gthread/gthread-posix.c	Fri Jun 10 20:23:17 2005
-@@ -115,7 +115,11 @@ static gint priority_normal_value;
- # define PRIORITY_NORMAL_VALUE    priority_normal_value
- #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */
- 
-+#define G_THREAD_STACK_SIZE32	(1*1024*1024)
-+#define G_THREAD_STACK_SIZE64	(2*1024*1024)
-+
- static gulong g_thread_min_stack_size = 0;
-+static gulong g_thread_default_stack_size = 0;
- 
- #define G_MUTEX_SIZE (sizeof (pthread_mutex_t))
- 
-@@ -309,8 +313,16 @@ g_thread_create_posix_impl (GThreadFunc 
-       stack_size = MAX (g_thread_min_stack_size, stack_size);
-       /* No error check here, because some systems can't do it and
-        * we simply don't want threads to fail because of that. */
--      pthread_attr_setstacksize (&attr, stack_size);
-     }
-+  else
-+    {
-+      if (sizeof(void *) == 8)
-+        g_thread_default_stack_size = G_THREAD_STACK_SIZE64;
-+      else
-+        g_thread_default_stack_size = G_THREAD_STACK_SIZE32;
-+      stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size);
-+    }
-+  pthread_attr_setstacksize (&attr, stack_size);
- #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */
- 
- #ifdef PTHREAD_SCOPE_SYSTEM
Index: patch-glib::libcharset::Makefile.in
===================================================================
RCS file: /home/cvs/mports/devel/glib20/files/patch-glib::libcharset::Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L devel/glib20/files/patch-glib::libcharset::Makefile.in -L devel/glib20/files/patch-glib::libcharset::Makefile.in -u -r1.1.1.1 -r1.2
--- devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -1,31 +1,30 @@
---- glib/libcharset/Makefile.in.orig	Fri Apr 30 12:10:27 2004
-+++ glib/libcharset/Makefile.in	Fri Apr 30 12:12:01 2004
-@@ -225,7 +225,7 @@
- target_alias = @target_alias@
- 
+--- glib/libcharset/Makefile.in.orig	2007-12-21 16:55:09.000000000 -0500
++++ glib/libcharset/Makefile.in	2007-12-21 16:56:04.000000000 -0500
+@@ -277,15 +277,15 @@ EXTRA_DIST = README config.charset ref-a
+ 	codeset.m4 update.sh make-patch.sh libcharset-glib.patch
+ TEST_PROGS = 
  INCLUDES = \
 -	-DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
 +	-DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir)
  
- 
  noinst_LTLIBRARIES = libcharset.la
-@@ -246,8 +246,8 @@
- 	make-patch.sh
- 
+ libcharset_la_SOURCES = \
+ 	libcharset.h		\
+ 	localcharset.c
  
 -charset_alias = $(DESTDIR)$(libdir)/charset.alias
 -charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 +charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
 +charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
- 
  SUFFIXES = .sed .sin
+ CLEANFILES = charset.alias ref-add.sed ref-del.sed
+ all: all-am
+@@ -497,7 +497,7 @@ install-data-am:
  
-@@ -487,7 +487,7 @@
- 
- install-data-am:
+ install-dvi: install-dvi-am
  
 -install-exec-am: install-exec-local
 +install-exec-am: # install-exec-local
  
- install-info: install-info-am
+ install-html: install-html-am
  
Index: patch-ag
===================================================================
RCS file: /home/cvs/mports/devel/glib20/files/patch-ag,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/glib20/files/patch-ag -L devel/glib20/files/patch-ag -u -r1.3 -r1.4
--- devel/glib20/files/patch-ag
+++ devel/glib20/files/patch-ag
@@ -1,22 +1,21 @@
---- Makefile.in.orig	Thu May  3 15:19:30 2007
-+++ Makefile.in	Thu May  3 15:19:44 2007
-@@ -248,7 +248,7 @@ target_alias = @target_alias@
- 
+--- Makefile.in.orig	2008-02-12 00:16:23.000000000 +0100
++++ Makefile.in	2008-02-12 00:16:23.000000000 +0100
+@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLo
+ 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
+ TEST_PROGS = 
  AUTOMAKE_OPTIONS = 1.7
- 
--SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
-+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
- 
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+ DIST_SUBDIRS = $(SUBDIRS) build
  bin_SCRIPTS = glib-gettextize
- 
-@@ -301,8 +301,8 @@ BUILT_EXTRA_DIST = \
+ AM_CPPFLAGS = \
+@@ -356,7 +356,8 @@ BUILT_EXTRA_DIST = \
  	config.h.win32		\
  	gtk-doc.make
  
--
 -configexecincludedir = $(libdir)/glib-2.0/include
 +glibincludedir = $(includedir)/glib-2.0
 +configexecincludedir = $(glibincludedir)
- 
+ configexecinclude_DATA = glibconfig.h
  CONFIGURE_DEPENDENCIES = acglib.m4
- 
+ BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
Index: patch-ae
===================================================================
RCS file: /home/cvs/mports/devel/glib20/files/patch-ae,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L devel/glib20/files/patch-ae -L devel/glib20/files/patch-ae -u -r1.1.1.1 -r1.2
--- devel/glib20/files/patch-ae
+++ devel/glib20/files/patch-ae
@@ -1,6 +1,28 @@
---- configure.orig	Sun Jan 29 13:06:22 2006
-+++ configure	Sun Jan 29 13:06:48 2006
-@@ -34462,6 +34461,8 @@
+--- configure.orig	2008-03-17 23:32:05.000000000 -0400
++++ configure	2008-03-18 17:55:42.000000000 -0400
+@@ -32748,6 +32748,12 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++#ifdef HAVE_SYS_MOUNT_H
++#include <sys/mount.h>
++#endif
+ int
+ main ()
+ {
+@@ -34051,7 +34057,7 @@ done
+ 
+ 
+ 
+-for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
++for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -39139,6 +39145,8 @@ fi
           ;;
      esac
    fi
Index: patch-ah
===================================================================
RCS file: /home/cvs/mports/devel/glib20/files/patch-ah,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L devel/glib20/files/patch-ah -L devel/glib20/files/patch-ah -u -r1.1.1.1 -r1.2
--- devel/glib20/files/patch-ah
+++ devel/glib20/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig	Fri Oct 24 18:05:32 2003
-+++ docs/reference/Makefile.in	Fri Oct 24 18:06:00 2003
-@@ -226,7 +226,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = glib gobject
-+SUBDIRS = #glib gobject
- subdir = docs/reference
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
+--- docs/reference/Makefile.in.orig	2007-12-21 16:54:10.000000000 -0500
++++ docs/reference/Makefile.in	2007-12-21 16:54:40.000000000 -0500
+@@ -268,7 +268,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt
+ # initialize variables for unconditional += appending
+ EXTRA_DIST = 
+ TEST_PROGS = 
+-SUBDIRS = glib gobject gio
++SUBDIRS = #glib gobject gio
+ all: all-recursive
+ 
+ .SUFFIXES:
--- devel/glib20/files/patch-glib_gatomic.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- glib/gatomic.c.orig	Thu Jul  6 11:21:02 2006
-+++ glib/gatomic.c	Thu Jul  6 11:18:48 2006
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- 			       gint           val)
- {
--  return __sync_fetch_and_add (atomic, val);
-+  return __sync_fetch_and_add_si (atomic, val);
- }
-  
- void
- g_atomic_int_add (volatile gint *atomic, 
- 		  gint val)
- {
--  __sync_fetch_and_add (atomic, val);
-+  __sync_fetch_and_add_si (atomic, val);
- }
- 
- gboolean
-@@ -429,7 +429,7 @@
- 				   gint           oldval, 
- 				   gint           newval)
- {
--  return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+  return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
- 
- gboolean
-@@ -437,7 +437,7 @@
- 				       gpointer           oldval, 
- 				       gpointer           newval)
- {
--  return __sync_bool_compare_and_swap ((long *)atomic, 
-+  return __sync_bool_compare_and_swap_di ((long *)atomic, 
- 				       (long)oldval, (long)newval);
- }
-

More information about the Midnightbsd-cvs mailing list