Index: head/devel/dbus/Makefile =================================================================== --- head/devel/dbus/Makefile (revision 132272) +++ head/devel/dbus/Makefile (revision 132273) @@ -1,70 +1,73 @@ # New ports collection makefile for: D-BUS # Date Created: 22 June 2004 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= dbus -PORTVERSION= 0.23.2 -PORTREVISION= 1 +PORTVERSION= 0.32 CATEGORIES?= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/ MAINTAINER?= gnome@FreeBSD.org COMMENT?= A message bus system for inter-application communication +BUILD_DEPENDS?= bash:${PORTSDIR}/shells/bash LIB_DEPENDS?= expat.5:${PORTSDIR}/textproc/expat2 USE_GNOME?= gnomehack gtk20 libxml2 USE_GMAKE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes USE_RC_SUBR= yes +USE_REINPLACE= yes CONFIGURE_ARGS?=--enable-gtk \ --disable-python \ --disable-gcj \ --disable-mono \ --disable-mono-docs \ --with-system-pid-file=/var/run/dbus.pid \ --with-system-socket=/var/run/dbus \ --with-session-socket-dir=/var/tmp \ --disable-doxygen-docs \ --disable-xml-docs CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if !defined(DBUS_SLAVE) OPTIONS= QT "Enable Qt client support" off PLIST_SUB= VERSION="1.0" RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -MAN1= dbus-cleanup-sockets.1 dbus-daemon-1.1 dbus-launch.1 \ +MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \ dbus-monitor.1 dbus-send.1 .endif .include .if !defined(DBUS_SLAVE) .if defined(WITH_QT) && !defined(WITHOUT_QT) CONFIGURE_ARGS+=--enable-qt PLIST_SUB+= QT="" BROKEN= configure fails when QT support is enabled .else CONFIGURE_ARGS+=--disable-qt PLIST_SUB+= QT="@comment " .endif post-patch: @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/dbus.sh > ${WRKSRC}/dbus.sh + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/tools/run-with-tmp-session-bus.sh post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif ${INSTALL_SCRIPT} ${WRKSRC}/dbus.sh ${PREFIX}/etc/rc.d .endif .include Property changes on: head/devel/dbus/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/devel/dbus/distinfo =================================================================== --- head/devel/dbus/distinfo (revision 132272) +++ head/devel/dbus/distinfo (revision 132273) @@ -1,2 +1,2 @@ -MD5 (dbus-0.23.2.tar.gz) = 654a2207203636dca0007de384cf0893 -SIZE (dbus-0.23.2.tar.gz) = 1285494 +MD5 (dbus-0.32.tar.gz) = 3b4f941487764dedf2517da64e194a1c +SIZE (dbus-0.32.tar.gz) = 1428682 Property changes on: head/devel/dbus/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/devel/dbus/files/dbus.in =================================================================== --- head/devel/dbus/files/dbus.in (revision 132272) +++ head/devel/dbus/files/dbus.in (revision 132273) @@ -1,34 +1,34 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: dbus # REQUIRE: DAEMON # KEYWORD: FreeBSD # # Add the following lines to /etc/rc.conf to enable the D-BUS messaging system: # # dbus_enable="YES" # dbus_enable=${dbus_enable-"NO"} dbus_flags=${dbus_flags-"--system"} . %%RC_SUBR%% name=dbus rcvar=`set_rcvar` -command="%%PREFIX%%/bin/dbus-daemon-1" +command="%%PREFIX%%/bin/dbus-daemon" pidfile="/var/run/${name}.pid" stop_postcmd=stop_postcmd stop_postcmd() { rm -f $pidfile } load_rc_config ${name} run_rc_command "$1" Property changes on: head/devel/dbus/files/dbus.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/devel/dbus/files/dbus.sh =================================================================== --- head/devel/dbus/files/dbus.sh (revision 132272) +++ head/devel/dbus/files/dbus.sh (revision 132273) @@ -1,34 +1,34 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: dbus # REQUIRE: DAEMON # KEYWORD: FreeBSD # # Add the following lines to /etc/rc.conf to enable the D-BUS messaging system: # # dbus_enable="YES" # dbus_enable=${dbus_enable-"NO"} dbus_flags=${dbus_flags-"--system"} . %%RC_SUBR%% name=dbus rcvar=`set_rcvar` -command="%%PREFIX%%/bin/dbus-daemon-1" +command="%%PREFIX%%/bin/dbus-daemon" pidfile="/var/run/${name}.pid" stop_postcmd=stop_postcmd stop_postcmd() { rm -f $pidfile } load_rc_config ${name} run_rc_command "$1" Property changes on: head/devel/dbus/files/dbus.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/devel/dbus/files/patch-dbus_dbus-sysdeps-util.c =================================================================== --- head/devel/dbus/files/patch-dbus_dbus-sysdeps-util.c (nonexistent) +++ head/devel/dbus/files/patch-dbus_dbus-sysdeps-util.c (revision 132273) @@ -0,0 +1,11 @@ +--- dbus/dbus-sysdeps-util.c.orig Sat Apr 2 15:29:28 2005 ++++ dbus/dbus-sysdeps-util.c Sat Apr 2 15:29:45 2005 +@@ -142,7 +142,7 @@ _dbus_become_daemon (const DBusString *p + return FALSE; + } + +- if (!_dbus_string_append_int (&pid, _dbus_getpid ()) || ++ if (!_dbus_string_append_int (&pid, child_pid) || + !_dbus_string_append (&pid, "\n")) + { + _dbus_string_free (&pid); Property changes on: head/devel/dbus/files/patch-dbus_dbus-sysdeps-util.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/dbus/files/patch-tools_Makefile.in =================================================================== --- head/devel/dbus/files/patch-tools_Makefile.in (revision 132272) +++ head/devel/dbus/files/patch-tools_Makefile.in (revision 132273) @@ -1,11 +1,11 @@ ---- tools/Makefile.in.orig Mon Jan 24 19:22:29 2005 -+++ tools/Makefile.in Mon Jan 24 19:22:47 2005 -@@ -314,7 +314,7 @@ +--- tools/Makefile.in.orig Sat Apr 2 14:50:00 2005 ++++ tools/Makefile.in Sat Apr 2 14:50:40 2005 +@@ -335,7 +335,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ --INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\" +-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" ++INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\" @HAVE_GLIB_FALSE@GLIB_TOOLS = @HAVE_GLIB_TRUE@GLIB_TOOLS = dbus-monitor - @HAVE_GTK_FALSE@GTK_TOOLS = + @HAVE_GLIB_TRUE@nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h Property changes on: head/devel/dbus/files/patch-tools_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh =================================================================== --- head/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh (nonexistent) +++ head/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh (revision 132273) @@ -0,0 +1,8 @@ +--- tools/run-with-tmp-session-bus.sh.orig Sat Apr 2 14:52:51 2005 ++++ tools/run-with-tmp-session-bus.sh Sat Apr 2 14:53:05 2005 +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! %%LOCALBASE%%/bin/bash + + SCRIPTNAME=$0 + WRAPPED_SCRIPT=$1 Property changes on: head/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/dbus/pkg-plist =================================================================== --- head/devel/dbus/pkg-plist (revision 132272) +++ head/devel/dbus/pkg-plist (revision 132273) @@ -1,48 +1,49 @@ +bin/dbus-binding-tool bin/dbus-cleanup-sockets -bin/dbus-daemon-1 -bin/dbus-glib-tool +bin/dbus-daemon bin/dbus-launch bin/dbus-monitor bin/dbus-send bin/dbus-viewer etc/dbus-1/session.conf etc/dbus-1/system.conf etc/rc.d/dbus.sh include/dbus-%%VERSION%%/dbus/dbus-address.h include/dbus-%%VERSION%%/dbus/dbus-bus.h include/dbus-%%VERSION%%/dbus/dbus-connection.h include/dbus-%%VERSION%%/dbus/dbus-errors.h +include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h include/dbus-%%VERSION%%/dbus/dbus-glib.h include/dbus-%%VERSION%%/dbus/dbus-macros.h include/dbus-%%VERSION%%/dbus/dbus-memory.h include/dbus-%%VERSION%%/dbus/dbus-message.h include/dbus-%%VERSION%%/dbus/dbus-pending-call.h include/dbus-%%VERSION%%/dbus/dbus-protocol.h include/dbus-%%VERSION%%/dbus/dbus-server.h include/dbus-%%VERSION%%/dbus/dbus-shared.h include/dbus-%%VERSION%%/dbus/dbus-threads.h include/dbus-%%VERSION%%/dbus/dbus-types.h include/dbus-%%VERSION%%/dbus/dbus.h include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h lib/libdbus-1.a lib/libdbus-1.so -lib/libdbus-1.so.0 +lib/libdbus-1.so.1 lib/libdbus-glib-1.a lib/libdbus-glib-1.so -lib/libdbus-glib-1.so.0 +lib/libdbus-glib-1.so.1 %%QT%%lib/libdbus-qt-1.a %%QT%%lib/libdbus-qt-1.so -%%QT%%lib/libdbus-qt-1.so.0 +%%QT%%lib/libdbus-qt-1.so.1 libdata/pkgconfig/dbus-1.pc libdata/pkgconfig/dbus-glib-1.pc @exec mkdir -p %D/share/dbus-1/services @dirrm share/dbus-1/services @dirrm share/dbus-1 @dirrm include/dbus-%%VERSION%%/include/dbus @dirrm include/dbus-%%VERSION%%/include @dirrm include/dbus-%%VERSION%%/dbus @dirrm include/dbus-%%VERSION%% @dirrm etc/dbus-1/system.d @dirrm etc/dbus-1 Property changes on: head/devel/dbus/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/py-dbus/Makefile =================================================================== --- head/devel/py-dbus/Makefile (revision 132272) +++ head/devel/py-dbus/Makefile (revision 132273) @@ -1,45 +1,45 @@ # New ports collection makefile for: py-dbus # Date Created: 25 July 2004 # Whom: Joe Marcus Clarke # # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel gnome python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface to the D-BUS messaging system BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex -LIB_DEPENDS= dbus-1.0:${PORTSDIR}/devel/dbus +LIB_DEPENDS= dbus-1.1:${PORTSDIR}/devel/dbus RUN_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex MASTERDIR= ${.CURDIR}/../dbus BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist DBUS_SLAVE= yes USE_GNOME= gnomehack gnometarget USE_PYTHON= yes CONFIGURE_ARGS= --enable-python \ --disable-gcj \ --disable-mono \ --disable-mono-docs \ --disable-gtk \ --disable-qt \ --with-system-pid-file=/var/run/dbus.pid \ --with-system-socket=/var/run/dbus \ --with-session-socket-dir=/var/tmp \ --disable-doxygen-docs \ --disable-xml-docs post-install: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR} @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR} .include "${MASTERDIR}/Makefile" Property changes on: head/devel/py-dbus/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property