Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sc8-pr-cvs17:/tmp/cvs-serv10481
Modified Files:
dbus.info dbus.patch
Log Message:
move to stable, with maintainer's permission
Index: dbus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/dbus.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus.info 18 Aug 2006 20:03:18 -0000 1.1
+++ dbus.info 3 Aug 2007 15:03:49 -0000 1.2
@@ -1,98 +1,176 @@
Package: dbus
-Version: 0.60
-Revision: 1005
-Description: Message bus system for applications
+Version: 1.0.2
+Revision: 1027
+Description: Message bus system for applications
License: OSI-Approved
-# dual license: Academic Free License, GPL2
-Maintainer: None <[EMAIL PROTECTED]>
-
-Patch: %n.patch
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-BuildDepends: <<
- x11-dev, expat, glib2-dev (>= 2.6.6-1111),
- gettext-tools, libgettext3-dev, libiconv-dev, pkgconfig
-<<
Depends: <<
- %n-shlibs (>= %v-%r), x11-shlibs, x11,
- expat-shlibs, glib2-shlibs (>= 2.6.6-1111),
- libgettext3-shlibs, libiconv
+ %N-shlibs (>= %v-%r),
+ daemonic,
+ expat1-shlibs
+<<
+BuildDepends: <<
+ expat1,
+ gettext-tools,
+ glib2-dev,
+ libgettext3-dev,
+ libiconv-dev,
+ pkgconfig,
+ x11-dev
<<
-Source: http://dbus.freedesktop.org/releases/%n-%v.tar.gz
-Source-MD5: da9561b5e579cedddc34f53427e99a93
+Source: http://%n.freedesktop.org/releases/%n/%n-%v.tar.gz
+Source-MD5: 0552a9b54beb4a044951b7cdbc8fc855
+Source2: http://%n.freedesktop.org/releases/%n-0.62.tar.gz
+Source2-MD5: ba7692f63d0e9f1ef06703dff56cb650
+Source2ExtractDir: %n-%v
+Source3: http://%n.freedesktop.org/releases/%n-glib/%n-glib-0.72.tar.gz
+Source3-MD5: 6e92993aed234f13ea41c674dec40889
+Source3ExtractDir: %n-%v
+PatchScript: /usr/bin/sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch |
/usr/bin/patch -p1
+SetCFLAGS: -Os -g
ConfigureParams: <<
- --mandir=%p/share/man \
- --disable-qt \
- --disable-qt3 \
- --enable-glib \
- --disable-gtk \
- --disable-tests \
- --disable-ansi \
- --disable-gcj \
- --disable-mono \
- --disable-mono-docs \
- --disable-python \
- --with-xml=expat
+ --disable-kqueue \
+ --mandir=%p/share/man \
+ --disable-tests \
+ --disable-ansi \
+ --with-dbus-daemondir=%p/bin \
+ --with-xml=expat \
+ --disable-xml-docs \
+ --disable-doxygen-docs \
+ --disable-dependency-tracking \
+ --with-x
<<
-# --with-session-socket-dir=%p/var/run/dbus
-# --with-test-socket-dir=dirname Where to put sockets for make check
-# --with-system-pid-file=%p/var/run/dbus.pid PID file for systemwide daemon
-# --with-system-socket=filename UNIX domain socket for systemwide daemon
-# --with-console-auth-dir=dirname directory to check for console ownerhip
-# --with-dbus-user=<user> User for running the DBUS daemon (messagebus)
-# --with-gnu-ld assume the C compiler uses GNU ld [default=no]
-# --with-pic try to use only PIC/non-PIC objects [default=use
+CompileScript: <<
+#!/bin/sh -ev
-InstallScript: make install DESTDIR=%d
-DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README
+ # D-Bus 0.62 for backwards-compatibility
+ pushd dbus-0.62
+ ./configure %c
+ pushd dbus
+ make
+ popd
+ popd
-SplitOff: <<
- Package: %N-shlibs
- Depends: libgettext3-shlibs, libiconv, glib2-shlibs (>= 2.6.6-1111)
- Files: <<
- lib/libdbus-1.2.0.0.dylib
- lib/libdbus-glib-1.2.0.0.dylib
- lib/libdbus-1.2.dylib
- lib/libdbus-glib-1.2.dylib
- <<
- Shlibs: <<
- %p/lib/libdbus-1.2.dylib 3.0.0 %n (>= 0.60-1)
- %p/lib/libdbus-glib-1.2.dylib 3.0.0 %n (>= 0.60-1)
- <<
- DocFiles: COPYING
-<<
+ # D-Bus %v
+ ./configure %c
+ make
+ # temporary, for the glib bindings
+ make -j1 install DESTDIR="%b/tmproot"
-SplitOff2: <<
- Package: %N-dev
- Depends: %N-shlibs (= %v-%r)
- BuildDependsOnly: true
- Files: <<
- include
- lib/dbus-1.0
- lib/pkgconfig
- lib/libdbus-1.a
- lib/libdbus-1.la
- lib/libdbus-glib-1.a
- lib/libdbus-glib-1.la
- lib/libdbus-1.dylib
- lib/libdbus-glib-1.dylib
- <<
- DocFiles: COPYING
+ # D-Bus GLib bindings
+ pushd dbus-glib*
+ PKG_CONFIG_PATH="%b/tmproot%p/lib/pkgconfig" ./configure %c
+ DYLD_LIBRARY_PATH="%b/tmproot%p/lib:$DYLD_LIBRARY_PATH" make
DBUS_CFLAGS="-I%b/tmproot%p/include/dbus-1.0
-I%b/tmproot%p/lib/dbus-1.0/include" DBUS_LIBS="-L%b/tmproot%p/lib -ldbus-1"
+ popd
<<
-Homepage: http://dbus.freedesktop.org/
-DescPort: <<
- ToDo: splitoffs (glib2, gcj, mono, qt3, gtk+2)
+InstallScript: <<
+#!/bin/sh -ev
- Probably no reason to work on mono bindings...they're old and
- rotten and are slated for removal from the main package.
+ # D-Bus 0.62
+ pushd dbus-0.62/dbus
+ make -j1 install DESTDIR="%d"
+ popd
- Patch dbus-launch.c to its cvs revision 1.13 so that it emits
- correct shell syntax.
+ # D-Bus %v
+ make -j1 install DESTDIR="%d"
+
+ # D-Bus GLib bindings
+ pushd dbus-glib*
+ make -j1 install DESTDIR="%d"
+ popd
+
+ perl -pi -e 's,%b/tmproot,,' %i/lib/*.la
+
+ # the rest
+ install -c -m 755 start-*-bus.sh %i/bin/
+
+ install -d -m 755 %i/etc/profile.d
+ cat <<END >%i/etc/profile.d/%N.sh
+#!/bin/sh
+
+eval \`%p/bin/start-session-bus.sh --sh-syntax\`
+END
+
+ cat <<END >%i/etc/profile.d/%N.csh
+#!/bin/csh
+
+eval \`%p/bin/start-session-bus.sh --csh-syntax\`
+END
+
+ chmod 755 %i/etc/profile.d/*
+ install -d -m 755 %i/share/%N
+ mv %i/bin/dbus-uuidgen %i/share/%N
+<<
+DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README
+SplitOff: <<
+ Package: %N-shlibs
+ Depends: <<
+ glib2-shlibs,
+ libgettext3-shlibs,
+ libiconv
+ <<
+ DocFiles: COPYING
+ Files: <<
+ lib/libdbus-1.*.dylib
+ lib/libdbus-glib-1.*.dylib
+ share/%N/dbus-uuidgen
+ <<
+ Shlibs: <<
+ %p/lib/libdbus-1.2.dylib 3.0.0 %n (>= 0.60-1)
+ %p/lib/libdbus-1.3.dylib 4.0.0 %n (>= 0.92-1)
+ %p/lib/libdbus-glib-1.2.dylib 3.0.0 %n (>= 0.60-1)
+ <<
+ PostInstScript: <<
+if [ "$1" = "configure" ]; then
+ %p/share/%N/dbus-uuidgen --ensure >>/tmp/%N-postinst.log 2>&1 || :
+fi
+ <<
+<<
+SplitOff2: <<
+ Package: %N-dev
+ Depends: <<
+ %N-shlibs (= %v-%r),
+ pkgconfig
+ <<
+ BuildDependsOnly: true
+ DocFiles: COPYING
+ Files: <<
+ include
+ lib
+ <<
<<
-DescPackaging: <<
- self-test fails under --build-as-nobody
- qt3 bindings are in external dbus-qt3* package.
+PostInstScript: <<
+ if [ "$1" = "configure" ]; then
+ if [ -x "%p/bin/daemonic" ]; then
+ %p/bin/daemonic install %N >/dev/null 2>&1 || :
+ %p/bin/daemonic enable %N >/dev/null 2>&1 || :
+ fi
+ fi
+ %p/bin/start-system-bus.sh >/tmp/dbus-postinst.log 2>&1 || :
<<
+PostRmScript: <<
+ if [ "$1" = "remove" ]; then
+ if [ ! -x "%p/bin/daemonic" ]; then
+ %p/bin/daemonic disable %N >/dev/null 2>&1 || :
+ %p/bin/daemonic remove %N >/dev/null 2>&1 || :
+ fi
+ fi
+<<
+DaemonicFile: <<
+ <service>
+ <description>D-Bus System Bus</description>
+ <message>D-Bus System Bus</message>
+ <daemon name="%N">
+ <executable
background="no">%p/bin/start-system-bus.sh</executable>
+ </daemon>
+ </service>
+<<
+
+Homepage: http://dbus.freedesktop.org/
+DescPackaging: self-test fails under --build-as-nobody
+
Index: dbus.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbus.patch 18 Aug 2006 20:03:18 -0000 1.1
+++ dbus.patch 3 Aug 2007 15:03:49 -0000 1.2
@@ -1,26 +1,72 @@
-diff -Nurd dbus-0.60.orig/tools/dbus-launch.c dbus-0.60/tools/dbus-launch.c
---- dbus-0.60.orig/tools/dbus-launch.c 2005-11-30 14:32:27.000000000 -0500
-+++ dbus-0.60/tools/dbus-launch.c 2006-02-14 16:26:20.000000000 -0500
-@@ -884,17 +884,17 @@
- else
- {
- if (c_shell_syntax)
-- printf ("setenv DBUS_SESSION_BUS_ADDRESS '%s'\n", bus_address);
-+ printf ("setenv DBUS_SESSION_BUS_ADDRESS '%s';\n", bus_address);
- else
- {
-- printf ("DBUS_SESSION_BUS_ADDRESS='%s'\n", bus_address);
-+ printf ("DBUS_SESSION_BUS_ADDRESS='%s';\n", bus_address);
- if (bourne_shell_syntax)
-- printf ("export DBUS_SESSION_BUS_ADDRESS\n");
-+ printf ("export DBUS_SESSION_BUS_ADDRESS;\n");
- }
- if (c_shell_syntax)
-- printf ("set DBUS_SESSION_BUS_PID=%ld\n", (long) bus_pid);
-+ printf ("set DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid);
- else
-- printf ("DBUS_SESSION_BUS_PID=%ld\n", (long) bus_pid);
-+ printf ("DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid);
- }
-
- verbose ("dbus-launch exiting\n");
+
+--- dbus-1.0.2/dbus-glib-0.72/tools/Makefile.in 2006-10-25
17:14:33.000000000 -0400
++++ dbus-1.0.2-new/dbus-glib-0.72/tools/Makefile.in 2007-01-09
17:15:08.000000000 -0500
+@@ -492,7 +492,7 @@
+ $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client
--prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
+
+ dbus-bus-introspect.xml:
+- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-daemon --introspect >
dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp
dbus-bus-introspect.xml
++ DBUS_TOP_BUILDDIR=$(top_builddir) ../../bus/dbus-daemon --introspect >
dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp
dbus-bus-introspect.xml
+ # 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.
+ .NOEXPORT:
+--- dbus-1.0.2/start-session-bus.sh 1969-12-31 19:00:00.000000000 -0500
++++ dbus-1.0.2-new/start-session-bus.sh 2007-01-09 17:15:22.000000000
-0500
+@@ -0,0 +1,39 @@
++#!/bin/sh
++
++
++
++DO_SH=0
++DO_CSH=0
++
++for arg in "$@"; do
++ case "$arg" in
++ --sh-syntax) DO_SH=1 ;;
++ --csh-syntax) DO_CSH=1 ;;
++ esac
++done
++
++unset DBUS_SESSION_BUS_PID
++SESSION_FILE="/tmp/fink-dbus-session-`id -u`"
++
++if [ -f "${SESSION_FILE}" ]; then
++ . "${SESSION_FILE}"
++ if [ `/bin/ps -p "${DBUS_SESSION_BUS_PID}" | grep -c "^
*${DBUS_SESSION_BUS_PID} "` -eq 0 ]; then
++ @FINKPREFIX@/bin/dbus-launch --sh-syntax >"${SESSION_FILE}"
++ fi
++else
++ @FINKPREFIX@/bin/dbus-launch --sh-syntax >"${SESSION_FILE}"
++fi
++
++. "${SESSION_FILE}"
++
++if [ "$DO_SH" -eq 1 ]; then
++ echo "DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}';"
++ echo "export DBUS_SESSION_BUS_ADDRESS;"
++ echo "DBUS_SESSION_BUS_PID=${DBUS_SESSION_BUS_PID};"
++fi
++if [ "$DO_CSH" -eq 1 ]; then
++ echo "setenv DBUS_SESSION_BUS_ADDRESS '${DBUS_SESSION_BUS_ADDRESS}';"
++ echo "set DBUS_SESSION_BUS_PID=${DBUS_SESSION_BUS_PID};"
++fi
++
++exit 0
+--- dbus-1.0.2/start-system-bus.sh 1969-12-31 19:00:00.000000000 -0500
++++ dbus-1.0.2-new/start-system-bus.sh 2007-01-09 17:15:31.000000000 -0500
+@@ -0,0 +1,15 @@
++#!/bin/sh
++
++
++
++if [ -f "@FINKPREFIX@/var/run/dbus/pid" ]; then
++ PID=`cat "@FINKPREFIX@/var/run/dbus/pid"`
++ if [ `/bin/ps -p "${PID}" | grep -c "^ *${PID} "` -eq 0 ]; then
++ rm -f "@FINKPREFIX@/var/run/dbus/pid"
++ exec "@FINKPREFIX@/bin/dbus-daemon" --system
++ fi
++else
++ exec "@FINKPREFIX@/bin/dbus-daemon" --system
++fi
++
++exit 0
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
