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

Update to 0.95.

Browse Source
This commit is contained in:
Joe Marcus Clarke 2006-11-06 03:35:39 +00:00
parent ef1c55ecf7
commit 19592a61d2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=176583
10 changed files with 33 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/dbus/Makefile
View File

@ -6,8 +6,8 @@
#
PORTNAME= dbus
PORTVERSION?= 0.94
PORTREVISION?= 1
PORTVERSION?= 0.95
PORTREVISION?= 0
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@ -49,8 +49,13 @@ USE_XLIB= yes
post-patch:
@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
${WRKSRC}/bus/session.conf.in \
${WRKSRC}/bus/system.conf.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|/usr/X11R6|${X11BASE}|g' \
${WRKSRC}/dbus/dbus-sysdeps-unix.c
@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
${WRKSRC}/dbus/Makefile.in \
${WRKSRC}/tools/Makefile.in
.if !defined(DBUS_SLAVE)
post-install:
@ -59,7 +64,6 @@ post-install:
.endif
${MKDIR} ${X11BASE}/etc/dbus-1/system.d
${MKDIR} ${X11BASE}/share/dbus-1/services
.endif
.include <bsd.port.post.mk>

6
devel/dbus/distinfo
View File

@ -1,3 +1,3 @@
MD5 (dbus-0.94.tar.gz) = 85653cafbcfc7edfbad9639459758ed3
SHA256 (dbus-0.94.tar.gz) = 11b259e2cef5a12db59a13cb8f2625f22ff32bbd368bb615fc22c575a00b6ccb
SIZE (dbus-0.94.tar.gz) = 1372266
MD5 (dbus-0.95.tar.gz) = c660e2c6345cbe5edc5e2486570148af
SHA256 (dbus-0.95.tar.gz) = 9bd989a5116320aa56531745904881f1a03a612d201f718374fbe223dfae7592
SIZE (dbus-0.95.tar.gz) = 1400507

2
devel/dbus/files/patch-bus_bus.c
View File

@ -5,7 +5,7 @@
_dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
(DBusForeachFunction) bus_watch_directory,
- NULL);
+ bus_context_get_loop (context));
+ context);
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
retval = TRUE;

10
devel/dbus/files/patch-bus_session.conf.in
View File

@ -1,10 +0,0 @@
--- bus/session.conf.in.orig Mon Jun 6 22:18:31 2005
+++ bus/session.conf.in Mon Jun 6 22:31:35 2005
@@ -11,6 +11,7 @@
<listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen>
<servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir>
+ <servicedir>%%X11BASE%%/share/dbus-1/services</servicedir>
<policy context="default">
<!-- Allow everything to be sent -->

28
devel/dbus/files/patch-configure
View File

@ -1,28 +0,0 @@
--- configure.orig Sat Oct 28 21:07:14 2006
+++ configure Sat Oct 28 21:08:23 2006
@@ -463,7 +463,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE R_DYNAMIC_LDFLAG SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR DBUS_BINDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE R_DYNAMIC_LDFLAG SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR DBUS_BINDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS PTHREAD_LIBS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -25531,7 +25531,7 @@ DBUS_CLIENT_LIBS=
DBUS_BUS_CFLAGS=$XML_CFLAGS
-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS"
+DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS $PTHREAD_LIBS"
@@ -28283,6 +28283,7 @@ s,@X_LIBS@,$X_LIBS,;t t
s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
s,@DBUS_X_CFLAGS@,$DBUS_X_CFLAGS,;t t
s,@DBUS_X_LIBS@,$DBUS_X_LIBS,;t t
+s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
s,@DOXYGEN@,$DOXYGEN,;t t
s,@DBUS_DOXYGEN_DOCS_ENABLED_TRUE@,$DBUS_DOXYGEN_DOCS_ENABLED_TRUE,;t t
s,@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@,$DBUS_DOXYGEN_DOCS_ENABLED_FALSE,;t t

11
devel/dbus/files/patch-dbus-1.pc.in
View File

@ -1,11 +0,0 @@
--- ./dbus-1.pc.in.orig Thu Mar 16 22:20:14 2006
+++ ./dbus-1.pc.in Sun Oct 8 02:02:33 2006
@@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATAD
Name: dbus
Description: Free desktop message bus
Version: @VERSION@
-Libs: -L${libdir} -ldbus-1
-Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
+Libs: -L${libdir} -ldbus-1 @PTHREAD_LIBS@
+Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include

43
devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
View File

