cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to dbus-1.4.20.

Browse Source
This commit is contained in:
ajacoutot 2012-03-31 17:56:44 +00:00
parent 514a5c3737
commit 138bff109e
7 changed files with 83 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
x11/dbus/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.77 2012/03/29 13:39:00 sthen Exp $
# $OpenBSD: Makefile,v 1.78 2012/03/31 17:56:44 ajacoutot Exp $
COMMENT= message bus system
DISTNAME= dbus-1.4.16
REVISION= 3
DISTNAME= dbus-1.4.20
EPOCH= 0
SHARED_LIBS += dbus-1 9.1 # .8.6
SHARED_LIBS += dbus-1 9.1 # .8.9
CATEGORIES= x11
HOMEPAGE= http://dbus.freedesktop.org/
@ -26,6 +25,7 @@ MASTER_SITES= ${HOMEPAGE}/releases/dbus/
SEPARATE_BUILD= Yes
USE_LIBTOOL= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@ -33,17 +33,26 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ARGS= --localstatedir=/var \
--with-dbus-user=_dbus \
--with-xml=expat \
--with-x \
--enable-kqueue \
--disable-xml-docs \
--disable-doxygen-docs \
--disable-abstract-sockets \
--disable-launchd \
--disable-selinux \
--disable-libaudit \
--disable-dnotify \
--disable-inotify
# Tests are disabled as they change the final dbus binaries
#CONFIGURE_ARGS+= --enable-tests
# gives no chance of picking up devel/libexecinfo
CONFIGURE_ENV+= ac_cv_header_execinfo_h=no \
ac_cv_func_backtrace=no
# Full test coverage is disabled:
# * changes the final dbus binaries
# * requires glib2 and dbus-python (which creates 2 dependency loops)
# * requires the python MODULE
#CONFIGURE_ARGS+= --enable-tests=yes
#CONFIGURE_ARGS+= --enable-verbose-mode
FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/dbus

10
x11/dbus/distinfo
View File

@ -1,5 +1,5 @@
MD5 (dbus-1.4.16.tar.gz) = RKKhBnjn5QRgh5w+tEU6ZQ==
RMD160 (dbus-1.4.16.tar.gz) = imNJIJCs1xfmpY9jAmGB54rgifA=
SHA1 (dbus-1.4.16.tar.gz) = 1uZTjPwe1xmS9nhqbaVdgV2ZW1s=
SHA256 (dbus-1.4.16.tar.gz) = HY7mJi+MwhSPBleO7lIsdVugiWIGs0ZMqb3IT0EbKcY=
SIZE (dbus-1.4.16.tar.gz) = 1889465
MD5 (dbus-1.4.20.tar.gz) = eeyi8sGJSsNHrM4SgxRCiw==
RMD160 (dbus-1.4.20.tar.gz) = wOiKtr9q/pOiQ6QtJvO2wD54ks0=
SHA1 (dbus-1.4.20.tar.gz) = l2HsojwObqStgi2SdIcD+aD1iFg=
SHA256 (dbus-1.4.20.tar.gz) = EDvc0mGhMUBzC1+mn1apirXIm6PwEW6mL8/WOVINWq8=
SIZE (dbus-1.4.20.tar.gz) = 1895099

10
x11/dbus/patches/patch-bus_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-bus_Makefile_in,v 1.15 2011/09/29 06:57:36 ajacoutot Exp $
--- bus/Makefile.in.orig Wed Sep 21 16:27:55 2011
+++ bus/Makefile.in Thu Sep 29 08:49:44 2011
@@ -2494,7 +2494,6 @@ clean-local:
$OpenBSD: patch-bus_Makefile_in,v 1.16 2012/03/31 17:56:44 ajacoutot Exp $
--- bus/Makefile.in.orig Tue Mar 27 14:01:12 2012
+++ bus/Makefile.in Sat Mar 31 10:32:00 2012
@@ -2344,7 +2344,6 @@ clean-local:
/bin/rm *.bb *.bbg *.da *.gcov || true
install-data-hook:
@ -9,7 +9,7 @@ $OpenBSD: patch-bus_Makefile_in,v 1.15 2011/09/29 06:57:36 ajacoutot Exp $
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
@@ -2511,13 +2510,6 @@ install-data-hook:
@@ -2361,13 +2360,6 @@ install-data-hook:
@HAVE_SYSTEMD_TRUE@ ln -fs ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
@DBUS_UNIX_TRUE@install-exec-hook:

20
x11/dbus/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.18 2012/02/23 06:58:11 ajacoutot Exp $
--- configure.orig Wed Sep 21 16:27:57 2011
+++ configure Sun Feb 19 10:14:58 2012
@@ -18853,7 +18853,8 @@ fi
$OpenBSD: patch-configure,v 1.19 2012/03/31 17:56:44 ajacoutot Exp $
--- configure.orig Tue Mar 27 14:01:10 2012
+++ configure Sat Mar 31 10:32:00 2012
@@ -18938,7 +18938,8 @@ fi
done
@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.18 2012/02/23 06:58:11 ajacoutot Exp $
"
if test "x$ac_cv_have_decl_MSG_NOSIGNAL" = xyes; then :
ac_have_decl=1
@@ -19406,13 +19407,13 @@ fi
@@ -19491,13 +19492,13 @@ fi
# Thread lib detection
ac_fn_c_check_func "$LINENO" "pthread_cond_timedwait" "ac_cv_func_pthread_cond_timedwait"
if test "x$ac_cv_func_pthread_cond_timedwait" = xyes; then :
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.18 2012/02/23 06:58:11 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -19443,7 +19444,7 @@ fi
@@ -19528,7 +19529,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cond_timedwait" >&5
$as_echo "$ac_cv_lib_pthread_pthread_cond_timedwait" >&6; }
if test "x$ac_cv_lib_pthread_pthread_cond_timedwait" = xyes; then :
@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.18 2012/02/23 06:58:11 ajacoutot Exp $
fi
fi
@@ -19511,7 +19512,7 @@ $as_echo "$ac_cv_search_clock_getres" >&6; }
@@ -19596,7 +19597,7 @@ $as_echo "$ac_cv_search_clock_getres" >&6; }
ac_res=$ac_cv_search_clock_getres
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.18 2012/02/23 06:58:11 ajacoutot Exp $
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_MONOTONIC" >&5
@@ -19658,13 +19659,13 @@ if test x$have_selinux = xyes ; then
@@ -19743,13 +19744,13 @@ if test x$have_selinux = xyes ; then
if test "x$ac_cv_func_pthread_create" = xyes; then :
else
@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.18 2012/02/23 06:58:11 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -19695,7 +19696,7 @@ fi
@@ -19780,7 +19781,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.18 2012/02/23 06:58:11 ajacoutot Exp $
fi
fi
@@ -20085,6 +20086,7 @@ $as_echo_n "checking for SCM_RIGHTS... " >&6; }
@@ -20170,6 +20171,7 @@ $as_echo_n "checking for SCM_RIGHTS... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

8
x11/dbus/patches/patch-dbus_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-dbus_Makefile_in,v 1.13 2011/09/29 06:57:36 ajacoutot Exp $
--- dbus/Makefile.in.orig Wed Sep 21 16:27:55 2011
+++ dbus/Makefile.in Thu Sep 29 08:49:44 2011
@@ -560,7 +560,7 @@ configdir = $(sysconfdir)/dbus-1
$OpenBSD: patch-dbus_Makefile_in,v 1.14 2012/03/31 17:56:44 ajacoutot Exp $
--- dbus/Makefile.in.orig Tue Mar 27 14:01:12 2012
+++ dbus/Makefile.in Sat Mar 31 10:32:00 2012
@@ -566,7 +566,7 @@ configdir = $(sysconfdir)/dbus-1
INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
$(DBUS_CLIENT_CFLAGS) \
-DDBUS_COMPILATION \

38
x11/dbus/patches/patch-test_Makefile_in Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-test_Makefile_in,v 1.3 2012/03/31 17:56:44 ajacoutot Exp $
--- test/Makefile.in.orig Sat Mar 31 18:55:08 2012
+++ test/Makefile.in Sat Mar 31 18:58:02 2012
@@ -1418,14 +1418,14 @@ installcheck-local:
@DBUS_ENABLE_INSTALLED_TESTS_TRUE@ $(testexec_PROGRAMS)
all-local:
- $(AM_V_at)$(INSTALL) -d data/valid-config-files/session.d
+ $(AM_V_at)$(mkinstalldirs) -d data/valid-config-files/session.d
$(AM_V_at)set -e && \
if test $(srcdir) = . || test $(srcdir) -ef .; then \
echo '-- No need to copy test data as srcdir = builddir'; \
else \
for F in $(static_data); do \
- $(INSTALL) -d $${F%/*}; \
- $(INSTALL_DATA) $(srcdir)/$$F $$F; \
+ $(mkinstalldirs) $${F%/*}; \
+ $(install_sh_DATA) $(srcdir)/$$F $$F; \
done; \
fi
@@ -1437,12 +1437,12 @@ clean-local:
fi
data/valid-config-files/session.conf: $(top_builddir)/bus/session.conf
- $(AM_V_at)$(INSTALL) -d data/valid-config-files
- $(AM_V_GEN)$(INSTALL_DATA) $< $@
+ $(AM_V_at)$(mkinstalldirs) data/valid-config-files
+ $(AM_V_GEN)$(install_sh_DATA) $< $@
data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf
- $(AM_V_at)$(INSTALL) -d data/valid-config-files
- $(AM_V_GEN)$(INSTALL_DATA) $< $@
+ $(AM_V_at)$(mkinstalldirs) data/valid-config-files
+ $(AM_V_GEN)$(install_sh_DATA) $< $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

12
x11/dbus/patches/patch-tools_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tools_Makefile_in,v 1.15 2011/10/29 14:37:42 ajacoutot Exp $
--- tools/Makefile.in.orig Wed Sep 21 16:27:56 2011
+++ tools/Makefile.in Sat Oct 29 16:12:34 2011
@@ -369,7 +369,7 @@ top_build_prefix = @top_build_prefix@
$OpenBSD: patch-tools_Makefile_in,v 1.16 2012/03/31 17:56:44 ajacoutot Exp $
--- tools/Makefile.in.orig Tue Mar 27 14:01:13 2012
+++ tools/Makefile.in Sat Mar 31 10:32:00 2012
@@ -375,7 +375,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
configdir = $(sysconfdir)/dbus-1
@ -10,7 +10,7 @@ $OpenBSD: patch-tools_Makefile_in,v 1.15 2011/10/29 14:37:42 ajacoutot Exp $
extra_bin_programs = $(am__append_1)
dbus_send_SOURCES = \
dbus-print-message.c \
@@ -410,7 +410,7 @@ CLEANFILES = \
@@ -416,7 +416,7 @@ CLEANFILES = \
#create the /var/lib/data directory for dbus-uuidgen
@ -19,7 +19,7 @@ $OpenBSD: patch-tools_Makefile_in,v 1.15 2011/10/29 14:37:42 ajacoutot Exp $
localstatelib_DATA =
all: all-am
@@ -707,7 +707,7 @@ info: info-am
@@ -713,7 +713,7 @@ info: info-am
info-am: