summaryrefslogtreecommitdiff
path: root/devel/glib20
diff options
context:
space:
mode:
Diffstat (limited to 'devel/glib20')
-rw-r--r--devel/glib20/Makefile4
-rw-r--r--devel/glib20/distinfo6
-rw-r--r--devel/glib20/files/extra-patch-glib_Makefile.in8
-rw-r--r--devel/glib20/files/patch-ae14
-rw-r--r--devel/glib20/files/patch-gio_libasyncns_asyncns.c11
-rw-r--r--devel/glib20/files/patch-glib_Makefile.in22
-rw-r--r--devel/glib20/files/patch-gobject_Makefile.in22
-rw-r--r--devel/glib20/pkg-plist25
8 files changed, 96 insertions, 16 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 3324b19ee89d..2d9de63ed894 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.143 2009/03/27 18:52:46 marcus Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.155 2009/10/07 22:03:54 kwm Exp $
#
# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.20.5
+PORTVERSION= 2.22.2
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index ef73e57d56ec..30b626bb630c 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.20.5.tar.bz2) = 4c178b91d82ef80a2da3c26b772569c0
-SHA256 (gnome2/glib-2.20.5.tar.bz2) = 88f092769df5ce9f784c1068a3055ede00ada503317653984101d5393de63655
-SIZE (gnome2/glib-2.20.5.tar.bz2) = 5037738
+MD5 (gnome2/glib-2.22.2.tar.bz2) = 846a86c74b74d5b16826aa5508940f9b
+SHA256 (gnome2/glib-2.22.2.tar.bz2) = a4a41d02fc2d3f5effa1fc3466918e0b3ab60e9eb0a08139b997f2649cbacca3
+SIZE (gnome2/glib-2.22.2.tar.bz2) = 5490926
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
index 4791780e29cc..01f856f74c03 100644
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ b/devel/glib20/files/extra-patch-glib_Makefile.in
@@ -1,11 +1,11 @@
---- glib/Makefile.in.orig 2008-12-01 16:15:34.000000000 -0500
-+++ glib/Makefile.in 2008-12-01 16:16:03.000000000 -0500
-@@ -272,7 +272,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+--- glib/Makefile.in.orig 2009-05-31 13:14:18.000000000 +0200
++++ glib/Makefile.in 2009-05-31 13:15:08.000000000 +0200
+@@ -272,7 +272,7 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -licui18n
+ LIBASYNCNS_LIBADD = @LIBASYNCNS_LIBADD@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 0345b8acd046..4699afdbedd4 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig 2008-11-24 13:44:42.000000000 -0600
-+++ configure 2008-11-24 13:50:51.000000000 -0600
-@@ -29576,6 +29576,12 @@
+--- configure.orig 2009-09-05 10:54:38.000000000 +0200
++++ configure 2009-09-05 10:56:40.000000000 +0200
+@@ -29571,6 +29571,12 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -13,16 +13,16 @@
int
main ()
{
-@@ -31407,7 +31413,7 @@
+@@ -31611,7 +31617,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
+-for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
++for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -36810,6 +36816,8 @@
+@@ -39943,6 +39949,8 @@ fi
;;
esac
fi
diff --git a/devel/glib20/files/patch-gio_libasyncns_asyncns.c b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
new file mode 100644
index 000000000000..966dd27a689b
--- /dev/null
+++ b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
@@ -0,0 +1,11 @@
+--- gio/libasyncns/asyncns.c.orig 2009-05-05 15:25:10.000000000 -0400
++++ gio/libasyncns/asyncns.c 2009-05-05 15:25:51.000000000 -0400
+@@ -35,6 +35,8 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ #include <pwd.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
new file mode 100644
index 000000000000..8dd7ae74bb82
--- /dev/null
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -0,0 +1,22 @@
+--- glib/Makefile.in.orig 2009-09-30 09:37:39.000000000 +0200
++++ glib/Makefile.in 2009-09-30 09:38:48.000000000 +0200
+@@ -1396,7 +1396,7 @@
+
+ info-am:
+
+-install-data-am: install-data-local install-dist_gdbSCRIPTS \
++install-data-am: install-data-local \
+ install-glibincludeHEADERS install-glibsubincludeHEADERS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1603,9 +1603,7 @@
+ libglib-gdb.py: libglib-gdb.py.in
+ sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+
+-install-data-hook: libglib-gdb.py
+- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
+- $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
++install-data-hook:
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
new file mode 100644
index 000000000000..b8842a6f46e4
--- /dev/null
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -0,0 +1,22 @@
+--- gobject/Makefile.in.orig 2009-09-30 09:39:51.000000000 +0200
++++ gobject/Makefile.in 2009-09-30 09:40:17.000000000 +0200
+@@ -1186,7 +1186,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-data-local install-dist_gdbSCRIPTS \
++install-data-am: install-data-local \
+ install-libgobjectincludeHEADERS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1393,9 +1393,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+ uninstall-gdb:
+ -rm -r $(DESTDIR)$(datadir)/gdb
+
+-install-data-hook: libgobject-gdb.py
+- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
+- $(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
++install-data-hook:
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index b52b531e14c9..4e011916cd1a 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -5,10 +5,14 @@ bin/gobject-query
bin/gtester
bin/gtester-report
include/gio-unix-2.0/gio/gdesktopappinfo.h
+include/gio-unix-2.0/gio/gunixconnection.h
+include/gio-unix-2.0/gio/gunixfdmessage.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/gio-unix-2.0/gio/gunixsocketaddress.h
include/glib-2.0/gio/gappinfo.h
+include/glib-2.0/gio/gasyncinitable.h
include/glib-2.0/gio/gasyncresult.h
include/glib-2.0/gio/gbufferedinputstream.h
include/glib-2.0/gio/gbufferedoutputstream.h
@@ -25,12 +29,16 @@ 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/gfileiostream.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/ginetaddress.h
+include/glib-2.0/gio/ginetsocketaddress.h
+include/glib-2.0/gio/ginitable.h
include/glib-2.0/gio/ginputstream.h
include/glib-2.0/gio/gio.h
include/glib-2.0/gio/gioenums.h
@@ -38,6 +46,7 @@ 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/giostream.h
include/glib-2.0/gio/giotypes.h
include/glib-2.0/gio/gloadableicon.h
include/glib-2.0/gio/gmemoryinputstream.h
@@ -45,10 +54,25 @@ 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/gnetworkaddress.h
+include/glib-2.0/gio/gnetworkservice.h
include/glib-2.0/gio/goutputstream.h
+include/glib-2.0/gio/gresolver.h
include/glib-2.0/gio/gseekable.h
include/glib-2.0/gio/gsimpleasyncresult.h
+include/glib-2.0/gio/gsocket.h
+include/glib-2.0/gio/gsocketaddress.h
+include/glib-2.0/gio/gsocketaddressenumerator.h
+include/glib-2.0/gio/gsocketclient.h
+include/glib-2.0/gio/gsocketconnectable.h
+include/glib-2.0/gio/gsocketconnection.h
+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/gtcpconnection.h
include/glib-2.0/gio/gthemedicon.h
+include/glib-2.0/gio/gthreadedsocketservice.h
include/glib-2.0/gio/gvfs.h
include/glib-2.0/gio/gvolume.h
include/glib-2.0/gio/gvolumemonitor.h
@@ -72,6 +96,7 @@ include/glib-2.0/glib/gerror.h
include/glib-2.0/glib/gfileutils.h
include/glib-2.0/glib/ghash.h
include/glib-2.0/glib/ghook.h
+include/glib-2.0/glib/ghostutils.h
include/glib-2.0/glib/gi18n-lib.h
include/glib-2.0/glib/gi18n.h
include/glib-2.0/glib/giochannel.h