diff options
author | marcus <marcus@FreeBSD.org> | 2005-01-22 01:01:01 +0000 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2005-01-22 01:01:01 +0000 |
commit | 3ddf45f552a9fe4562927194f36743d15169027a (patch) | |
tree | 1f08dff7d38350eafb18f4a60ea525504fce5238 /devel | |
parent | 5f37fdeab67a3aeffd7632d6402def2094b356d2 (diff) | |
download | FreeBSD-ports-3ddf45f552a9fe4562927194f36743d15169027a.zip FreeBSD-ports-3ddf45f552a9fe4562927194f36743d15169027a.tar.gz |
Update to 0.23.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/dbus/Makefile | 5 | ||||
-rw-r--r-- | devel/dbus/distinfo | 4 | ||||
-rw-r--r-- | devel/dbus/files/patch-dbus_Makefile.in | 12 | ||||
-rw-r--r-- | devel/dbus/files/patch-dbus_dbus-sysdeps.c | 41 | ||||
-rw-r--r-- | devel/dbus/files/patch-python_Makefile.in | 30 | ||||
-rw-r--r-- | devel/dbus/pkg-plist | 2 | ||||
-rw-r--r-- | devel/py-dbus/Makefile | 2 |
7 files changed, 33 insertions, 63 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 35a292f..907a5c6 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -6,10 +6,9 @@ # PORTNAME= dbus -PORTVERSION= 0.22 -PORTREVISION= 2 +PORTVERSION= 0.23 CATEGORIES?= devel gnome -MASTER_SITES= http://freedesktop.org/software/dbus/releases/ +MASTER_SITES= http://dbus.freedesktop.org/releases/ MAINTAINER?= gnome@FreeBSD.org COMMENT?= A message bus system for inter-application communication diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo index 286a214..21a85ec 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,2 +1,2 @@ -MD5 (dbus-0.22.tar.gz) = 6b1c2476ea8b82dd9fb7f29ef857cb9f -SIZE (dbus-0.22.tar.gz) = 1248780 +MD5 (dbus-0.23.tar.gz) = 56a6a06144bd349f21afbd4cc386a60f +SIZE (dbus-0.23.tar.gz) = 1280646 diff --git a/devel/dbus/files/patch-dbus_Makefile.in b/devel/dbus/files/patch-dbus_Makefile.in index c9f5164..42a58ca 100644 --- a/devel/dbus/files/patch-dbus_Makefile.in +++ b/devel/dbus/files/patch-dbus_Makefile.in @@ -1,11 +1,11 @@ ---- dbus/Makefile.in.orig Tue Jun 22 14:58:47 2004 -+++ dbus/Makefile.in Tue Jun 22 14:58:56 2004 -@@ -232,7 +232,7 @@ - INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION +--- dbus/Makefile.in.orig Fri Jan 21 19:43:46 2005 ++++ dbus/Makefile.in Fri Jan 21 19:44:43 2005 +@@ -360,7 +360,7 @@ + @HAVE_GLIB_TRUE@ $(DBUS_GLIB_BUILT_INCLUDES) dbusincludedir = $(includedir)/dbus-1.0/dbus -dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus +dbusarchincludedir = $(includedir)/dbus-1.0/include/dbus - lib_LTLIBRARIES = libdbus-1.la - + dbusinclude_HEADERS = \ + dbus.h \ diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps.c b/devel/dbus/files/patch-dbus_dbus-sysdeps.c index bdf8843..41fc919 100644 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps.c +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps.c @@ -1,6 +1,6 @@ ---- dbus/dbus-sysdeps.c.orig Mon Aug 9 23:03:37 2004 -+++ dbus/dbus-sysdeps.c Fri Dec 17 19:39:34 2004 -@@ -738,12 +738,40 @@ +--- dbus/dbus-sysdeps.c.orig Tue Jan 11 17:35:58 2005 ++++ dbus/dbus-sysdeps.c Fri Jan 21 19:45:12 2005 +@@ -740,12 +740,40 @@ { int bytes_written; char buf[1] = { '\0' }; @@ -41,7 +41,7 @@ if (bytes_written < 0 && errno == EINTR) goto again; -@@ -797,8 +825,10 @@ +@@ -799,8 +827,10 @@ char buf; #ifdef HAVE_CMSGCRED @@ -54,7 +54,7 @@ #endif _DBUS_ASSERT_ERROR_IS_CLEAR (error); -@@ -833,9 +863,9 @@ +@@ -835,9 +865,9 @@ msg.msg_iovlen = 1; #ifdef HAVE_CMSGCRED @@ -67,7 +67,7 @@ #endif again: -@@ -858,9 +888,10 @@ +@@ -860,9 +890,10 @@ } #ifdef HAVE_CMSGCRED @@ -80,7 +80,7 @@ _dbus_verbose ("Message from recvmsg() was not SCM_CREDS\n"); return FALSE; } -@@ -886,13 +917,9 @@ +@@ -888,13 +919,9 @@ cr_len, (int) sizeof (cr), _dbus_strerror (errno)); } #elif defined(HAVE_CMSGCRED) @@ -97,30 +97,3 @@ #else /* !SO_PEERCRED && !HAVE_CMSGCRED */ _dbus_verbose ("Socket credentials not supported on this OS\n"); #endif -@@ -3417,21 +3444,21 @@ - exit (1); - } - -- _dbus_string_init_const (&str, "0xff"); -+ _dbus_string_init_const (&str, "255"); - if (!_dbus_string_parse_double (&str, - 0, &val, &pos)) - { - _dbus_warn ("Failed to parse double"); - exit (1); - } -- if (val != 0xff) -+ if (val != 255) - { -- _dbus_warn ("Failed to parse 0xff correctly, got: %f", val); -+ _dbus_warn ("Failed to parse 255 correctly, got: %f", val); - exit (1); - } -- if (pos != 4) -+ if (pos != 3) - { -- _dbus_warn ("_dbus_string_parse_double of \"0xff\" returned wrong position %d", pos); -+ _dbus_warn ("_dbus_string_parse_double of \"255\" returned wrong position %d", pos); - exit (1); - } - diff --git a/devel/dbus/files/patch-python_Makefile.in b/devel/dbus/files/patch-python_Makefile.in index dc08438..a2ef319 100644 --- a/devel/dbus/files/patch-python_Makefile.in +++ b/devel/dbus/files/patch-python_Makefile.in @@ -1,21 +1,21 @@ ---- python/Makefile.in.orig Sun Aug 8 13:53:50 2004 -+++ python/Makefile.in Sun Aug 8 13:57:05 2004 -@@ -237,7 +237,7 @@ - dbusbindings_LTLIBRARIES = dbus_bindings.la - - dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings --dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la -+dbus_bindings_la_LIBADD = -ldbus-1 -ldbus-glib-1 - nodist_dbus_bindings_la_SOURCES = dbus_bindings.c - - EXTRA_DIST = \ -@@ -257,8 +257,7 @@ - CONFIG_CLEAN_FILES = +--- python/Makefile.in.orig Fri Jan 21 19:46:15 2005 ++++ python/Makefile.in Fri Jan 21 19:47:06 2005 +@@ -51,8 +51,7 @@ + am__installdirs = "$(DESTDIR)$(dbusbindingsdir)" "$(DESTDIR)$(dbusdir)" + dbusbindingsLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(dbusbindings_LTLIBRARIES) - -dbus_bindings_la_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la \ - $(top_builddir)/glib/libdbus-glib-1.la +dbus_bindings_la_DEPENDENCIES = -ldbus-1 -ldbus-glib-1 nodist_dbus_bindings_la_OBJECTS = dbus_bindings.lo dbus_bindings_la_OBJECTS = $(nodist_dbus_bindings_la_OBJECTS) - + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -298,7 +297,7 @@ + dbusbindingsdir = $(pythondir) + dbusbindings_LTLIBRARIES = dbus_bindings.la + dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings +-dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la ++dbus_bindings_la_LIBADD = -ldbus-1 -ldbus-glib-1 + nodist_dbus_bindings_la_SOURCES = dbus_bindings.c + EXTRA_DIST = \ + dbus_h_wrapper.h \ diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist index 33e8bd6..a8ea561 100644 --- a/devel/dbus/pkg-plist +++ b/devel/dbus/pkg-plist @@ -37,8 +37,6 @@ lib/libdbus-glib-1.so.0 %%QT%%lib/libdbus-qt-1.so.0 libdata/pkgconfig/dbus-1.pc libdata/pkgconfig/dbus-glib-1.pc -@dirrm lib/dbus-%%VERSION%%/services -@dirrm lib/dbus-%%VERSION%% @dirrm include/dbus-%%VERSION%%/include/dbus @dirrm include/dbus-%%VERSION%%/include @dirrm include/dbus-%%VERSION%%/dbus diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile index d6b0a8c..7a5c18b 100644 --- a/devel/py-dbus/Makefile +++ b/devel/py-dbus/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} |