summaryrefslogtreecommitdiff
path: root/devel/glib20
diff options
context:
space:
mode:
Diffstat (limited to 'devel/glib20')
-rw-r--r--devel/glib20/Makefile9
-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_xdgmime_xdgmimecache.h20
-rw-r--r--devel/glib20/files/patch-glib::libcharset::Makefile.in11
-rw-r--r--devel/glib20/pkg-plist17
7 files changed, 51 insertions, 34 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 810534940c64..33e5a3ed6454 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,12 +3,13 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/glib20/Makefile,v 1.117 2008/03/19 04:44:58 marcus Exp $
+# $MCom: ports/devel/glib20/Makefile,v 1.137 2009/01/09 21:30:35 kwm Exp $
#
+# !! DON'T FORGET ABOUT devel/gio-fam-backend !!
PORTNAME= glib
-PORTVERSION= 2.16.5
-PORTREVISION?= 1
+PORTVERSION= 2.18.4
+PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -33,7 +34,7 @@ LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
-USE_GNOME= gnomehack gnometarget pkgconfig ltverhack
+USE_GNOME= gnomehack pkgconfig ltverhack
USE_GMAKE= yes
USE_PYTHON= yes
USE_PERL5= yes
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index e0bf9be7e599..d16c3b42fe58 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.16.5.tar.bz2) = 039f02d47d4071322a3f00abf031e5d9
-SHA256 (gnome2/glib-2.16.5.tar.bz2) = cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20
-SIZE (gnome2/glib-2.16.5.tar.bz2) = 4570123
+MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf
+SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100
+SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
index 3c5676d2eb1e..4791780e29cc 100644
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ b/devel/glib20/files/extra-patch-glib_Makefile.in
@@ -1,9 +1,9 @@
---- glib/Makefile.in.orig Wed Jul 19 01:08:13 2006
-+++ glib/Makefile.in Wed Jul 19 01:09:10 2006
-@@ -130,7 +130,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+--- 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
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
+ LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -licui18n
LIBOBJS = @LIBOBJS@
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 2ba6ab189dda..0345b8acd046 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- 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
+--- configure.orig 2008-11-24 13:44:42.000000000 -0600
++++ configure 2008-11-24 13:50:51.000000000 -0600
+@@ -29576,6 +29576,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -13,16 +13,16 @@
int
main ()
{
-@@ -34051,7 +34057,7 @@ done
+@@ -31407,7 +31413,7 @@
-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
+ 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 @@
;;
esac
fi
diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h
index 58aa93037507..039571d8b496 100644
--- a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h
+++ b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h
@@ -1,12 +1,12 @@
---- gio/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400
-+++ gio/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400
-@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
- #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents)
- #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass)
- #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal)
-
+--- gio/xdgmime/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400
++++ gio/xdgmime/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400
+@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon)
+ #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon)
+ #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump)
++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal)
#endif
+ extern XdgMimeCache **_caches;
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
index 9cec8906fb28..352c0cf6031c 100644
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -1,6 +1,6 @@
---- 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
+--- glib/libcharset/Makefile.in.orig 2008-06-04 00:03:14.000000000 +0200
++++ glib/libcharset/Makefile.in 2008-06-04 00:05:58.000000000 +0200
+@@ -278,7 +278,7 @@ EXTRA_DIST = README config.charset ref-a
codeset.m4 update.sh make-patch.sh libcharset-glib.patch
TEST_PROGS =
INCLUDES = \
@@ -9,7 +9,8 @@
noinst_LTLIBRARIES = libcharset.la
libcharset_la_SOURCES = \
- libcharset.h \
+@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \
+ localcharset.h \
localcharset.c
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
@@ -19,7 +20,7 @@
SUFFIXES = .sed .sin
CLEANFILES = charset.alias ref-add.sed ref-del.sed
all: all-am
-@@ -497,7 +497,7 @@ install-data-am:
+@@ -498,7 +498,7 @@ install-data-am:
install-dvi: install-dvi-am
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 44bbc76976a6..48f0c14e712e 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -17,6 +17,8 @@ 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/gemblem.h
+include/glib-2.0/gio/gemblemedicon.h
include/glib-2.0/gio/gfile.h
include/glib-2.0/gio/gfileattribute.h
include/glib-2.0/gio/gfileenumerator.h
@@ -31,10 +33,12 @@ 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/gioenums.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/giotypes.h
include/glib-2.0/gio/gloadableicon.h
include/glib-2.0/gio/gmemoryinputstream.h
include/glib-2.0/gio/gmemoryoutputstream.h
@@ -204,6 +208,7 @@ share/locale/ko/LC_MESSAGES/glib20.mo
share/locale/ku/LC_MESSAGES/glib20.mo
share/locale/lt/LC_MESSAGES/glib20.mo
share/locale/lv/LC_MESSAGES/glib20.mo
+share/locale/mai/LC_MESSAGES/glib20.mo
share/locale/mg/LC_MESSAGES/glib20.mo
share/locale/mk/LC_MESSAGES/glib20.mo
share/locale/ml/LC_MESSAGES/glib20.mo
@@ -218,6 +223,7 @@ share/locale/oc/LC_MESSAGES/glib20.mo
share/locale/or/LC_MESSAGES/glib20.mo
share/locale/pa/LC_MESSAGES/glib20.mo
share/locale/pl/LC_MESSAGES/glib20.mo
+share/locale/ps/LC_MESSAGES/glib20.mo
share/locale/pt/LC_MESSAGES/glib20.mo
share/locale/pt_BR/LC_MESSAGES/glib20.mo
share/locale/ro/LC_MESSAGES/glib20.mo
@@ -228,8 +234,8 @@ share/locale/sk/LC_MESSAGES/glib20.mo
share/locale/sl/LC_MESSAGES/glib20.mo
share/locale/sq/LC_MESSAGES/glib20.mo
share/locale/sr/LC_MESSAGES/glib20.mo
-share/locale/sr@Latn/LC_MESSAGES/glib20.mo
share/locale/sr@ije/LC_MESSAGES/glib20.mo
+share/locale/sr@latin/LC_MESSAGES/glib20.mo
share/locale/sv/LC_MESSAGES/glib20.mo
share/locale/ta/LC_MESSAGES/glib20.mo
share/locale/te/LC_MESSAGES/glib20.mo
@@ -248,6 +254,9 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrm share/glib-2.0/gettext/po
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
+@exec mkdir -p %D/lib/gio/modules
+@dirrmtry lib/gio/modules
+@dirrmtry lib/gio
@dirrm include/glib-2.0/gobject
@dirrm include/glib-2.0/glib
@dirrm include/glib-2.0/gio
@@ -266,18 +275,24 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrmtry share/locale/tl
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/hy/LC_MESSAGES