[csw-devel] SF.net SVN: gar:[2979] csw/mgar/pkg

wbonnet at users.sourceforge.net wbonnet at users.sourceforge.net
Tue Feb 3 22:40:59 CET 2009


Revision: 2979
          http://gar.svn.sourceforge.net/gar/?rev=2979&view=rev
Author:   wbonnet
Date:     2009-02-03 21:40:59 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
upgrade to version 1.2.12

Modified Paths:
--------------
    csw/mgar/pkg/codec/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/checksums
    csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec
    csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec
    csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec
    csw/mgar/pkg/dbus/trunk/files/cswdbus
    csw/mgar/pkg/dbus-glib/trunk/Makefile
    csw/mgar/pkg/dbus-glib/trunk/checksums
    csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4util/trunk/checksums
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.gspec
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.gspec
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.gspec

Added Paths:
-----------
    csw/mgar/pkg/java/

Removed Paths:
-------------
    csw/mgar/pkg/dbus/trunk/files/CSWdbus.depend
    csw/mgar/pkg/dbus/trunk/files/CSWdbus.postinstall
    csw/mgar/pkg/dbus/trunk/files/CSWdbus.preremove
    csw/mgar/pkg/dbus/trunk/files/CSWdbus.prototype
    csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.depend
    csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.prototype
    csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.depend
    csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.prototype
    csw/mgar/pkg/dbus/trunk/files/checkinstall
    csw/mgar/pkg/dbus/trunk/files/dbus.xml
    csw/mgar/pkg/dbus/trunk/files/i.smfno
    csw/mgar/pkg/dbus/trunk/files/i.smfyes
    csw/mgar/pkg/dbus/trunk/files/space
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.depend
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.prototype
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.depend
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.prototype
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.depend
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.prototype
    csw/mgar/pkg/xfce/libxfce4util/trunk/files/gar-base.diff

Property Changed:
----------------
    csw/mgar/pkg/xfce/libxfce4util/trunk/

Modified: csw/mgar/pkg/codec/trunk/Makefile
===================================================================
--- csw/mgar/pkg/codec/trunk/Makefile	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/codec/trunk/Makefile	2009-02-03 21:40:59 UTC (rev 2979)
@@ -4,9 +4,9 @@
 GARNAME = commons-$(SHORTNAME)
 CATEGORIES = java
 
-DESCRIPTION = Apache Jakarta Commons codec : codec of Responsibility pattern API
+DESCRIPTION = Apache Jakarta Commons Codec
 define BLURB
-Apache Jakarta Commons codec provides "codec of Responsibility" pattern implemention
+Apache Jakarta Commons Codec : implementations of common encoders and decoders such as Base64
 endef
 
 # Use jakarta sources

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,5 +1,5 @@
 GARNAME      = dbus
-GARVERSION   = 1.2.4
+GARVERSION   = 1.2.12
 CATEGORIES   = lib
 
 DESCRIPTION  = DBus Message Bus System
@@ -11,33 +11,51 @@
 
 MASTER_SITES  = http://dbus.freedesktop.org/releases/dbus/
 DISTFILES     = $(GARNAME)-$(GARVERSION).tar.gz 
-PKGDIST       = $(GARNAME)-$(GARVERSION).tar.gz 
-DISTFILES    += CSWdbus.gspec CSWdbus.prototype CSWdbus.depend CSWdbus.postinstall CSWdbus.preinstall checkinstall 
-DISTFILES    += space i.smfno i.smfyes svc-dbus dbus.xml cswdbus CSWdbus.preremove
-DISTFILES    += CSWlibdbus.gspec CSWlibdbus.prototype CSWlibdbus.depend
-DISTFILES    += CSWlibdbusdev.gspec CSWlibdbusdev.prototype CSWlibdbusdev.depend
-# DISTFILES    += $(call admfiles,CSWdbus, depend)
+PKGDIST       = $(DISTFILE)
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+# Generate description fields
+SPKG_DESC_CSWdbus         = $(DESCRIPTION)
+SPKG_DESC_CSWlibdbus      = $(DESCRIPTION) libraries
+SPKG_DESC_CSWlibdbusdev   = $(DESCRIPTION) development package
 
-CFLAGS       += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
-CXXFLAGS     += -xlibmil -xlibmopt -features=tmplife -norunpath
-LDFLAGS      += -L/opt/csw/lib -R/opt/csw/lib
+# SMF support
+SPKG_CLASSES = none cswinitsmf
+PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswfoo$$$$/ { $$$$2 = "cswinitsmf" } { print }'
+	
+DISTFILES    += $(call admfiles,CSWdbus, preinstall, cswdbus)
+DISTFILES    += cswdbus
+DISTFILES    += $(call admfiles,CSWlibdbusdev, )
+DISTFILES    += $(call admfiles,CSWlibdbus, )
 
-export CFLAGS CXXFLAGS LDFLAGS
+# Dynamic CSWlibdbusdev prototype
+PKGFILES_CSWlibdbusdev  = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibdbusdev += $(includedir)/include/.*
+PKGFILES_CSWlibdbusdev += $(libdir)/dbus-1.0/.*
+PKGFILES_CSWlibdbusdev += $(libdir)/.*\.a
+PKGFILES_CSWlibdbusdev += $(libdir)/pkgconfig/.*
 
-GREP = ggrep
+# Dynamic CSWlibdbus prototype
+PKGFILES_CSWlibdbus     = $(libdir)/.*\.la
+PKGFILES_CSWlibdbus    += $(libdir)/.*\.so
+PKGFILES_CSWlibdbus    += $(libdir)/.*\.so\..*
 
-include gar/category.mk
+# Dependencies tracking
+REQUIRED_PKGS_CSWdbus	    += CSWexpat CSWlibx11 CSWlibxau CSWlibxcb CSWlibxdmcp CSWlibdbus CSWcswclassutils
+REQUIRED_PKGS_CSWlibdbusdev  = CSWlibdbus
 
-CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man --disable-tests --with-xml=expat
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-tests --with-xml=expat 
 
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+# moving configuration file & installing init script
 post-install:
