Index: head/devel/dbus/Makefile =================================================================== --- head/devel/dbus/Makefile (revision 165367) +++ head/devel/dbus/Makefile (revision 165368) @@ -1,94 +1,94 @@ # New ports collection makefile for: D-BUS # Date Created: 22 June 2004 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= dbus -PORTVERSION= 0.61 -PORTREVISION?= 4 +PORTVERSION= 0.62 +PORTREVISION?= 0 CATEGORIES?= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/ MAINTAINER?= gnome@FreeBSD.org COMMENT?= A message bus system for inter-application communication LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 USE_GNOME?= gnomehack glib20 libxml2 USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS?=--disable-gtk \ --disable-python \ --disable-gcj \ --disable-qt \ --disable-mono \ --disable-mono-docs \ --localstatedir=/var \ --with-system-pid-file=/var/run/dbus/dbus.pid \ --with-system-socket=/var/run/dbus/dbus.pipe \ --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) USE_RC_SUBR= dbus OPTIONS= QT "Enable Qt client support" off PLIST_SUB= VERSION="1.0" 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-qt3 CONFIGURE_ENV+= QTDIR=${X11BASE} LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 PLIST_SUB+= QT="" .else PLIST_SUB+= QT="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \ ${WRKSRC}/bus/session.conf.in \ ${WRKSRC}/bus/system.conf.in .if !defined(DBUS_SLAVE) pre-su-install: @for i in 15 9 ; do \ if [ -f /var/run/dbus/dbus.pid ]; then \ kill -$${i} $$(${CAT} /var/run/dbus/dbus.pid) 2>/dev/null || ${TRUE} ; \ sleep 3 ; \ fi ; \ done @if [ -f /var/run/dbus/dbus.pid ]; then \ ${RM} -f /var/run/dbus/dbus.pid ; \ fi .endif post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif ${MKDIR} ${X11BASE}/etc/dbus-1/system.d ${MKDIR} ${X11BASE}/share/dbus-1/services .else .if defined(PKGNAMEPREFIX) .if ${PKGNAMEPREFIX}==${PYTHON_PKGNAMEPREFIX} && ${OSVERSION} < 500000 # Ignore for py-dbus IGNORE= does not build on 4.X .endif .endif .endif .include Property changes on: head/devel/dbus/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.51 \ No newline at end of property +1.52 \ No newline at end of property Index: head/devel/dbus/distinfo =================================================================== --- head/devel/dbus/distinfo (revision 165367) +++ head/devel/dbus/distinfo (revision 165368) @@ -1,3 +1,3 @@ -MD5 (dbus-0.61.tar.gz) = cfd4f26004e4304e0dace4d82894e50b -SHA256 (dbus-0.61.tar.gz) = 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec -SIZE (dbus-0.61.tar.gz) = 1735729 +MD5 (dbus-0.62.tar.gz) = ba7692f63d0e9f1ef06703dff56cb650 +SHA256 (dbus-0.62.tar.gz) = 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707 +SIZE (dbus-0.62.tar.gz) = 1737361 Property changes on: head/devel/dbus/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.17 \ No newline at end of property +1.18 \ No newline at end of property Index: head/devel/dbus/files/patch-configure =================================================================== --- head/devel/dbus/files/patch-configure (revision 165367) +++ head/devel/dbus/files/patch-configure (revision 165368) @@ -1,51 +1,51 @@ ---- configure.orig Mon Feb 27 23:35:09 2006 -+++ configure Mon Feb 27 23:35:39 2006 +--- configure.orig Wed Jun 14 00:57:48 2006 ++++ configure Wed Jun 14 00:58:20 2006 @@ -1057,6 +1057,7 @@ Optional Features: --enable-python build python bindings --enable-selinux build with SELinux support --enable-dnotify build with dnotify support (linux only) + --enable-kqueue build with kqueue support (FreeBSD only) + --enable-console-owner-file + enable console owner file --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] -@@ -4533,7 +4534,7 @@ if test "x$GCC" = "xyes"; then +@@ -4550,7 +4551,7 @@ if test "x$GCC" = "xyes"; then case " $CFLAGS " in *[\ \ ]-Wfloat-equal[\ \ ]*) ;; - *) CFLAGS="$CFLAGS -Wfloat-equal" ;; + *) CFLAGS="$CFLAGS" ;; esac case " $CFLAGS " in -@@ -27231,6 +27232,31 @@ if test x$have_dnotify = xyes; then +@@ -28332,6 +28333,31 @@ if test x$have_dnotify = xyes; then cat >>confdefs.h <<\_ACEOF #define DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 1 +_ACEOF + +fi + +# kqueue checks +case "${target_os}" in + freebsd*) + # Check whether --enable-kqueue or --disable-kqueue was given. + if test "${enable_kqueue+set}" = set; then + enableval="$enable_kqueue" + enable_kqueue=$enableval + else + enable_kqueue=auto + fi; + if test x$enable_kqueue = xno ; then + have_kqueue=no; + else + have_kqueue=yes; + fi +;; +esac +if test x$have_kqueue = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD 1 _ACEOF fi Property changes on: head/devel/dbus/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/devel/dbus/pkg-plist =================================================================== --- head/devel/dbus/pkg-plist (revision 165367) +++ head/devel/dbus/pkg-plist (revision 165368) @@ -1,66 +1,67 @@ bin/dbus-binding-tool bin/dbus-cleanup-sockets bin/dbus-daemon bin/dbus-launch bin/dbus-monitor bin/dbus-send etc/dbus-1/session.conf etc/dbus-1/system.conf %%QT%%include/dbus-%%VERSION%%/dbus/connection.h 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-gtype-specialized.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 %%QT%%include/dbus-%%VERSION%%/dbus/dbus-qt.h include/dbus-%%VERSION%%/dbus/dbus-server.h include/dbus-%%VERSION%%/dbus/dbus-shared.h +include/dbus-%%VERSION%%/dbus/dbus-signature.h include/dbus-%%VERSION%%/dbus/dbus-threads.h include/dbus-%%VERSION%%/dbus/dbus-types.h include/dbus-%%VERSION%%/dbus/dbus.h %%QT%%include/dbus-%%VERSION%%/dbus/message.h %%QT%%include/dbus-%%VERSION%%/dbus/server.h include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h lib/libdbus-1.a lib/libdbus-1.la lib/libdbus-1.so lib/libdbus-1.so.2 lib/libdbus-glib-1.a lib/libdbus-glib-1.la lib/libdbus-glib-1.so lib/libdbus-glib-1.so.2 %%QT%%lib/libdbus-qt-1.a %%QT%%lib/libdbus-qt-1.la %%QT%%lib/libdbus-qt-1.so %%QT%%lib/libdbus-qt-1.so.1 libdata/pkgconfig/dbus-1.pc libdata/pkgconfig/dbus-glib-1.pc @exec mkdir -p %D/etc/dbus-1/system.d @exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d @exec mkdir -p %D/share/dbus-1/services @exec mkdir -p %%X11BASE%%/share/dbus-1/services @dirrmtry share/dbus-1/services @dirrmtry share/dbus-1 @unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true @unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true @unexec rmdir %%X11BASE%%/etc/dbus-1/system.d 2>/dev/null || true @unexec rmdir %%X11BASE%%/etc/dbus-1 2>/dev/null || true @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 @cwd /var/run @unexec rm -f %D/dbus/dbus.pid @unexec rm -f %D/dbus/dbus.pipe @dirrm dbus Property changes on: head/devel/dbus/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.18 \ No newline at end of property +1.19 \ No newline at end of property Index: head/devel/py-dbus/Makefile =================================================================== --- head/devel/py-dbus/Makefile (revision 165367) +++ head/devel/py-dbus/Makefile (revision 165368) @@ -1,49 +1,49 @@ # 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.2:${PORTSDIR}/devel/dbus RUN_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex \ ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 MASTERDIR= ${.CURDIR}/../dbus BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist NOT_FOR_ARCHS= ia64 DBUS_SLAVE= yes USE_GNOME= gnomehack gnometarget USE_PYTHON= yes CONFIGURE_ARGS= --enable-python \ --disable-gcj \ --disable-mono \ --disable-mono-docs \ --disable-gtk \ --disable-qt3 \ --localstatedir=/var \ --with-system-pid-file=/var/run/dbus/dbus.pid \ --with-system-socket=/var/run/dbus/dbus.pipe \ --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.18 \ No newline at end of property +1.19 \ No newline at end of property