@ -1,10 +1,10 @@
--- dbus/dbus-sysdeps-unix.c.orig Thu Sep 14 01:07:11 2006
+++ dbus/dbus-sysdeps-unix.c Sat Oct 7 12:23:40 2006
@@ -719,16 +719,16 @@ write_credentials_byte (int
--- dbus/dbus-sysdeps-unix.c.orig Wed Nov 1 18:30:46 2006
+++ dbus/dbus-sysdeps-unix.c Sun Nov 5 21:57:27 2006
@@ -834,10 +834,10 @@ write_credentials_byte (int
{
int bytes_written;
char buf[1] = { '\0' };
-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
-#if defined(HAVE_CMSGCRED)
- struct {
+#if defined(HAVE_CMSGCRED)
+ union {
@ -14,14 +14,7 @@
} cmsg;
struct iovec iov;
struct msghdr msg;
#endif
-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
+#if defined(HAVE_CMSGCRED)
iov.iov_base = buf;
iov.iov_len = 1;
@@ -736,10 +736,10 @@ write_credentials_byte (int
@@ -848,10 +848,10 @@ write_credentials_byte (int
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
@ -35,16 +28,7 @@
cmsg.hdr.cmsg_level = SOL_SOCKET;
cmsg.hdr.cmsg_type = SCM_CREDS;
#endif
@@ -748,7 +748,7 @@ write_credentials_byte (int
again:
-#if defined(HAVE_CMSGCRED) && !defined(LOCAL_CREDS)
+#if defined(HAVE_CMSGCRED)
bytes_written = sendmsg (server_fd, &msg, 0);
#else
bytes_written = write (server_fd, buf, 1);
@@ -806,9 +806,10 @@ _dbus_read_credentials_unix_socket (int
@@ -918,9 +918,10 @@ _dbus_read_credentials_unix_socket (int
char buf;
#ifdef HAVE_CMSGCRED
@ -57,7 +41,7 @@
} cmsg;
#elif defined(LOCAL_CREDS)
@@ -845,8 +846,8 @@ _dbus_read_credentials_unix_socket (int
@@ -957,8 +958,8 @@ _dbus_read_credentials_unix_socket (int
#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
memset (&cmsg, 0, sizeof (cmsg));
@ -68,7 +52,7 @@
#endif
again:
@@ -869,7 +870,8 @@ _dbus_read_credentials_unix_socket (int
@@ -981,7 +982,8 @@ _dbus_read_credentials_unix_socket (int
}
#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
@ -78,7 +62,7 @@
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Message from recvmsg() was not SCM_CREDS");
@@ -897,9 +899,10 @@ _dbus_read_credentials_unix_socket (int
@@ -1009,9 +1011,10 @@ _dbus_read_credentials_unix_socket (int
cr_len, (int) sizeof (cr), _dbus_strerror (errno));
}
#elif defined(HAVE_CMSGCRED)
@ -92,3 +76,12 @@
#elif defined(LOCAL_CREDS)
credentials->pid = DBUS_PID_UNSET;
credentials->uid = cmsg.cred.sc_uid;
@@ -2687,7 +2690,7 @@ _dbus_get_standard_session_servicedirs (
}
else
{
- if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
+ if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/X11R6/share:/usr/share:"))
goto oom;
}

28
devel/dbus/files/patch-tools_Makefile.in
View File

@ -1,28 +0,0 @@
--- tools/Makefile.in.orig Sat Oct 28 21:10:56 2006
+++ tools/Makefile.in Sat Oct 28 21:13:39 2006
@@ -158,6 +158,7 @@ DBUS_XML_DOCS_ENABLED_FALSE = @DBUS_XML_
DBUS_XML_DOCS_ENABLED_TRUE = @DBUS_XML_DOCS_ENABLED_TRUE@
DBUS_X_CFLAGS = @DBUS_X_CFLAGS@
DBUS_X_LIBS = @DBUS_X_LIBS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DOXYGEN = @DOXYGEN@
@@ -296,13 +297,13 @@ dbus_cleanup_sockets_SOURCES = \
dbus_uuidgen_SOURCES = \
dbus-uuidgen.c
-dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la
+dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
dbus_send_LDFLAGS = @R_DYNAMIC_LDFLAG@
-dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la
+dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
dbus_monitor_LDFLAGS = @R_DYNAMIC_LDFLAG@
-dbus_uuidgen_LDADD = $(top_builddir)/dbus/libdbus-1.la
+dbus_uuidgen_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
dbus_uuidgen_LDFLAGS = @R_DYNAMIC_LDFLAG@
-dbus_launch_LDADD = $(DBUS_X_LIBS)
+dbus_launch_LDADD = $(DBUS_X_LIBS) $(PTHREAD_LIBS)
dbus_launch_LDFLAGS = @R_DYNAMIC_LDFLAG@
man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 dbus-uuidgen.1
EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh

1
devel/dbus/pkg-install
View File

@ -33,6 +33,7 @@ POST-INSTALL)
fi
/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
/usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus
exit 0
;;
esac

2
devel/dbus/pkg-plist
View File

@ -46,3 +46,5 @@ libdata/pkgconfig/dbus-1.pc
@unexec rm -f /var/run/dbus/dbus.pid
@unexec rm -f /var/run/dbus/dbus.pipe
@unexec rmdir /var/run/dbus 2>/dev/null || true
@unexec rm -f /var/db/dbus/machine-id
@unexec rmdir /var/db/dbus 2>/dev/null || true