-	( mkdir -p $(DESTDIR)/etc/init.d )
-	( mkdir -p $(DESTDIR)/etc/rc3.d )
-	( cp -fr $(FILEDIR)/csw$(GARNAME) $(DESTDIR)/etc/init.d )
-	( rm -f $(DESTDIR)/etc/rc3.d/S52$(GARNAME) )
-	( ln -s /etc/init.d/csw$(GARNAME) $(DESTDIR)/etc/rc3.d/S52$(GARNAME) )
-	( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
+	( ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d  ; \
+	  ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/init.d  ; \
+	  cp -fr $(FILEDIR)/csw$(GARNAME) $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/init.d  ; \
+	  rm -f $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52$(GARNAME)  ; \
+	  ln -s ../init.d/csw$(GARNAME) $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52$(GARNAME)  ; )
 
+include gar/category.mk
+

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/checksums	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,20 +1,6 @@
-2e643910a09f44b000a0d76038637999  download/dbus-1.2.4.tar.gz
-0956c2a4c626eaa494d6c95aeed3f335  download/CSWdbus.gspec
-f6e781fcc74d4444b18dd17be11153c5  download/CSWdbus.prototype
-81bc75f2ab42dfeb22ecbf8a0db0b2ba  download/CSWdbus.depend
-b093e0816fcca4ec08c41da64be36ff3  download/CSWdbus.postinstall
+39bd582c3b06a261cac44d4cab6fd60b  download/dbus-1.2.12.tar.gz
+c42e10133d9c6358f3fb2a8c14d71cd3  download/CSWdbus.gspec
 6e26e51243c4551ac222112edf67b5db  download/CSWdbus.preinstall
-e62348be24eef2faf9c9e3af5de0e209  download/checkinstall
-f49c3339aa897df97abf1baf54582fb8  download/space
-848ef38127a2c97a70aa1732431f0ac4  download/i.smfno
-bf067dcada44a3d278d67fbec727e197  download/i.smfyes
-ec6a5e81488a3f1f19da57a8fbc4ea27  download/svc-dbus
-b55ad85eb459a4d591f30ec70bf1c872  download/dbus.xml
-72c43660ee96009043746c6d4894b02c  download/cswdbus
-a6e0e854f20c9fe8c3c7f486ac0b3912  download/CSWdbus.preremove
-c1e411b511a659e3b8d0803364226019  download/CSWlibdbus.gspec
-8575354d3ed4f3252913a9af03994386  download/CSWlibdbus.prototype
-d41d8cd98f00b204e9800998ecf8427e  download/CSWlibdbus.depend
-8835a675e247c7fb1e22c1db1c1e76f6  download/CSWlibdbusdev.gspec
-bb58bcb87b69235c94a84576b6059097  download/CSWlibdbusdev.prototype
-4fde42a6c04eeae5dbdad8b0d65bd337  download/CSWlibdbusdev.depend
+92b99c85d75cac9a2d5f4d3fc43a278d  download/cswdbus
+efa131461a5aad4ad4516ff9d733e6bf  download/CSWlibdbusdev.gspec
+31b0245986c698250974b7d038c65beb  download/CSWlibdbus.gspec

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWdbus.depend
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWdbus.depend	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.depend	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,5 +0,0 @@
-P CSWiconv       libiconv - GNU iconv library
-P CSWlibxml2     libxml2 - XML Parser Library
-P CSWzlib        zlib - Zlib Data Compression Library
-P CSWlibdbus     libdbus - DBus Message Bus System - dynamic libraries
-P CSWexpat

Modified: csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.gspec	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,4 +1,4 @@
 %var            bitname dbus
 %var            pkgname CSWdbus
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWdbus.postinstall
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWdbus.postinstall	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.postinstall	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# Blastwave.org DBus package post install script
-
-# Create the link only if it does not already exist
-DBUS_VAR_DIR=/opt/csw/var/lib/dbus
-DBUS_MACHINE_ID_FILE=machine-id
-if [ ! -d $DBUS_VAR_DIR ]; then
-    mkdir -p $DBUS_VAR_DIR
-fi
-
-if [ ! -f $DBUS_VAR_DIR/$DBUS_MACHINE_ID_FILE ]; then
-    /opt/csw/bin/dbus-uuidgen --ensure
-fi
-
-# Set variable smf depending on the availability of SMF binaries
-smf=no
-if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]
-	then
-  	smf=yes
-fi
-
-# If needed, configure SMF
-if [ $smf = yes ]
-then
-	# Register with SMF
-	echo "Configuring service in SMF"
-	/usr/sbin/svccfg import /opt/csw/var/svc/manifest/system/dbus.xml >/dev/null 2>&1
-	/usr/sbin/svcadm disable svc:/system/cswdbus >/dev/null 2>&1
-	echo "DBus is using Service Management Facility.  The FMRI is:"
-	echo "  svc:/system/cswdbus:default"
-	echo "Starting dbus..."
-	if [ $smf = no ]
-	then
-		/etc/init.d/cswdbus start
-	else
-		/usr/sbin/svcadm enable svc:/system/cswdbus
-	fi
-fi
-
-
-exit 0

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWdbus.preremove
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWdbus.preremove	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.preremove	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-smf=no
-if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ;
-then smf=yes ; fi
-
-if [ $smf = yes ]
-  then
-  # Disable service
-     /usr/sbin/svcadm disable -s svc:system/cswdbus:default >/dev/null 2>&1
-
-   # Unregister with SMF
-   /usr/sbin/svccfg delete svc:system/cswdbus:default >/dev/null 2>&1
-fi

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWdbus.prototype
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWdbus.prototype	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWdbus.prototype	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,47 +0,0 @@
-d none /opt/csw 0755 root bin
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/dbus-cleanup-sockets 0755 root bin
-f none /opt/csw/bin/dbus-daemon 0755 root bin
-f none /opt/csw/bin/dbus-launch 0755 root bin
-f none /opt/csw/bin/dbus-monitor 0755 root bin
-f none /opt/csw/bin/dbus-send 0755 root bin
-f none /opt/csw/bin/dbus-uuidgen 0755 root bin
-d none /opt/csw/etc 0755 root bin
-d none /opt/csw/etc/dbus-1 0755 root bin
-f none /opt/csw/etc/dbus-1/session.conf 0644 root bin
-d none /opt/csw/etc/dbus-1/session.d 0755 root bin
-f none /opt/csw/etc/dbus-1/system.conf 0644 root bin
-d none /opt/csw/etc/dbus-1/system.d 0755 root bin
-d none /opt/csw/libexec/dbus-1 0755 root bin
-f none /opt/csw/libexec/dbus-daemon-launch-helper 0755 root bin
-d none /opt/csw/share/dbus-1 0755 root bin
-d none /opt/csw/share/dbus-1/services 0755 root bin
-d none /opt/csw/share/dbus-1/system-services 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-f none /opt/csw/share/man/man1/dbus-cleanup-sockets.1 0644 root bin
-f none /opt/csw/share/man/man1/dbus-daemon.1 0644 root bin
-f none /opt/csw/share/man/man1/dbus-launch.1 0644 root bin
-f none /opt/csw/share/man/man1/dbus-monitor.1 0644 root bin
-f none /opt/csw/share/man/man1/dbus-send.1 0644 root bin
-f none /opt/csw/share/man/man1/dbus-uuidgen.1 0644 root bin
-d none /opt/csw/var/lib/dbus 0755 root bin
-d none /opt/csw/var/run/dbus 0777 root bin
-f smfno /etc/init.d/cswdbus 0755 root bin
-l smfno /etc/rc3.d/S52cswdbus=/etc/init.d/cswdbus
-d smfyes /opt/csw/var/svc 0755 root bin
-d smfyes /opt/csw/var/svc/manifest 0755 root bin
-d smfyes /opt/csw/var/svc/manifest/system 0755 root bin
-f smfyes /opt/csw/var/svc/manifest/system/dbus.xml=dbus.xml 0644 root bin
-d smfyes /opt/csw/lib/svc 0755 root bin
-d smfyes /opt/csw/lib/svc/method 0755 root bin
-f smfyes /opt/csw/lib/svc/method/svc-dbus=svc-dbus 0755 root bin
-i copyright=CSWdbus.copyright
-i depend=CSWdbus.depend
-i pkginfo=CSWdbus.pkginfo
-i postinstall=CSWdbus.postinstall
-i preinstall=CSWdbus.preinstall
-i checkinstall
-i i.smfno
-i i.smfyes
-i space

