Index: devel/glib20/Makefile =================================================================== --- devel/glib20/Makefile (revision 323706) +++ devel/glib20/Makefile (working copy) @@ -1,11 +1,10 @@ # Created by: Vanilla I. Shu # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.229 2012/12/09 20:42:55 kwm Exp $ -# !! DON'T FORGET ABOUT devel/gio-fam-backend !! +# $MCom: ports/trunk/devel/glib20/Makefile 18529 2013-06-11 11:27:22Z kwm $ PORTNAME= glib -PORTVERSION= 2.34.3 -PORTREVISION?= 0 +PORTVERSION= 2.36.3 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,10 +25,9 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USES= pkgconfig gettext iconv -USE_GNOME= gnomehack ltverhack +USES= gettext iconv pathfix pkgconfig shebangfix +USE_GNOME= ltverhack USE_GMAKE= yes -MAKE_JOBS_SAFE= yes USE_PYTHON= 2.5+ USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ @@ -37,9 +35,12 @@ --disable-man --without-xml-catalog \ --with-pcre=system \ --disable-fam +CONFIGURE_ENV= ac_cv_header_sys_inotify_h= CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lintl +LDFLAGS+= -L${LOCALBASE}/lib +SHEBANG_FILES= */*.pl glib/gen-iswide-table.py + OPTIONS_DEFINE= COLLATION_FIX DEBUG COLLATION_FIX_DESC= fix string collation @@ -73,6 +74,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ ${FILESDIR}/extra-patch-glib_gunicollate.c # Disable it until someone can figure why it causes net-im/pidgin crashed. +# http://www.freebsd.org/cgi/query-pr.cgi?pr=175930 see comment by ed@ #CONFIGURE_ENV+= CFLAGS="-D__STDC_ISO_10646__" .endif @@ -91,6 +93,7 @@ ${WRKSRC}/gio/gdbusaddress.c ${WRKSRC}/gio/gdbusprivate.c \ ${WRKSRC}/po/*.po @${REINPLACE_CMD} -e 's|inotify_support=yes|inotify_support=no| ; \ + s|-Werror|| ; \ s|#define HAVE_SYS_INOTIFY_H 1||' ${WRKSRC}/configure post-install: Index: devel/glib20/distinfo =================================================================== --- devel/glib20/distinfo (revision 323706) +++ devel/glib20/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 -SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872 +SHA256 (gnome2/glib-2.36.3.tar.xz) = 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e +SIZE (gnome2/glib-2.36.3.tar.xz) = 6626972 Index: devel/glib20/files/patch-ae =================================================================== --- devel/glib20/files/patch-ae (revision 323706) +++ devel/glib20/files/patch-ae (working copy) @@ -1,5 +1,5 @@ ---- configure.orig 2013-02-14 19:12:15.000000000 +0000 -+++ configure 2013-02-14 19:13:51.000000000 +0000 +--- configure.orig 2013-03-28 02:59:16.000000000 +0000 ++++ configure 2013-03-28 03:00:20.000000000 +0000 @@ -603,6 +603,9 @@ #ifdef HAVE_SYS_TYPES_H # include @@ -10,7 +10,7 @@ #ifdef HAVE_SYS_STAT_H # include #endif -@@ -5602,7 +5605,7 @@ +@@ -5699,7 +5702,7 @@ fi GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" @@ -19,7 +19,7 @@ if test "x$with_runtime_libdir" != "x"; then -@@ -23647,7 +23650,7 @@ +@@ -23089,7 +23092,7 @@ fi done @@ -28,16 +28,16 @@ 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" -@@ -27108,10 +27111,10 @@ +@@ -26629,10 +26632,10 @@ # b) FreeBSD doesn't do this either. # case $host in - *-*-freebsd*|*-*-linux*) + *-*-linux*) - G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`" + G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" ;; - *-*-openbsd*) -+ *-*-freebsd*|*-*-openbsd*) ++ *-*-openbsd*|*-*-freebsd*) LDFLAGS="$LDFLAGS -pthread" ;; *) Index: devel/glib20/files/patch-glib::libcharset::Makefile.in =================================================================== --- devel/glib20/files/patch-glib::libcharset::Makefile.in (revision 323706) +++ devel/glib20/files/patch-glib::libcharset::Makefile.in (working copy) @@ -1,25 +1,5 @@ --- glib/libcharset/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200 +++ glib/libcharset/Makefile.in 2010-08-08 12:46:01.000000000 +0200 -@@ -328,7 +328,7 @@ EXTRA_DIST = README config.charset ref-a - codeset.m4 update.sh make-patch.sh libcharset-glib.patch - TEST_PROGS = - INCLUDES = \ -- -DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES) -+ -DLIBDIR=\"$(prefix)/libdata\" $(config_h_INCLUDES) - - noinst_LTLIBRARIES = libcharset.la - libcharset_la_SOURCES = \ -@@ -336,8 +336,8 @@ libcharset_la_SOURCES = \ - localcharset.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 @@ -566,7 +566,7 @@ install-dvi: install-dvi-am install-dvi-am: Index: devel/glib20/files/patch-glib_tests_gdatetime.c =================================================================== --- devel/glib20/files/patch-glib_tests_gdatetime.c (revision 323706) +++ devel/glib20/files/patch-glib_tests_gdatetime.c (working copy) @@ -1,20 +1,20 @@ ---- glib/tests/gdatetime.c.orig 2012-08-17 00:06:25.000000000 +0000 -+++ glib/tests/gdatetime.c 2012-10-23 12:38:55.000000000 +0000 -@@ -1230,7 +1230,7 @@ - gint64 u; +--- 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 @@ gint i1, i2; + #ifdef G_OS_UNIX - tz = g_time_zone_new ("Canada/Eastern"); + tz = g_time_zone_new ("America/Montreal"); - dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0); - u = g_date_time_to_unix (dt); - -@@ -1259,7 +1259,7 @@ - gint64 u, u2; + #elif defined G_OS_WIN32 + tz = g_time_zone_new ("Eastern Standard Time"); + #endif +@@ -1309,7 +1309,7 @@ gint i1, i2; + #ifdef G_OS_UNIX - tz = g_time_zone_new ("Canada/Eastern"); + tz = g_time_zone_new ("America/Montreal"); - dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0); - u = g_date_time_to_unix (dt); - u2 = u; + #elif defined G_OS_WIN32 + tz = g_time_zone_new ("Eastern Standard Time"); + #endif Index: devel/glib20/pkg-plist =================================================================== --- devel/glib20/pkg-plist (revision 323706) +++ devel/glib20/pkg-plist (working copy) @@ -105,6 +105,7 @@ 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/gnetworking.h include/glib-2.0/gio/gnetworkmonitor.h include/glib-2.0/gio/gnetworkservice.h include/glib-2.0/gio/goutputstream.h @@ -125,6 +126,7 @@ include/glib-2.0/gio/gsettingsschema.h include/glib-2.0/gio/gsimpleaction.h include/glib-2.0/gio/gsimpleactiongroup.h +include/glib-2.0/gio/gsimpleproxyresolver.h include/glib-2.0/gio/gsimpleasyncresult.h include/glib-2.0/gio/gsimplepermission.h include/glib-2.0/gio/gsocket.h @@ -137,6 +139,7 @@ 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/gtask.h include/glib-2.0/gio/gtcpconnection.h include/glib-2.0/gio/gtcpwrapperconnection.h include/glib-2.0/gio/gtestdbus.h @@ -258,30 +261,6 @@ include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h -lib/gdbus-2.0/codegen/__init__.py -lib/gdbus-2.0/codegen/__init__.pyc -lib/gdbus-2.0/codegen/__init__.pyo -lib/gdbus-2.0/codegen/codegen.py -lib/gdbus-2.0/codegen/codegen.pyc -lib/gdbus-2.0/codegen/codegen.pyo -lib/gdbus-2.0/codegen/codegen_docbook.py -lib/gdbus-2.0/codegen/codegen_docbook.pyc -lib/gdbus-2.0/codegen/codegen_docbook.pyo -lib/gdbus-2.0/codegen/codegen_main.py -lib/gdbus-2.0/codegen/codegen_main.pyc -lib/gdbus-2.0/codegen/codegen_main.pyo -lib/gdbus-2.0/codegen/config.py -lib/gdbus-2.0/codegen/config.pyc -lib/gdbus-2.0/codegen/config.pyo -lib/gdbus-2.0/codegen/dbustypes.py -lib/gdbus-2.0/codegen/dbustypes.pyc -lib/gdbus-2.0/codegen/dbustypes.pyo -lib/gdbus-2.0/codegen/parser.py -lib/gdbus-2.0/codegen/parser.pyc -lib/gdbus-2.0/codegen/parser.pyo -lib/gdbus-2.0/codegen/utils.py -lib/gdbus-2.0/codegen/utils.pyc -lib/gdbus-2.0/codegen/utils.pyo lib/libgio-2.0.a lib/libgio-2.0.la lib/libgio-2.0.so @@ -313,7 +292,30 @@ share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/aclocal/gsettings.m4 -share/glib-2.0/gettext/mkinstalldirs +share/glib-2.0/codegen/__init__.py +share/glib-2.0/codegen/__init__.pyc +share/glib-2.0/codegen/__init__.pyo +share/glib-2.0/codegen/codegen.py +share/glib-2.0/codegen/codegen.pyc +share/glib-2.0/codegen/codegen.pyo +share/glib-2.0/codegen/codegen_docbook.py +share/glib-2.0/codegen/codegen_docbook.pyc +share/glib-2.0/codegen/codegen_docbook.pyo +share/glib-2.0/codegen/codegen_main.py +share/glib-2.0/codegen/codegen_main.pyc +share/glib-2.0/codegen/codegen_main.pyo +share/glib-2.0/codegen/config.py +share/glib-2.0/codegen/config.pyc +share/glib-2.0/codegen/config.pyo +share/glib-2.0/codegen/dbustypes.py +share/glib-2.0/codegen/dbustypes.pyc +share/glib-2.0/codegen/dbustypes.pyo +share/glib-2.0/codegen/parser.py +share/glib-2.0/codegen/parser.pyc +share/glib-2.0/codegen/parser.pyo +share/glib-2.0/codegen/utils.py +share/glib-2.0/codegen/utils.pyc +share/glib-2.0/codegen/utils.pyo share/glib-2.0/gettext/po/Makefile.in.in share/glib-2.0/schemas/gschema.dtd share/locale/af/LC_MESSAGES/glib20.mo @@ -397,6 +399,7 @@ share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo share/locale/te/LC_MESSAGES/glib20.mo +share/locale/tg/LC_MESSAGES/glib20.mo share/locale/th/LC_MESSAGES/glib20.mo share/locale/tl/LC_MESSAGES/glib20.mo share/locale/tr/LC_MESSAGES/glib20.mo @@ -469,6 +472,7 @@ @dirrm share/glib-2.0/schemas @dirrm share/glib-2.0/gettext/po @dirrm share/glib-2.0/gettext +@dirrm share/glib-2.0/codegen @dirrm share/glib-2.0 @dirrmtry share/bash-completion/completions @dirrmtry share/bash-completion @@ -479,8 +483,6 @@ @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true @dirrmtry lib/gio/modules @dirrmtry lib/gio -@dirrm lib/gdbus-2.0/codegen -@dirrm lib/gdbus-2.0 @dirrm include/glib-2.0/gobject @dirrm include/glib-2.0/glib/deprecated @dirrm include/glib-2.0/glib