diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-15 23:16:56 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-15 23:16:56 +0800 |
| commit | d00b8c444cbef0ede481ba4cca49710f9e274740 (patch) | |
| tree | b5d425963f4ffc1c863af2e06246dac36bf224a2 /devel/gio-fam-backend | |
| parent | 7b29806282628b54cb54464e454ca3fb47950cd0 (diff) | |
| download | marcuscom-ports-d00b8c444cbef0ede481ba4cca49710f9e274740.tar marcuscom-ports-d00b8c444cbef0ede481ba4cca49710f9e274740.tar.gz marcuscom-ports-d00b8c444cbef0ede481ba4cca49710f9e274740.tar.bz2 marcuscom-ports-d00b8c444cbef0ede481ba4cca49710f9e274740.tar.lz marcuscom-ports-d00b8c444cbef0ede481ba4cca49710f9e274740.tar.xz marcuscom-ports-d00b8c444cbef0ede481ba4cca49710f9e274740.tar.zst marcuscom-ports-d00b8c444cbef0ede481ba4cca49710f9e274740.zip | |
Update to 2.32.3.
Threading issue fixed by mezz@ and marcus@.
While here clean up MASTER_SITES. Only look at the GNOME sites.
and for glib-compile-schemas doesn't us --uninstall anymore, don't use it in bsd.gnome.mk
Submitted by: mezz (via ports-experimental)
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16736 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gio-fam-backend')
| -rw-r--r-- | devel/gio-fam-backend/Makefile | 4 | ||||
| -rw-r--r-- | devel/gio-fam-backend/files/patch-ae | 46 |
2 files changed, 28 insertions, 22 deletions
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index 1a9a05129..4ad8c0568 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.89 2012/01/16 17:33:11 ahze Exp $ +# $MCom$ # PORTNAME= gio-fam-backend -PORTVERSION= 2.30.3 +PORTVERSION= 2.32.3 PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae index ee22655db..a8c65b182 100644 --- a/devel/gio-fam-backend/files/patch-ae +++ b/devel/gio-fam-backend/files/patch-ae @@ -1,5 +1,5 @@ ---- configure.orig 2011-09-15 16:59:35.000000000 +0200 -+++ configure 2011-09-15 17:02:03.000000000 +0200 +--- configure.orig 2012-05-02 21:59:16.000000000 -0500 ++++ configure 2012-05-02 22:00:41.000000000 -0500 @@ -583,6 +583,9 @@ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> @@ -10,7 +10,7 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -@@ -5463,7 +5466,7 @@ +@@ -5526,7 +5529,7 @@ fi GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" @@ -19,7 +19,7 @@ if test "x$with_runtime_libdir" != "x"; then -@@ -23331,7 +23334,7 @@ +@@ -23546,7 +23549,7 @@ fi done @@ -28,21 +28,27 @@ 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" -@@ -26124,6 +26127,8 @@ - ;; - esac - fi -+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" -+ G_THREAD_LIBS="${PTHREAD_LIBS}" - - if test x"$G_THREAD_CFLAGS" = x; then - -@@ -28804,7 +28809,7 @@ - fi - - --if test "x${enable_Bsymbolic}" == "xyes"; then -+if test "x${enable_Bsymbolic}" = "xyes"; then - GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions +@@ -26461,6 +26464,9 @@ + esac fi ++G_THREAD_CFLAGS="${PTHREAD_CFLAGS}" ++G_THREAD_LIBS="${PTHREAD_LIBS}" ++ + if test x"$G_THREAD_CFLAGS" = x; then + + # The canonical -pthread[s] does not work. Try something different. +@@ -26949,9 +26955,12 @@ + # 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/`" + ;; ++ *-*-freebsd*) ++ G_THREAD_LIBS_FOR_GTHREAD="-pthread" ++ ;; + *-*-openbsd*) + LDFLAGS="$LDFLAGS -pthread" + ;; |