Modified: csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.gspec	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,5 +1,4 @@
 %var            bitname libdbus
 %var            pkgname CSWlibdbus
-%var            desc DBus Message Bus System - dynamic libraries
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.prototype
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.prototype	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbus.prototype	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,7 +0,0 @@
-f none /opt/csw/lib/libdbus-1.la 0755 root bin
-f none /opt/csw/lib/libdbus-1.so.3.4.0 0755 root bin
-s none /opt/csw/lib/libdbus-1.so.3=libdbus-1.so.3.4.0
-s none /opt/csw/lib/libdbus-1.so=libdbus-1.so.3.4.0
-i copyright=CSWlibdbus.copyright
-i depend=CSWlibdbus.depend
-i pkginfo=CSWlibdbus.pkginfo

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.depend
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.depend	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.depend	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1 +0,0 @@
-P CSWlibdbus

Modified: csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.gspec	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,5 +1,4 @@
 %var            bitname libdbusdev
 %var            pkgname CSWlibdbusdev
-%var            desc DBus Message Bus System - development headers
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.prototype
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.prototype	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/CSWlibdbusdev.prototype	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,26 +0,0 @@
-d none /opt/csw/include/dbus-1.0 0755 root bin
-d none /opt/csw/include/dbus-1.0/dbus 0755 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-address.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-bus.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-connection.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-errors.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-macros.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-memory.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-message.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-misc.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-pending-call.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-protocol.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-server.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-shared.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-signature.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-threads.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus-types.h 0644 root bin
-f none /opt/csw/include/dbus-1.0/dbus/dbus.h 0644 root bin
-d none /opt/csw/lib/dbus-1.0/include/dbus 0755 root bin
-f none /opt/csw/lib/dbus-1.0/include/dbus/dbus-arch-deps.h 0644 root bin
-f none /opt/csw/lib/libdbus-1.a 0644 root bin
-d none /opt/csw/lib/pkgconfig 0755 root bin
-f none /opt/csw/lib/pkgconfig/dbus-1.pc 0644 root bin
-i copyright=CSWlibdbusdev.copyright
-i depend=CSWlibdbusdev.depend
-i pkginfo=CSWlibdbusdev.pkginfo

Deleted: csw/mgar/pkg/dbus/trunk/files/checkinstall
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/checkinstall	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/checkinstall	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,21 +0,0 @@
-# dbus - checkinstall script
-#
-trap `exit 3` 15
-
-# Assign Solaris release class to install release specific files
-smf=no
-if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi
-if [ $smf = yes ]
-then
-        CLASSES='none smfyes'
-else
-        CLASSES='none smfno'
-fi
-
-# Make env variables available to other packaging scripts
-
-cat >$1 <<!
-CLASSES='$CLASSES'
-!
-
-exit 0

Modified: csw/mgar/pkg/dbus/trunk/files/cswdbus
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/cswdbus	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/cswdbus	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,7 +1,15 @@
 #!/sbin/sh
 
+#RC_KNUM 52         # Number used for kill script symlink, e.g. K20cswfoo
+#RC_SNUM 52         # Number used for start script symlink, e.g. S80cswfoo
+#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
+#RC_SLEV 3          # Run levels that should have a start script symlink
+#FMRI system        # FMRI path for service (S10+), default is /network.
+
+. /lib/svc/share/smf_include.sh
+
 DBUS_VAR_DIR=/opt/csw/var/lib/dbus
-DBUS_VAR_RUN_DIR=/opt/csw/var/lib/dbus
+DBUS_VAR_RUN_DIR=/opt/csw/var/run/dbus
 DBUS_MACHINE_ID_FILE=machine-id
 
 if [ ! -d $DBUS_VAR_DIR ]; then
