Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27925

Modified Files:
        dbus.info dbus.patch 
Log Message:
new upstream, uses launchd support instead of X11

Index: dbus.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/dbus.info,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dbus.info   8 Dec 2008 02:45:35 -0000       1.25
+++ dbus.info   17 Feb 2009 16:05:46 -0000      1.26
@@ -1,5 +1,5 @@
 Package: dbus
-Version: 1.2.6
+Version: 1.2.12
 Revision: 1
 Description: Message bus system for applications 
 License: OSI-Approved
@@ -7,12 +7,15 @@
 Maintainer: Benjamin Reed <d...@fink.racoonfink.com>
 
 BuildDepends: <<
+       autoconf (>= 2.63-1),
+       automake1.10,
        expat1,
        fink (>= 0.24.12-1),
        gettext-tools,
        glib2-dev (>= 2.12.0-1),
        libgettext3-dev,
        libiconv-dev,
+       libtool2,
        passwd (>= 20060201-1),
        pkgconfig (>= 0.22-1)
 <<
@@ -23,18 +26,21 @@
 <<
 
 Source: http://%n.freedesktop.org/releases/%n/%n-%v.tar.gz
-Source-MD5: 5dedbe09d4d6a324518487c5277dfa50
+Source-MD5: 39bd582c3b06a261cac44d4cab6fd60b
 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.78.tar.gz
-Source3-MD5: d4aa04b9df35b4bd663be38e959941c8
+Source3: http://%n.freedesktop.org/releases/%n-glib/%n-glib-0.80.tar.gz
+Source3-MD5: 86ea60ba2118a1b9deafe8257f6a6a1a
 Source3ExtractDir: %n-%v
 
 PatchFile: %n.patch
-PatchFile-MD5: 6093ee2f3556aaa4ec11d7444722ab3a
+PatchFile-MD5: d13dd57668c60ff1287fdecfa5c70c24
 
-PatchScript: /usr/bin/sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | 
/usr/bin/patch -p1
+PatchScript: <<
+       /usr/bin/sed -e 
's,DBUS_LAUNCHD_SESSION_BUS_SOCKET,DBUS_FINK_SESSION_BUS_SOCKET,g' -e 
's,@FINKPREFIX@,%p,g' %{PatchFile} | /usr/bin/patch -p1
+       autoreconf -fvi
+<<
 
 SetCFLAGS: -Os -g
 ConfigureParams: <<
@@ -44,6 +50,8 @@
        --with-dbus-daemondir=%p/bin \
        --enable-console-owner-file \
        --enable-kqueue \
+       --enable-launchd \
+       --with-launchd-agent-dir=%p/share/dbus/launchd \
        --disable-tests \
        --disable-userdb-cache \
        --disable-ansi \
@@ -102,8 +110,10 @@
        popd
 
        perl -pi -e 's,%b/tmproot,,' %i/lib/*.la
+       perl -pi -e 's,org.freedesktop,org.finkproject,g' 
%i/share/dbus/launchd/org.freedesktop.dbus-session.plist
+       mv %i/share/dbus/launchd/org.freedesktop.dbus-session.plist 
%i/share/dbus/launchd/org.finkproject.dbus-session.plist
 
-       install -d -m 755 "%i/var/lib/dbus" "%i/var/run/dbus" "%i/share/dbus" 
"%i/share/dbus-1" "%i/etc/dbus-1"
+       install -d -m 755 "%i/var/lib/dbus" "%i/var/run/dbus" "%i/share/dbus-1" 
"%i/etc/dbus-1"
 
        # the rest
        install -c -m 755 start-*-bus.sh %i/bin/
@@ -112,13 +122,13 @@
        cat <<END >%i/etc/profile.d/%N.sh
 #!/bin/sh
 
-eval \`%p/bin/start-session-bus.sh --sh-syntax\`
+%p/bin/start-session-bus.sh
 END
 
        cat <<END >%i/etc/profile.d/%N.csh
 #!/bin/csh
 
-eval \`%p/bin/start-session-bus.sh --csh-syntax\`
+%p/bin/start-session-bus.sh
 END
 
        chmod 755 %i/etc/profile.d/*
@@ -126,7 +136,7 @@
        mv %i/bin/dbus-uuidgen %i/share/%N
 <<
 
-DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README 
+DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README*
 
 SplitOff: <<
        Package: %N-shlibs
@@ -185,6 +195,8 @@
                fi
        fi
        chown -R messagebus:messagebus "%p/var/lib/dbus" "%p/var/run/dbus" 
"%p/share/dbus" "%p/share/dbus-1" "%p/etc/dbus-1"
+       chown root:wheel 
%p/share/dbus/launchd/org.finkproject.dbus-session.plist
+       chmod 644        
%p/share/dbus/launchd/org.finkproject.dbus-session.plist
        %p/bin/start-system-bus.sh >/tmp/dbus-postinst.log 2>&1 || :
 <<
 PostRmScript: <<

Index: dbus.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/dbus.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dbus.patch  8 Dec 2008 02:45:35 -0000       1.9
+++ dbus.patch  17 Feb 2009 16:05:46 -0000      1.10
@@ -1,67 +1,1121 @@
-diff -Nurd dbus-1.2.6/dbus-glib-0.78/tools/Makefile.in 
dbus-1.2.6-new/dbus-glib-0.78/tools/Makefile.in
---- dbus-1.2.6/dbus-glib-0.78/tools/Makefile.in        2008-12-04 
15:52:16.000000000 -0500
-+++ dbus-1.2.6-new/dbus-glib-0.78/tools/Makefile.in    2008-12-07 
21:37:49.000000000 -0500
-@@ -486,7 +486,7 @@
- @use_introspect_xml_t...@dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH)
- @USE_INTROSPECT_XML_TRUE@     cp $(INTROSPECT_XML_PATH) 
dbus-bus-introspect.xml
- @use_introspect_xml_fa...@dbus-bus-introspect.xml:
-...@use_introspect_xml_false@  DBUS_TOP_BUILDDIR=$(top_builddir) 
@dbus_daemon...@dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv 
dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
-...@use_introspect_xml_false@  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.
[...1140 lines suppressed...]
+diff -Nurd dbus-1.2.12/start-session-bus.sh 
dbus-1.2.12-new/start-session-bus.sh
+--- dbus-1.2.12/start-session-bus.sh   1969-12-31 19:00:00.000000000 -0500
++++ dbus-1.2.12-new/start-session-bus.sh       2009-02-17 10:28:21.000000000 
-0500
+@@ -0,0 +1,7 @@
++#!/bin/sh -e
++
++if [ `launchctl list org.finkproject.dbus-session 2>/dev/null | wc -l` -eq 0 
]; then
++      launchctl load 
"@FINKPREFIX@/share/dbus/launchd/org.finkproject.dbus-session.plist"
 +fi
 +
 +exit 0
-diff -Nurd dbus-1.2.6/start-system-bus.sh dbus-1.2.6-new/start-system-bus.sh
---- dbus-1.2.6/start-system-bus.sh     1969-12-31 19:00:00.000000000 -0500
-+++ dbus-1.2.6-new/start-system-bus.sh 2008-12-07 21:37:49.000000000 -0500
+diff -Nurd dbus-1.2.12/start-system-bus.sh dbus-1.2.12-new/start-system-bus.sh
+--- dbus-1.2.12/start-system-bus.sh    1969-12-31 19:00:00.000000000 -0500
++++ dbus-1.2.12-new/start-system-bus.sh        2009-02-17 10:28:21.000000000 
-0500
 @@ -0,0 +1,17 @@
 +#!/bin/sh
 +


------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to