@@ -12,14 +20,20 @@
     /opt/csw/bin/dbus-uuidgen --ensure
 fi
 
+if smf_is_nonglobalzone; then
+       /usr/sbin/svcadm disable -t svc:/system/cswdbus
+        echo "dbus-daemon cannot be run in non-global zones"
+       sleep 5 &
+       exit $SMF_EXIT_OK
+fi
 
 case $1 in 
 'start')
-        if [ ! -d $DBUS_VAR_DIR ]; then
-                mkdir -p $DBUS_VAR_DIR
+        if [ ! -d $DBUS_VAR_RUN_DIR ]; then
+                mkdir -p $DBUS_VAR_RUN_DIR
         fi
-        if [ -f $DBUS_VAR_DIR/pid ]; then
-                rm -f $DBUS_VAR_DIR/pid
+        if [ -f $DBUS_VAR_RUN_DIR/pid ]; then
+                rm -f $DBUS_VAR_RUN_DIR/pid
         fi
 
         /opt/csw/bin/dbus-daemon --system
@@ -30,6 +44,10 @@
         fi
         ;;
 
+'stop')
+# kill -9 `/opt/csw/bin/dbus-daemon --print-pid`
+        ;;
+
 *)
         echo "Usage: $0 { start }"
         exit 1

Deleted: csw/mgar/pkg/dbus/trunk/files/dbus.xml
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus.xml	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/dbus.xml	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,29 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
-
-<service_bundle type='manifest' name='CSWdbus:dbus'>
-	<service name='system/cswdbus' type='service' version='1'>
-		<create_default_instance enabled='true' />
-	 	<single_instance />
-
-		<dependency name='usr' grouping='require_all' restart_on='none' type='service'>
-			<service_fmri value='svc:/system/filesystem/local' />
-		</dependency>
-	
-		<exec_method type='method' name='start' exec='/opt/csw/lib/svc/method/svc-dbus start' timeout_seconds='30'>
-            <method_context working_directory='/opt/csw/share/dbus-1'>
-				<method_credential user='root' group='root' />
-			</method_context>
-		</exec_method>
-		
-		<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30'>
-		</exec_method>
-
-        <property_group name='startd' type='framework'>
-                <!-- sub-process core dumps shouldn't restart session -->
-                <propval name='ignore_error' type='astring' value='core,signal' />
-        </property_group>
-		
-	</service>
-
-</service_bundle>

Deleted: csw/mgar/pkg/dbus/trunk/files/i.smfno
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/i.smfno	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/i.smfno	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,15 +0,0 @@
-# dbus - i.smfno script
-#
-# Copy the non-SMF specific files to the base directory.
-# The files to copy are:
-# /etc/init.d/cswdbus=cswdbus
-# /etc/rc3.d/S52cswdbus=/etc/init.d/cswdbus
-#
-echo "Installing class <smfno>."
-while read src dest
-do
-        # Do copy
-        /usr/bin/cp $src $dest || exit 2
-        echo $dest
-done
-exit 0

Deleted: csw/mgar/pkg/dbus/trunk/files/i.smfyes
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/i.smfyes	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/i.smfyes	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,20 +0,0 @@
-# dbus - i.smfyes script
-#
-# Copy the SMF specific files to the base directory.
-# The files specific to SMF are:
-# /opt/csw/var/svc
-# /opt/csw/var/svc/manifest
-# /opt/csw/var/svc/manifest/system
-# /opt/csw/var/svc/manifest/system/dbus.xml=/dbus.xml
-# /opt/csw/lib/svc
-# /opt/csw/lib/svc/method
-# /opt/csw/lib/svc/method/svc-dbus
-#
-echo "Installing class <smfyes>."
-while read src dest
-do
-        # Do copy
-        /usr/bin/cp $src $dest || exit 2
-        echo $dest
-done
-exit 0

Deleted: csw/mgar/pkg/dbus/trunk/files/space
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/space	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus/trunk/files/space	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,3 +0,0 @@
-# No additional space is actually needed.
-# In fact, only one set of the Solaris release specific files are installed.
-# So the space required for this package is less than what is in pkgmap.

Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus-glib/trunk/Makefile	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus-glib/trunk/Makefile	2009-02-03 21:40:59 UTC (rev 2979)
@@ -11,38 +11,29 @@
 
 MASTER_SITES  = http://dbus.freedesktop.org/releases/dbus-glib/
 DISTFILES     = $(GARNAME)-$(GARVERSION).tar.gz 
-PKGDIST       = $(GARNAME)-$(GARVERSION).tar.gz 
+PKGDIST       = $(DISTFILE)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-DISTFILES    += CSWdbusglib.gspec CSWdbusglib.prototype CSWdbusglib.depend
-DISTFILES    += CSWdbusglibdev.gspec CSWdbusglibdev.prototype CSWdbusglibdev.depend
-# DISTFILES    += $(call admfiles,CSWdbusglib, depend)
+SPKG_DESC_CSWdbusglib = $(DESCRIPTION)
+SPKG_DESC_CSWdbusglibdevel = $(DESCRIPTION) development package
 
-CFLAGS       += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
-CXXFLAGS     += -xlibmil -xlibmopt -features=tmplife -norunpath
-# CPPFLAGS   += -I$(DESTDIR)/opt/csw/include/xfce4
-LDFLAGS      += -L/opt/csw/lib -R/opt/csw/lib
+DISTFILES    += $(call admfiles,CSWdbusglib, )
+DISTFILES    += $(call admfiles,CSWdbusglibdev, )
 
-#P CSWexpat       expat -  XML Parser Toolkit
-#P CSWggettext          ggettext - GNU gettext
-#P CSWglib2       glib2 - the low-level core library for GTK+ and GNOME
-#P CSWiconv       libiconv - GNU iconv library
-#P CSWsunmath     libsunmath - Sun maths library
-#P CSWlibdbus
+REQUIRED_PKGS_CSWdbusglibdev	= CSWdbusglib
+REQUIRED_PKGS_CSWdbusglib      	= CSWexpat CSWggettext CSWglib2 CSWiconv CSWsunmath CSWlibdbus
 
-export CFLAGS CXXFLAGS LDFLAGS
+PKGFILES_CSWdbusglibdev  = $(PKGFILES_DEVEL)
+PKGFILES_CSWdbusglibdev += $(prefix)/include/.*
+PKGFILES_CSWdbusglibdev += $(prefix)/lib/.*\.a
+PKGFILES_CSWdbusglibdev += $(prefix)/lib/pkgconfig/.*
 
-include gar/category.mk
-
-LIBDEPS += lib/dbus
-
 CPPFLAGS += -I$(DESTDIR)/opt/csw/include/dbus-1.0
 CPPFLAGS += -I$(DESTDIR)/opt/csw/lib/dbus-1.0/include
 
-CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man --disable-tests
+CONFIGURE_ARGS += --disable-tests
 
-post-install:
-	( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
+include gar/category.mk
 

Modified: csw/mgar/pkg/dbus-glib/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus-glib/trunk/checksums	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/dbus-glib/trunk/checksums	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,7 +1,3 @@
-d3b716a7e798faa1c6a867675f00306a  download/dbus-glib-0.76.tar.gz
-4e968829bc52f3e5d275c51d6fb6abdf  download/CSWdbusglib.gspec
-c9226d5022515cf22bef5053f74362f3  download/CSWdbusglib.prototype
-daca85e9ba88eb6c23a964f3972c779b  download/CSWdbusglib.depend
-fdba920e74efe491d775a8670a2be900  download/CSWdbusglibdev.gspec
-58f8df4bfb8e69bb7091ca99a57215cd  download/CSWdbusglibdev.prototype
-992e5320ff625f2b76d266179a44d30c  download/CSWdbusglibdev.depend
+86ea60ba2118a1b9deafe8257f6a6a1a  download/dbus-glib-0.80.tar.gz
+461abd981eb75cd3965976fed9c5b0ba  download/CSWdbusglib.gspec
+2c62e1c94b10fa4505a2a395ec5abf25  download/CSWdbusglibdev.gspec


Property changes on: csw/mgar/pkg/xfce/libxfce4util/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile	2009-02-03 21:40:59 UTC (rev 2979)
@@ -7,24 +7,29 @@
 endef
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += CSWlibxfce4util.depend CSWlibxfce4util.gspec CSWlibxfce4util.prototype
-DISTFILES += CSWlibxfce4utildoc.depend CSWlibxfce4utildoc.gspec CSWlibxfce4utildoc.prototype
-DISTFILES += CSWlibxfce4utildev.depend CSWlibxfce4utildev.gspec CSWlibxfce4utildev.prototype
-# DISTFILES += $(call admfiles,CSWlibxfce4util, depend) 
+DISTFILES += $(call admfiles,CSWlibxfce4util, )
+DISTFILES += $(call admfiles,CSWlibxfce4utildoc, )
+DISTFILES += $(call admfiles,CSWlibxfce4utildev, )
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-PATCHFILES += gar-base.diff
+SPKG_DESC_CSWlibxfxe4util    = $(DESCRIPTION)
+SPKG_DESC_CSWlibxfxe4utildev = $(DESCRIPTION) development package
+SPKG_DESC_CSWlibxfxe4utildoc = $(DESCRIPTION) documentation package
 
-TEST_SCRIPTS = none
+# PATCHFILES += gar-base.diff
 
-include gar/category.mk
+PKGFILES_CSWlibxfce4utildev  = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibxfce4utildev += $(prefix)/X11/include/.*
+PKGFILES_CSWlibxfce4utildev += $(prefix)/X11/lib/.*\.a
+PKGFILES_CSWlibxfce4utildev += $(prefix)/X11/lib/pkgconfig/.*
 
+PKGFILES_CSWlibxfce4utildoc  = $(prefix)/share/doc/.*
 
-test-none:
-	@$(MAKECOOKIE)
+REQUIRED_PKGS_CSWlibxfce4util    = 
+REQUIRED_PKGS_CSWlibxfce4utildev = CSWlibxfce4util
+REQUIRED_PKGS_CSWlibxfce4utildoc = CSWlibxfce4util
 
-post-install:
-	( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
+include gar/category.mk
 

Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/checksums
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/checksums	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/checksums	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,12 +1,5 @@
-261e7a5df039493ad746e0c359211092  download/libxfce4util-4.4.2.tar.bz2
-204fa36f229885fdafa03229119bf753  download/CSWlibxfce4util.depend
-69530d614ca88fe56efbd715372f45e2  download/CSWlibxfce4util.gspec
-39d75aafa129790a9878f3beaa2c8c29  download/CSWlibxfce4util.prototype
-55dd8c5ee61882724cf30b0e7c16a3c1  download/CSWlibxfce4utildoc.depend
-93f21bbd4ce48c4e6369c65f64b23138  download/CSWlibxfce4utildoc.gspec
-ebc74b5d0b9b8d4f5b23ae008f3e84ca  download/CSWlibxfce4utildoc.prototype
-dbae24cf4aef6297eddf1854e245662f  download/CSWlibxfce4utildev.depend
-ee6fcd7e10f95c9525dd52ed06243bac  download/CSWlibxfce4utildev.gspec
-49c324cc8383930673f5f6b2a4e0f07f  download/CSWlibxfce4utildev.prototype
-261e7a5df039493ad746e0c359211092  download/libxfce4util-4.4.2.tar.bz2
-382a19e5a0db520caa635215e9990c19  download/gar-base.diff
+c6fe00e3c682b3aab9f7ac47c98a8cd0  download/libxfce4util-4.5.93svn-r29290.tar.bz2
+336c84716e6dc262cc97bb58b96b554f  download/CSWlibxfce4util.gspec
+b9e0f4cdeaf7d55d285d647172e92ef0  download/CSWlibxfce4utildoc.gspec
+c33e3cc6861853fccd55b4ceb5376780  download/CSWlibxfce4utildev.gspec
+c6fe00e3c682b3aab9f7ac47c98a8cd0  download/libxfce4util-4.5.93svn-r29290.tar.bz2

Deleted: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.depend
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.depend	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.depend	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,5 +0,0 @@
-I CSWxfcelibs - lightweight desktop environment, core libraries
-P CSWggettext ggettext - GNU gettext
-P CSWglib2 glib2 - Low-level core library that forms the basis of GTK+
-P CSWiconv libiconv - GNU iconv library
-P CSWsunmath libsunmath - Sun maths library

Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.gspec
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.gspec	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.gspec	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,4 +1,4 @@
 %var            bitname libxfce4util
 %var            pkgname CSWlibxfce4util
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.prototype
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.prototype	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4util.prototype	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,98 +0,0 @@
-f none /opt/csw/lib/libxfce4util.la 0755 root bin
-f none /opt/csw/lib/libxfce4util.so.4.0.2 0755 root bin
-s none /opt/csw/lib/libxfce4util.so.4=libxfce4util.so.4.0.2
-s none /opt/csw/lib/libxfce4util.so=libxfce4util.so.4.0.2
-f none /opt/csw/sbin/xfce4-kiosk-query 0755 root bin
-d none /opt/csw/share/locale/am 0755 root bin
-d none /opt/csw/share/locale/am/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/am/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/ar 0755 root bin
-d none /opt/csw/share/locale/ar/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ar/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/ca 0755 root bin
-d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ca/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/cs 0755 root bin
-d none /opt/csw/share/locale/cs/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/cs/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/cy 0755 root bin
-d none /opt/csw/share/locale/cy/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/cy/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/de 0755 root bin
-d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/de/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/dz 0755 root bin
-d none /opt/csw/share/locale/dz/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/dz/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/en_GB 0755 root bin
-d none /opt/csw/share/locale/en_GB/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/en_GB/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/eu 0755 root bin
-d none /opt/csw/share/locale/eu/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/eu/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/fi 0755 root bin
-d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/fi/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/fr 0755 root bin
-d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/fr/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/gl 0755 root bin
-d none /opt/csw/share/locale/gl/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/gl/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/he 0755 root bin
-d none /opt/csw/share/locale/he/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/he/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/it 0755 root bin
-d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/it/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/ja 0755 root bin
-d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ja/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/ka 0755 root bin
-d none /opt/csw/share/locale/ka/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ka/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/ko 0755 root bin
-d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ko/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/lt 0755 root bin
-d none /opt/csw/share/locale/lt/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/lt/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/lv 0755 root bin
-d none /opt/csw/share/locale/lv/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/lv/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/mk 0755 root bin
-d none /opt/csw/share/locale/mk/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/mk/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/nb_NO 0755 root bin
-d none /opt/csw/share/locale/nb_NO/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/nb_NO/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/nl 0755 root bin
-d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/nl/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/pl 0755 root bin
-d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pl/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/pt_BR 0755 root bin
-d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/pt_PT 0755 root bin
-d none /opt/csw/share/locale/pt_PT/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/pt_PT/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/ro 0755 root bin
-d none /opt/csw/share/locale/ro/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/ro/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/sq 0755 root bin
-d none /opt/csw/share/locale/sq/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/sq/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/th 0755 root bin
-d none /opt/csw/share/locale/th/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/th/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/tr 0755 root bin
-d none /opt/csw/share/locale/tr/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/tr/LC_MESSAGES/libxfce4util.mo 0644 root bin
-d none /opt/csw/share/locale/uk 0755 root bin
-d none /opt/csw/share/locale/uk/LC_MESSAGES 0755 root bin
-f none /opt/csw/share/locale/uk/LC_MESSAGES/libxfce4util.mo 0644 root bin
-i copyright=CSWlibxfce4util.copyright
-i depend=CSWlibxfce4util.depend
-i pkginfo=CSWlibxfce4util.pkginfo

Deleted: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.depend
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.depend	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.depend	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,2 +0,0 @@
-I CSWxfcelibs - lightweight desktop environment, core libraries
-P CSWlibxfce4util libxfce4util - Xfce Utilities Library

Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.gspec
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.gspec	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.gspec	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,5 +1,4 @@
 %var            bitname libxfce4utildev
-%var            desc  Xfce Utilities Library Headers
 %var            pkgname CSWlibxfce4utildev
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.prototype
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.prototype	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildev.prototype	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,25 +0,0 @@
-d none /opt/csw/include 0755 root bin
-d none /opt/csw/include/xfce4/libxfce4util 0755 root bin
-f none /opt/csw/include/xfce4/libxfce4util/debug.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/i18n.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/libxfce4util-config.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/libxfce4util-enum-types.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/libxfce4util.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/utf8.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/util.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-desktopentry.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-fileutils.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-generics.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-i18n.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-kiosk.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-license.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-miscutils.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-rc.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-resource.h 0644 root bin
-f none /opt/csw/include/xfce4/libxfce4util/xfce-utf8.h 0644 root bin
-f none /opt/csw/lib/libxfce4util.a 0644 root bin
-d none /opt/csw/lib/pkgconfig 0755 root bin
-f none /opt/csw/lib/pkgconfig/libxfce4util-1.0.pc 0644 root bin
-i copyright=CSWlibxfce4utildev.copyright
-i depend=CSWlibxfce4utildev.depend
-i pkginfo=CSWlibxfce4utildev.pkginfo

Deleted: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.depend
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.depend	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.depend	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1 +0,0 @@
-I CSWxfcelibs - lightweight desktop environment, core libraries

Modified: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.gspec
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.gspec	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.gspec	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,6 +1,4 @@
 %var            bitname libxfce4utildoc
-%var            desc  Xfce Utilities Library Documentation
 %var            pkgname CSWlibxfce4utildoc
-%var            arch all
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Deleted: csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.prototype
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.prototype	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/CSWlibxfce4utildoc.prototype	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,29 +0,0 @@
-d none /opt/csw/share/gtk-doc/html/libxfce4util 0755 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/home.png 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/index.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/index.sgml 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/left.png 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-core.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util.devhelp 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/reference.html 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/right.png 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/style.css 0644 root bin
-f none /opt/csw/share/gtk-doc/html/libxfce4util/up.png 0644 root bin
-i copyright=CSWlibxfce4utildoc.copyright
-i depend=CSWlibxfce4utildoc.depend
-i pkginfo=CSWlibxfce4utildoc.pkginfo

Deleted: csw/mgar/pkg/xfce/libxfce4util/trunk/files/gar-base.diff
===================================================================
--- csw/mgar/pkg/xfce/libxfce4util/trunk/files/gar-base.diff	2009-02-03 20:10:39 UTC (rev 2978)
+++ csw/mgar/pkg/xfce/libxfce4util/trunk/files/gar-base.diff	2009-02-03 21:40:59 UTC (rev 2979)
@@ -1,139 +0,0 @@
-diff --speed-large-files --minimal -Nru libxfce4util-4.4.2.orig/libxfce4util/libxfce4util-private.h libxfce4util-4.4.2/libxfce4util/libxfce4util-private.h
---- libxfce4util-4.4.2.orig/libxfce4util/libxfce4util-private.h	2007-11-17 20:29:47.000000000 +0100
-+++ libxfce4util-4.4.2/libxfce4util/libxfce4util-private.h	2007-12-02 16:04:30.949499000 +0100
-@@ -30,7 +30,7 @@
- 
- G_BEGIN_DECLS;
- 
--void _xfce_i18n_init (void) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL void _xfce_i18n_init (void);
- 
- G_END_DECLS;
- 
-diff --speed-large-files --minimal -Nru libxfce4util-4.4.2.orig/libxfce4util/xfce-rc-private.h libxfce4util-4.4.2/libxfce4util/xfce-rc-private.h
---- libxfce4util-4.4.2.orig/libxfce4util/xfce-rc-private.h	2007-11-17 20:29:47.000000000 +0100
-+++ libxfce4util-4.4.2/libxfce4util/xfce-rc-private.h	2007-12-02 16:09:57.939783000 +0100
-@@ -61,71 +61,71 @@
- #define XFCE_RC_SIMPLE_CONST(obj) ((const XfceRcSimple *) (obj))
- 
- 
--void          _xfce_rc_init               (XfceRc       *rc) G_GNUC_INTERNAL;
-+G_GNUC_INTERNAL void          _xfce_rc_init               (XfceRc       *rc);
- 
--XfceRcSimple* _xfce_rc_simple_new         (XfceRcSimple *shared,
-+G_GNUC_INTERNAL XfceRcSimple* _xfce_rc_simple_new         (XfceRcSimple *shared,
-                                            const gchar  *filename,
--                                           gboolean      readonly) G_GNUC_INTERNAL;
--gboolean      _xfce_rc_simple_parse       (XfceRcSimple *simple) G_GNUC_INTERNAL;
--void          _xfce_rc_simple_close       (XfceRc       *rc) G_GNUC_INTERNAL;
--void          _xfce_rc_simple_flush       (XfceRc       *rc) G_GNUC_INTERNAL;
--void          _xfce_rc_simple_rollback    (XfceRc       *rc) G_GNUC_INTERNAL;
--gboolean      _xfce_rc_simple_is_dirty    (const XfceRc *rc) G_GNUC_CONST G_GNUC_INTERNAL;
--gboolean      _xfce_rc_simple_is_readonly (const XfceRc *rc) G_GNUC_CONST G_GNUC_INTERNAL;
--const gchar*  _xfce_rc_simple_get_filename(const XfceRc *rc) G_GNUC_CONST G_GNUC_INTERNAL;
--gchar**       _xfce_rc_simple_get_groups  (const XfceRc *rc) G_GNUC_CONST G_GNUC_INTERNAL;
--gchar**       _xfce_rc_simple_get_entries (const XfceRc *rc,
--                                           const gchar  *name) G_GNUC_CONST G_GNUC_INTERNAL;
--void          _xfce_rc_simple_delete_group(XfceRc       *rc,
-+                                           gboolean      readonly);
-+G_GNUC_INTERNAL gboolean      _xfce_rc_simple_parse       (XfceRcSimple *simple);
-+G_GNUC_INTERNAL void          _xfce_rc_simple_close       (XfceRc       *rc);
-+G_GNUC_INTERNAL void          _xfce_rc_simple_flush       (XfceRc       *rc);
-+G_GNUC_INTERNAL void          _xfce_rc_simple_rollback    (XfceRc       *rc);
-+G_GNUC_INTERNAL gboolean      _xfce_rc_simple_is_dirty    (const XfceRc *rc) G_GNUC_CONST;
-+G_GNUC_INTERNAL gboolean      _xfce_rc_simple_is_readonly (const XfceRc *rc) G_GNUC_CONST;
-+G_GNUC_INTERNAL const gchar*  _xfce_rc_simple_get_filename(const XfceRc *rc) G_GNUC_CONST;
-+G_GNUC_INTERNAL gchar**       _xfce_rc_simple_get_groups  (const XfceRc *rc) G_GNUC_CONST;
-+G_GNUC_INTERNAL gchar**       _xfce_rc_simple_get_entries (const XfceRc *rc,
-+                                           const gchar  *name) G_GNUC_CONST;
-+G_GNUC_INTERNAL void          _xfce_rc_simple_delete_group(XfceRc       *rc,
-                                            const gchar  *name,
--                                           gboolean      global) G_GNUC_INTERNAL;
-+                                           gboolean      global);
- const gchar*  _xfce_rc_simple_get_group   (const XfceRc *rc) G_GNUC_CONST;
--gboolean      _xfce_rc_simple_has_group   (const XfceRc *rc,
--                                           const gchar  *name) G_GNUC_CONST G_GNUC_INTERNAL;
--void          _xfce_rc_simple_set_group   (XfceRc       *rc,
--                                           const gchar  *name) G_GNUC_INTERNAL;
--void          _xfce_rc_simple_delete_entry(XfceRc       *rc,
-+G_GNUC_INTERNAL gboolean      _xfce_rc_simple_has_group   (const XfceRc *rc,
-+                                           const gchar  *name) G_GNUC_CONST;
-+G_GNUC_INTERNAL void          _xfce_rc_simple_set_group   (XfceRc       *rc,
-+                                           const gchar  *name);
-+G_GNUC_INTERNAL void          _xfce_rc_simple_delete_entry(XfceRc       *rc,
-                                            const gchar  *key,
--                                           gboolean      global) G_GNUC_INTERNAL;
--gboolean      _xfce_rc_simple_has_entry   (const XfceRc *rc,
--                                           const gchar  *key) G_GNUC_CONST G_GNUC_INTERNAL;
--const gchar*  _xfce_rc_simple_read_entry  (const XfceRc *rc,
-+                                           gboolean      global);
-+G_GNUC_INTERNAL gboolean      _xfce_rc_simple_has_entry   (const XfceRc *rc,
-+                                           const gchar  *key) G_GNUC_CONST;
-+G_GNUC_INTERNAL const gchar*  _xfce_rc_simple_read_entry  (const XfceRc *rc,
-                                            const gchar  *key,
--                                           gboolean      translated) G_GNUC_CONST G_GNUC_INTERNAL;
--void          _xfce_rc_simple_write_entry (XfceRc       *rc,
-+                                           gboolean      translated) G_GNUC_CONST;
-+G_GNUC_INTERNAL void          _xfce_rc_simple_write_entry (XfceRc       *rc,
-                                            const gchar  *key,
--                                           const gchar  *value) G_GNUC_INTERNAL;
-+                                           const gchar  *value);
- 
--XfceRcConfig* _xfce_rc_config_new         (XfceResourceType type,
-+G_GNUC_INTERNAL XfceRcConfig* _xfce_rc_config_new         (XfceResourceType type,
-                                            const gchar  *resource,
--                                           gboolean      readonly) G_GNUC_INTERNAL;
--void          _xfce_rc_config_close       (XfceRc       *rc) G_GNUC_INTERNAL;
--void          _xfce_rc_config_flush       (XfceRc       *rc) G_GNUC_INTERNAL;
--void          _xfce_rc_config_rollback    (XfceRc       *rc) G_GNUC_INTERNAL;
--gboolean      _xfce_rc_config_is_dirty    (const XfceRc *rc) G_GNUC_CONST G_GNUC_INTERNAL;
--gboolean      _xfce_rc_config_is_readonly (const XfceRc *rc) G_GNUC_CONST G_GNUC_INTERNAL;
--gchar**       _xfce_rc_config_get_groups  (const XfceRc *rc) G_GNUC_CONST G_GNUC_INTERNAL;
--gchar**       _xfce_rc_config_get_entries (const XfceRc *rc,
--                                           const gchar  *name) G_GNUC_CONST G_GNUC_INTERNAL;
--void          _xfce_rc_config_delete_group(XfceRc       *rc,
-+                                           gboolean      readonly);
-+G_GNUC_INTERNAL void          _xfce_rc_config_close       (XfceRc       *rc);
-+G_GNUC_INTERNAL void          _xfce_rc_config_flush       (XfceRc       *rc);
-+G_GNUC_INTERNAL void          _xfce_rc_config_rollback    (XfceRc       *rc);
-+G_GNUC_INTERNAL gboolean      _xfce_rc_config_is_dirty    (const XfceRc *rc) G_GNUC_CONST;
-+G_GNUC_INTERNAL gboolean      _xfce_rc_config_is_readonly (const XfceRc *rc) G_GNUC_CONST;
-+G_GNUC_INTERNAL gchar**       _xfce_rc_config_get_groups  (const XfceRc *rc) G_GNUC_CONST;
-+G_GNUC_INTERNAL gchar**       _xfce_rc_config_get_entries (const XfceRc *rc,
-+                                           const gchar  *name) G_GNUC_CONST;
-+G_GNUC_INTERNAL void          _xfce_rc_config_delete_group(XfceRc       *rc,
-                                            const gchar  *name,
--                                           gboolean      global) G_GNUC_INTERNAL;
--const gchar*  _xfce_rc_config_get_group   (const XfceRc *rc) G_GNUC_CONST G_GNUC_INTERNAL;
--gboolean      _xfce_rc_config_has_group   (const XfceRc *rc,
--                                           const gchar  *name) G_GNUC_CONST G_GNUC_INTERNAL;
--void          _xfce_rc_config_set_group   (XfceRc       *rc,
--                                           const gchar  *name) G_GNUC_INTERNAL;
--void          _xfce_rc_config_delete_entry(XfceRc       *rc,
-+                                           gboolean      global);
-+G_GNUC_INTERNAL const gchar*  _xfce_rc_config_get_group   (const XfceRc *rc) G_GNUC_CONST;
-+G_GNUC_INTERNAL gboolean      _xfce_rc_config_has_group   (const XfceRc *rc,
-+                                           const gchar  *name) G_GNUC_CONST;
-+G_GNUC_INTERNAL void          _xfce_rc_config_set_group   (XfceRc       *rc,
-+                                           const gchar  *name);
-+G_GNUC_INTERNAL void          _xfce_rc_config_delete_entry(XfceRc       *rc,
-                                            const gchar  *key,
--                                           gboolean      global) G_GNUC_INTERNAL;
--gboolean      _xfce_rc_config_has_entry   (const XfceRc *rc,
--                                           const gchar  *key) G_GNUC_CONST G_GNUC_INTERNAL;
--const gchar*  _xfce_rc_config_read_entry  (const XfceRc *rc,
-+                                           gboolean      global);
-+G_GNUC_INTERNAL gboolean      _xfce_rc_config_has_entry   (const XfceRc *rc,
-+                                           const gchar  *key) G_GNUC_CONST;
-+G_GNUC_INTERNAL const gchar*  _xfce_rc_config_read_entry  (const XfceRc *rc,
-                                            const gchar  *key,
--                                           gboolean      translated) G_GNUC_CONST G_GNUC_INTERNAL;
--void          _xfce_rc_config_write_entry (XfceRc       *rc,
-+                                           gboolean      translated) G_GNUC_CONST;
-+G_GNUC_INTERNAL void          _xfce_rc_config_write_entry (XfceRc       *rc,
-                                            const gchar  *key,
--                                           const gchar  *value) G_GNUC_INTERNAL;
-+                                           const gchar  *value);
- 
- 
- #endif /* !__LIBXFCE4UTIL_XFCE_RC_PRIVATE_H__ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list