diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-11-28 20:06:37 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-11-28 20:06:37 +0000 |
| commit | f76d32b8e89fed7c0e459c1a7fe7a4b57661b01c (patch) | |
| tree | ad29e6808ff698f84e08dab8e047f0ae72838df9 /sysutils | |
| parent | - Update x11-tookits/py-kde to 3.16.6 (diff) | |
Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.
On the FreeBSD front, though, a lot went into this release. Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration. Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.
But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.
Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).
The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:
Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)
We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.
PR: 136676
136967
138872 (obsolete with new epiphany-webkit)
139160
134737
139941
140097
140838
140929
Notes
Notes:
svn path=/head/; revision=244923
Diffstat (limited to 'sysutils')
95 files changed, 1858 insertions, 1087 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 4f71e0479537..1b3b7fdbd38d 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -613,6 +613,8 @@ SUBDIR += policykit-gnome SUBDIR += policykit-kde SUBDIR += policykit-qt + SUBDIR += polkit + SUBDIR += polkit-gnome SUBDIR += powerman SUBDIR += prips SUBDIR += procmap diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index 633e3b058896..adaf83fc279b 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/brasero/Makefile,v 1.1 2009/04/16 02:11:50 kwm Exp $ +# $MCom: ports/sysutils/brasero/Makefile,v 1.59 2009/10/24 01:52:39 avl Exp $ PORTNAME= brasero -PORTVERSION= 2.26.3 +PORTVERSION= 2.28.2 PORTREVISION= 1 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= GNOME @@ -16,9 +16,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= CD/DVD mastering tool for the GNOME desktop LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ + unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ - cdrdao:${PORTSDIR}/sysutils/cdrdao + cdrdao:${PORTSDIR}/sysutils/cdrdao USE_GETTEXT= yes USE_BZIP2= yes @@ -26,6 +27,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_XORG= sm USE_GNOME= intlhack gnomeprefix gnomehack +USE_LDCONFIG= yes USE_GSTREAMER= gconf core INSTALLS_OMF= yes INSTALLS_ICONS= yes diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo index fbd7306beaa4..ad6a5f30bcd4 100644 --- a/sysutils/brasero/distinfo +++ b/sysutils/brasero/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/brasero-2.26.3.tar.bz2) = edf1b2b489a4686b84674dc7dbbd8130 -SHA256 (gnome2/brasero-2.26.3.tar.bz2) = a426e4d451a271137bd1c9fe246e7631f8e98276694ce136529d66810e1dfd91 -SIZE (gnome2/brasero-2.26.3.tar.bz2) = 3312144 +MD5 (gnome2/brasero-2.28.2.tar.bz2) = 7a6ab4befeadbc2ad21bd1195a840097 +SHA256 (gnome2/brasero-2.28.2.tar.bz2) = 7c3493b1f4e90b4b9a4bcf155c1cd85142bb24a038cc5baa8defdad8526650df +SIZE (gnome2/brasero-2.28.2.tar.bz2) = 4072165 diff --git a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c new file mode 100644 index 000000000000..e342112f8562 --- /dev/null +++ b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c @@ -0,0 +1,27 @@ +--- libbrasero-media/scsi-cam.c.orig 2009-09-25 10:39:03.000000000 -0400 ++++ libbrasero-media/scsi-cam.c 2009-10-10 13:30:06.000000000 -0400 +@@ -184,6 +184,8 @@ brasero_device_handle_open (const gchar + handle->fd = fd; + } + else { ++ int serrno; ++ + if (code) { + if (errno == EAGAIN + || errno == EWOULDBLOCK +@@ -193,6 +195,15 @@ brasero_device_handle_open (const gchar + *code = BRASERO_SCSI_ERRNO; + } + ++ serrno = errno; ++ ++ if (fd > -1) ++ close (fd); ++ if (cam) ++ cam_close_device (cam); ++ ++ errno = serrno; ++ + return NULL; + } + diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist index 77bd332af63a..cef48951df4e 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -1,10 +1,33 @@ bin/brasero +include/brasero/brasero-blank-dialog.h +include/brasero/brasero-burn-dialog.h +include/brasero/brasero-burn-lib.h +include/brasero/brasero-burn-options.h +include/brasero/brasero-burn.h include/brasero/brasero-drive-selection.h include/brasero/brasero-drive.h +include/brasero/brasero-enums.h +include/brasero/brasero-error.h include/brasero/brasero-media.h include/brasero/brasero-medium-monitor.h include/brasero/brasero-medium-selection.h include/brasero/brasero-medium.h +include/brasero/brasero-session-cfg.h +include/brasero/brasero-session-span.h +include/brasero/brasero-session.h +include/brasero/brasero-status.h +include/brasero/brasero-sum-dialog.h +include/brasero/brasero-tags.h +include/brasero/brasero-tool-dialog.h +include/brasero/brasero-track-data-cfg.h +include/brasero/brasero-track-data.h +include/brasero/brasero-track-disc.h +include/brasero/brasero-track-image-cfg.h +include/brasero/brasero-track-image.h +include/brasero/brasero-track-stream-cfg.h +include/brasero/brasero-track-stream.h +include/brasero/brasero-track-type.h +include/brasero/brasero-track.h include/brasero/brasero-units.h include/brasero/brasero-volume.h lib/brasero/plugins/libbrasero-burn-uri.la @@ -51,18 +74,77 @@ lib/brasero/plugins/libbrasero-vob.la lib/brasero/plugins/libbrasero-vob.so lib/brasero/plugins/libbrasero-wodim.la lib/brasero/plugins/libbrasero-wodim.so +lib/libbrasero-burn.la +lib/libbrasero-burn.so +lib/libbrasero-burn.so.2 lib/libbrasero-media.la lib/libbrasero-media.so -lib/libbrasero-media.so.1 +lib/libbrasero-media.so.2 +lib/libbrasero-utils.la +lib/libbrasero-utils.so +lib/libbrasero-utils.so.2 %%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la %%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.so +libdata/pkgconfig/libbrasero-burn.pc libdata/pkgconfig/libbrasero-media.pc share/applications/brasero.desktop share/applications/brasero-copy-medium.desktop %%NAUTILUS%%share/applications/brasero-nautilus.desktop -share/applications/brasero-open-image.desktop -share/applications/brasero-open-playlist.desktop -share/applications/brasero-open-project.desktop +share/doc/libbrasero-burn/api-index-full.html +share/doc/libbrasero-burn/ch01.html +share/doc/libbrasero-burn/home.png +share/doc/libbrasero-burn/index.html +share/doc/libbrasero-burn/index.sgml +share/doc/libbrasero-burn/left.png +share/doc/libbrasero-burn/libbrasero-burn-BraseroBlankDialog.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroBurn.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnDialog.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnOptions.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnSession.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionCfg.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionSpan.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroSumDialog.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroToolDialog.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroTrack.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackData.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDataCfg.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDisc.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImage.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImageCfg.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackStream.html +share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackStreamCfg.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-burn-lib.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-enums.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-error.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-status.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-tags.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-track-type.html +share/doc/libbrasero-burn/libbrasero-burn.devhelp +share/doc/libbrasero-burn/libbrasero-burn.devhelp2 +share/doc/libbrasero-burn/object-tree.html +share/doc/libbrasero-burn/right.png +share/doc/libbrasero-burn/style.css +share/doc/libbrasero-burn/up.png +share/doc/libbrasero-media/api-index-full.html +share/doc/libbrasero-media/ch01.html +share/doc/libbrasero-media/home.png +share/doc/libbrasero-media/index.html +share/doc/libbrasero-media/index.sgml +share/doc/libbrasero-media/left.png +share/doc/libbrasero-media/libbrasero-media-BraseroDrive.html +share/doc/libbrasero-media/libbrasero-media-BraseroDriveSelection.html +share/doc/libbrasero-media/libbrasero-media-BraseroMedium.html +share/doc/libbrasero-media/libbrasero-media-BraseroMediumMonitor.html +share/doc/libbrasero-media/libbrasero-media-BraseroMediumSelection.html +share/doc/libbrasero-media/libbrasero-media-BraseroVolume.html +share/doc/libbrasero-media/libbrasero-media-brasero-media.html +share/doc/libbrasero-media/libbrasero-media-brasero-units.html +share/doc/libbrasero-media/libbrasero-media.devhelp +share/doc/libbrasero-media/libbrasero-media.devhelp2 +share/doc/libbrasero-media/object-tree.html +share/doc/libbrasero-media/right.png +share/doc/libbrasero-media/style.css +share/doc/libbrasero-media/up.png %%DATADIR%%/icons/hicolor/16x16/actions/insert-pause.png %%DATADIR%%/icons/hicolor/16x16/actions/iso-image-burn.png %%DATADIR%%/icons/hicolor/16x16/actions/iso-image-new.png @@ -218,29 +300,13 @@ share/applications/brasero-open-project.desktop %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg %%DATADIR%%/logo.png -%%DOCSDIR%%/BraseroDrive.html -%%DOCSDIR%%/BraseroDriveSelection.html -%%DOCSDIR%%/BraseroMedium.html -%%DOCSDIR%%/BraseroMediumMonitor.html -%%DOCSDIR%%/BraseroMediumSelection.html -%%DOCSDIR%%/BraseroVolume.html -%%DOCSDIR%%/brasero-brasero-media.html -%%DOCSDIR%%/brasero-brasero-units.html -%%DOCSDIR%%/brasero.devhelp -%%DOCSDIR%%/brasero.devhelp2 -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png share/gnome/help/brasero/C/brasero.xml share/gnome/help/brasero/C/figures/brasero_main.png share/gnome/help/brasero/C/legal.xml share/gnome/help/brasero/ca/brasero.xml share/gnome/help/brasero/ca/figures/brasero_main.png +share/gnome/help/brasero/cs/brasero.xml +share/gnome/help/brasero/cs/figures/brasero_main.png share/gnome/help/brasero/de/brasero.xml share/gnome/help/brasero/de/figures/brasero_main.png share/gnome/help/brasero/el/brasero.xml @@ -259,6 +325,12 @@ share/gnome/help/brasero/ru/brasero.xml share/gnome/help/brasero/ru/figures/brasero_main.png share/gnome/help/brasero/sv/brasero.xml share/gnome/help/brasero/sv/figures/brasero_main.png +share/gnome/help/brasero/zh_CN/brasero.xml +share/gnome/help/brasero/zh_CN/figures/brasero_main.png +share/gnome/help/brasero/zh_HK/brasero.xml +share/gnome/help/brasero/zh_HK/figures/brasero_main.png +share/gnome/help/brasero/zh_TW/brasero.xml +share/gnome/help/brasero/zh_TW/figures/brasero_main.png share/icons/hicolor/16x16/apps/brasero.png share/icons/hicolor/22x22/apps/brasero.png share/icons/hicolor/24x24/apps/brasero.png @@ -267,9 +339,14 @@ share/icons/hicolor/48x48/apps/brasero.png share/icons/hicolor/scalable/apps/brasero.svg share/locale/ar/LC_MESSAGES/brasero.mo share/locale/as/LC_MESSAGES/brasero.mo +share/locale/ast/LC_MESSAGES/brasero.mo +share/locale/be/LC_MESSAGES/brasero.mo share/locale/bg/LC_MESSAGES/brasero.mo +share/locale/bn/LC_MESSAGES/brasero.mo share/locale/bn_IN/LC_MESSAGES/brasero.mo +share/locale/br/LC_MESSAGES/brasero.mo share/locale/ca/LC_MESSAGES/brasero.mo +share/locale/ca@valencia/LC_MESSAGES/brasero.mo share/locale/cs/LC_MESSAGES/brasero.mo share/locale/da/LC_MESSAGES/brasero.mo share/locale/de/LC_MESSAGES/brasero.mo @@ -281,6 +358,7 @@ share/locale/et/LC_MESSAGES/brasero.mo share/locale/eu/LC_MESSAGES/brasero.mo share/locale/fi/LC_MESSAGES/brasero.mo share/locale/fr/LC_MESSAGES/brasero.mo +share/locale/ga/LC_MESSAGES/brasero.mo share/locale/gl/LC_MESSAGES/brasero.mo share/locale/gu/LC_MESSAGES/brasero.mo share/locale/he/LC_MESSAGES/brasero.mo @@ -290,8 +368,10 @@ share/locale/it/LC_MESSAGES/brasero.mo share/locale/ja/LC_MESSAGES/brasero.mo share/locale/kn/LC_MESSAGES/brasero.mo share/locale/ko/LC_MESSAGES/brasero.mo +share/locale/ku/LC_MESSAGES/brasero.mo share/locale/lt/LC_MESSAGES/brasero.mo share/locale/lv/LC_MESSAGES/brasero.mo +share/locale/mai/LC_MESSAGES/brasero.mo share/locale/mk/LC_MESSAGES/brasero.mo share/locale/ml/LC_MESSAGES/brasero.mo share/locale/mr/LC_MESSAGES/brasero.mo @@ -321,6 +401,7 @@ share/locale/zh_TW/LC_MESSAGES/brasero.mo share/mime/packages/brasero.xml share/omf/brasero/brasero-C.omf share/omf/brasero/brasero-ca.omf +share/omf/brasero/brasero-cs.omf share/omf/brasero/brasero-de.omf share/omf/brasero/brasero-el.omf share/omf/brasero/brasero-en_GB.omf @@ -330,7 +411,16 @@ share/omf/brasero/brasero-it.omf share/omf/brasero/brasero-pl.omf share/omf/brasero/brasero-ru.omf share/omf/brasero/brasero-sv.omf +share/omf/brasero/brasero-zh_CN.omf +share/omf/brasero/brasero-zh_HK.omf +share/omf/brasero/brasero-zh_TW.omf @dirrm share/omf/brasero +@dirrm share/gnome/help/brasero/zh_TW/figures +@dirrm share/gnome/help/brasero/zh_TW +@dirrm share/gnome/help/brasero/zh_HK/figures +@dirrm share/gnome/help/brasero/zh_HK +@dirrm share/gnome/help/brasero/zh_CN/figures +@dirrm share/gnome/help/brasero/zh_CN @dirrm share/gnome/help/brasero/sv/figures @dirrm share/gnome/help/brasero/sv @dirrm share/gnome/help/brasero/ru/figures @@ -349,12 +439,13 @@ share/omf/brasero/brasero-sv.omf @dirrm share/gnome/help/brasero/el @dirrm share/gnome/help/brasero/de/figures @dirrm share/gnome/help/brasero/de +@dirrm share/gnome/help/brasero/cs/figures +@dirrm share/gnome/help/brasero/cs @dirrm share/gnome/help/brasero/ca/figures @dirrm share/gnome/help/brasero/ca @dirrm share/gnome/help/brasero/C/figures @dirrm share/gnome/help/brasero/C @dirrm share/gnome/help/brasero -@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/icons/hicolor/16x16/status @dirrm %%DATADIR%%/icons/hicolor/16x16/actions @dirrm %%DATADIR%%/icons/hicolor/16x16 @@ -375,6 +466,8 @@ share/omf/brasero/brasero-sv.omf @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrm share/doc/libbrasero-media +@dirrm share/doc/libbrasero-burn @dirrmtry share/applications @dirrm lib/brasero/plugins @dirrm lib/brasero @@ -395,9 +488,15 @@ share/omf/brasero/brasero-sv.omf @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/locale/as/LC_MESSAGES -@dirrmtry share/locale/as +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index 3e9e623fddb9..a4e9c69e7f53 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -3,20 +3,20 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/consolekit/Makefile,v 1.2 2009/04/18 22:09:26 marcus Exp $ +# $MCom: ports/sysutils/consolekit/Makefile,v 1.23 2009/09/26 12:32:45 kwm Exp $ PORTNAME= consolekit -PORTVERSION= 0.3.0 -PORTREVISION= 8 +PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome -MASTER_SITES= http://people.freedesktop.org/~mccann/dist/ +MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/ DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for defining and tracking users LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit.2:${PORTSDIR}/sysutils/policykit + polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION} USE_BZIP2= yes diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo index ef1243c68ef1..0dbdd04a2b42 100644 --- a/sysutils/consolekit/distinfo +++ b/sysutils/consolekit/distinfo @@ -1,3 +1,3 @@ -MD5 (ConsoleKit-0.3.0.tar.bz2) = 43b02a52212330b54cfb34c4044d9ce0 -SHA256 (ConsoleKit-0.3.0.tar.bz2) = cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4 -SIZE (ConsoleKit-0.3.0.tar.bz2) = 393694 +MD5 (ConsoleKit-0.4.1.tar.bz2) = 48eda4483cc97841d5f88e8e003eb6d7 +SHA256 (ConsoleKit-0.4.1.tar.bz2) = f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e +SIZE (ConsoleKit-0.4.1.tar.bz2) = 398080 diff --git a/sysutils/consolekit/files/patch-data_ConsoleKit.conf b/sysutils/consolekit/files/patch-data_ConsoleKit.conf deleted file mode 100644 index 9a3e97aa95c5..000000000000 --- a/sysutils/consolekit/files/patch-data_ConsoleKit.conf +++ /dev/null @@ -1,20 +0,0 @@ ---- data/ConsoleKit.conf.orig 2008-04-19 01:39:49.000000000 -0400 -+++ data/ConsoleKit.conf 2009-04-17 01:51:54.000000000 -0400 -@@ -32,6 +32,8 @@ - <allow send_interface="org.freedesktop.ConsoleKit.Manager" - send_member="GetSeats"/> - <allow send_interface="org.freedesktop.ConsoleKit.Manager" -+ send_member="GetSessions"/> -+ <allow send_interface="org.freedesktop.ConsoleKit.Manager" - send_member="GetSessionForCookie"/> - <allow send_interface="org.freedesktop.ConsoleKit.Manager" - send_member="GetSessionForUnixProcess"/> -@@ -91,6 +93,8 @@ - send_member="GetIdleHint"/> - <allow send_interface="org.freedesktop.ConsoleKit.Session" - send_member="GetIdleSinceHint"/> -+ <allow send_interface="org.freedesktop.ConsoleKit.Session" -+ send_member="SetIdleHint"/> - </policy> - - </busconfig> diff --git a/sysutils/consolekit/files/patch-src_ck-run-programs.c b/sysutils/consolekit/files/patch-src_ck-run-programs.c deleted file mode 100644 index f5de90d10e0c..000000000000 --- a/sysutils/consolekit/files/patch-src_ck-run-programs.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/ck-run-programs.c.orig 2009-04-04 20:55:11.000000000 -0400 -+++ src/ck-run-programs.c 2009-04-04 20:55:39.000000000 -0400 -@@ -225,6 +225,7 @@ ck_run_programs (const char *dirpath, - out_loop: - g_free (child_argv[0]); - } -+ g_dir_close (dir); - out: - g_strfreev (env_for_child); - } diff --git a/sysutils/consolekit/files/patch-tools_ck-log-system-start.c b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c new file mode 100644 index 000000000000..0e125ef262d2 --- /dev/null +++ b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c @@ -0,0 +1,60 @@ +--- tools/ck-log-system-start.c.orig 2009-09-14 20:08:10.000000000 -0400 ++++ tools/ck-log-system-start.c 2009-09-26 01:35:37.000000000 -0400 +@@ -26,6 +26,9 @@ + #include <unistd.h> + #include <errno.h> + #include <fcntl.h> ++#ifdef __FreeBSD__ ++#include <kenv.h> ++#endif + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/utsname.h> +@@ -41,7 +44,9 @@ + + #define DEFAULT_LOG_FILENAME LOCALSTATEDIR "/log/ConsoleKit/history" + ++#ifdef __linux__ + #define LINUX_KERNEL_CMDLINE "/proc/cmdline" ++#endif + + /* Adapted from auditd auditd-event.c */ + static gboolean +@@ -162,6 +167,7 @@ write_log_for_event (CkLogEvent *event) + static char * + get_boot_arguments (void) + { ++#if defined(__linux__) + char *contents; + gboolean res; + +@@ -178,6 +184,29 @@ get_boot_arguments (void) + } + + return contents; ++#elif defined(__FreeBSD__) ++ char kern_name[1024], root[1024], mopts[1024]; ++ char *options; ++ ++ options = NULL; ++ if (kenv(KENV_GET, "kernelname", kern_name, sizeof (kern_name)) == -1) { ++ return options; ++ } ++ ++ if (kenv(KENV_GET, "vfs.root.mountfrom.options", mopts, sizeof (mopts)) == -1) { ++ g_strlcpy (mopts, "ro", sizeof (mopts)); ++ } ++ ++ if (kenv(KENV_GET, "vfs.root.mountfrom", root, sizeof (root)) == -1) { ++ g_strlcpy (root, "/", sizeof (root)); ++ } ++ ++ options = g_strdup_printf ("%s %s root=%s", mopts, kern_name, root); ++ ++ return options; ++#else ++ return NULL; ++#endif + } + + int diff --git a/sysutils/consolekit/pkg-plist b/sysutils/consolekit/pkg-plist index 01d42a80cbdc..52e05ed984f2 100644 --- a/sysutils/consolekit/pkg-plist +++ b/sysutils/consolekit/pkg-plist @@ -17,20 +17,23 @@ libexec/ck-collect-session-info libexec/ck-get-x11-display-device libexec/ck-get-x11-server-pid sbin/console-kit-daemon -share/PolicyKit/policy/org.freedesktop.consolekit.policy share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml share/dbus-1/system-services/org.freedesktop.ConsoleKit.service +share/polkit-1/actions/org.freedesktop.consolekit.policy @exec mkdir -p %D/etc/ConsoleKit/run-session.d +@exec mkdir -p %D/etc/ConsoleKit/run-seat.d @exec mkdir -p %D/lib/ConsoleKit/run-session.d @dirrm lib/ConsoleKit/scripts @dirrmtry lib/ConsoleKit/run-session.d +@dirrmtry lib/ConsoleKit/run-seat.d @dirrmtry lib/ConsoleKit @dirrm include/ConsoleKit/ck-connector @dirrm include/ConsoleKit @dirrm etc/ConsoleKit/seats.d @dirrmtry etc/ConsoleKit/run-session.d +@dirrmtry etc/ConsoleKit/run-seat.d @dirrm etc/ConsoleKit @exec mkdir -p /var/run/ConsoleKit @exec mkdir -p /var/log/ConsoleKit diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile index dd22d096c4c6..c31cc6b1a342 100644 --- a/sysutils/eiciel/Makefile +++ b/sysutils/eiciel/Makefile @@ -7,7 +7,7 @@ PORTNAME= eiciel PORTVERSION= 0.9.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils security MASTER_SITES= http://rofi.roger-ferrer.org/eiciel/download/ @@ -17,7 +17,7 @@ COMMENT= A GNOME-based ACL editor, with integration into Nautilus LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 USE_BZIP2= yes -USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 +USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 libgnomeui USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:22 diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index d69787a44174..0dfd979eafd5 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.76 2009/03/18 04:05:53 marcus Exp $ +# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.79 2009/09/21 18:42:34 kwm Exp $ # PORTNAME= gconf-editor -PORTVERSION= 2.26.0 -PORTREVISION= 1 +PORTVERSION= 2.28.0 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index 55794c7fc31d..ee5f4ddc8035 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconf-editor-2.26.0.tar.bz2) = 2dc76415b22d805cfacfcd5fb98f185c -SHA256 (gnome2/gconf-editor-2.26.0.tar.bz2) = 2801ff7d595039292850d4f7d87b3f7c950e92dbcb39facfe62c6fb184640e1f -SIZE (gnome2/gconf-editor-2.26.0.tar.bz2) = 1262213 +MD5 (gnome2/gconf-editor-2.28.0.tar.bz2) = f3f19df4ce47ca27bf69d355f24ac5ba +SHA256 (gnome2/gconf-editor-2.28.0.tar.bz2) = 35f5256f1a93e872586bb6b8c81f7ebfdd78ab3edcfa508f59f99f0f75a74839 +SIZE (gnome2/gconf-editor-2.28.0.tar.bz2) = 1405006 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index f8ccc624fe97..3ec7408b43ad 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -25,6 +25,14 @@ share/gnome/help/gconf-editor/ca/figures/entry-schema.png share/gnome/help/gconf-editor/ca/figures/entry-string.png share/gnome/help/gconf-editor/ca/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/ca/gconf-editor.xml +share/gnome/help/gconf-editor/cs/figures/entry-blank.png +share/gnome/help/gconf-editor/cs/figures/entry-bool.png +share/gnome/help/gconf-editor/cs/figures/entry-list.png +share/gnome/help/gconf-editor/cs/figures/entry-number.png +share/gnome/help/gconf-editor/cs/figures/entry-schema.png +share/gnome/help/gconf-editor/cs/figures/entry-string.png +share/gnome/help/gconf-editor/cs/figures/gconf_editor_anno_window.png +share/gnome/help/gconf-editor/cs/gconf-editor.xml share/gnome/help/gconf-editor/de/figures/entry-blank.png share/gnome/help/gconf-editor/de/figures/entry-bool.png share/gnome/help/gconf-editor/de/figures/entry-list.png @@ -121,6 +129,14 @@ share/gnome/help/gconf-editor/uk/figures/entry-schema.png share/gnome/help/gconf-editor/uk/figures/entry-string.png share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/uk/gconf-editor.xml +share/gnome/help/gconf-editor/zh_CN/figures/entry-blank.png +share/gnome/help/gconf-editor/zh_CN/figures/entry-bool.png +share/gnome/help/gconf-editor/zh_CN/figures/entry-list.png +share/gnome/help/gconf-editor/zh_CN/figures/entry-number.png +share/gnome/help/gconf-editor/zh_CN/figures/entry-schema.png +share/gnome/help/gconf-editor/zh_CN/figures/entry-string.png +share/gnome/help/gconf-editor/zh_CN/figures/gconf_editor_anno_window.png +share/gnome/help/gconf-editor/zh_CN/gconf-editor.xml share/icons/hicolor/48x48/apps/gconf-editor.png share/locale/am/LC_MESSAGES/gconf-editor.mo share/locale/ar/LC_MESSAGES/gconf-editor.mo @@ -135,6 +151,7 @@ share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo share/locale/br/LC_MESSAGES/gconf-editor.mo share/locale/bs/LC_MESSAGES/gconf-editor.mo share/locale/ca/LC_MESSAGES/gconf-editor.mo +share/locale/ca@valencia/LC_MESSAGES/gconf-editor.mo share/locale/cs/LC_MESSAGES/gconf-editor.mo share/locale/cy/LC_MESSAGES/gconf-editor.mo share/locale/da/LC_MESSAGES/gconf-editor.mo @@ -166,6 +183,7 @@ share/locale/ku/LC_MESSAGES/gconf-editor.mo share/locale/li/LC_MESSAGES/gconf-editor.mo share/locale/lt/LC_MESSAGES/gconf-editor.mo share/locale/lv/LC_MESSAGES/gconf-editor.mo +share/locale/mai/LC_MESSAGES/gconf-editor.mo share/locale/mg/LC_MESSAGES/gconf-editor.mo share/locale/mk/LC_MESSAGES/gconf-editor.mo share/locale/ml/LC_MESSAGES/gconf-editor.mo @@ -206,6 +224,7 @@ share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo share/omf/gconf-editor/gconf-editor-C.omf share/omf/gconf-editor/gconf-editor-ca.omf +share/omf/gconf-editor/gconf-editor-cs.omf share/omf/gconf-editor/gconf-editor-de.omf share/omf/gconf-editor/gconf-editor-el.omf share/omf/gconf-editor/gconf-editor-en_GB.omf @@ -218,7 +237,10 @@ share/omf/gconf-editor/gconf-editor-ru.omf share/omf/gconf-editor/gconf-editor-sv.omf share/omf/gconf-editor/gconf-editor-th.omf share/omf/gconf-editor/gconf-editor-uk.omf +share/omf/gconf-editor/gconf-editor-zh_CN.omf @dirrm share/omf/gconf-editor +@dirrm share/gnome/help/gconf-editor/zh_CN/figures +@dirrm share/gnome/help/gconf-editor/zh_CN @dirrm share/gnome/help/gconf-editor/uk/figures @dirrm share/gnome/help/gconf-editor/uk @dirrm share/gnome/help/gconf-editor/th/figures @@ -243,6 +265,8 @@ share/omf/gconf-editor/gconf-editor-uk.omf @dirrm share/gnome/help/gconf-editor/el @dirrm share/gnome/help/gconf-editor/de/figures @dirrm share/gnome/help/gconf-editor/de +@dirrm share/gnome/help/gconf-editor/cs/figures +@dirrm share/gnome/help/gconf-editor/cs @dirrm share/gnome/help/gconf-editor/ca/figures @dirrm share/gnome/help/gconf-editor/ca @dirrm share/gnome/help/gconf-editor/C/figures @@ -276,10 +300,14 @@ share/omf/gconf-editor/gconf-editor-uk.omf @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index b111d77c6e7d..636af89ba102 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.189 2009/03/18 00:23:38 kwm Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.198 2009/10/20 00:09:19 kwm Exp $ # PORTNAME= gnome-control-center -PORTVERSION= 2.26.0 -PORTREVISION= 2 +PORTVERSION= 2.28.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project -LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ + unique-1.0.2:${PORTSDIR}/x11-toolkits/unique BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon @@ -27,18 +27,18 @@ USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GSTREAMER= good WANT_GNOME= yes -USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ - gnomemenus desktopfileutils libgnomekbd gnomepanel +USE_GNOME= gnomeprefix gnomehack intlhack metacity gnomemenus \ + desktopfileutils libgnomekbd gnomedesktop librsvg2 USE_XORG= xscrnsaver GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-gstreamer=0.10 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= control-center.schemas fontilus.schemas +GCONF_SCHEMAS= control-center.schemas fontilus.schemas \ + gnome-control-center.schemas .if defined(PACKAGE_BUILDING) .undef WITHOUT_GNOME diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 4bd79e50c1e6..bbba4e0ca540 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-control-center-2.26.0.tar.bz2) = eed8feccc37712e34d88bd3b20e46962 -SHA256 (gnome2/gnome-control-center-2.26.0.tar.bz2) = 62fb84ea1053971a53c5259b92eb3a282c2f317f72f761ed4dff434ed0e99c05 -SIZE (gnome2/gnome-control-center-2.26.0.tar.bz2) = 2262324 +MD5 (gnome2/gnome-control-center-2.28.1.tar.bz2) = a37a1b5ff4cfce45baef0cf31126d380 +SHA256 (gnome2/gnome-control-center-2.28.1.tar.bz2) = bd1d9a55f810266c38a283baf6a4e92002d35c9366529eb92b25710f3456bbf1 +SIZE (gnome2/gnome-control-center-2.28.1.tar.bz2) = 2287398 diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c index d0e21a6c33b9..c9b3785448ee 100644 --- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c +++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c @@ -1,20 +1,11 @@ ---- capplets/common/gnome-theme-info.c.orig 2008-05-17 12:46:59.000000000 -0400 -+++ capplets/common/gnome-theme-info.c 2008-05-20 18:10:50.000000000 -0400 -@@ -1843,7 +1843,7 @@ gnome_theme_init () - g_object_unref (top_theme_dir); - - /* The weird /usr/share/icons */ -- top_theme_dir = g_file_new_for_path ("/usr/share/icons"); -+ top_theme_dir = g_file_new_for_path ("%%LOCALBASE%%/lib/X11/icons"); - add_top_icon_theme_dir_monitor (top_theme_dir, 2, NULL); - g_object_unref (top_theme_dir); - -@@ -1857,7 +1857,7 @@ gnome_theme_init () +--- capplets/common/gnome-theme-info.c.orig 2009-05-03 20:30:56.000000000 +0200 ++++ capplets/common/gnome-theme-info.c 2009-07-19 12:54:25.000000000 +0200 +@@ -1876,7 +1876,7 @@ gnome_theme_init () #ifdef XCURSOR_ICONDIR /* if there's a separate xcursors dir, add that as well */ if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) && - strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) { + strcmp (XCURSOR_ICONDIR, "%%LOCALBASE%%/lib/X11/icons")) { top_theme_dir = g_file_new_for_path (XCURSOR_ICONDIR); - if (g_file_query_exists (top_theme_dir, NULL)) - add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL); + add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL); + g_object_unref (top_theme_dir); diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 569150975fdc..cd01f573b5cc 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -43,17 +43,6 @@ share/applications/keyboard.desktop share/applications/window-properties.desktop share/desktop-directories/gnomecc.directory %%DATADIR%%/default-apps/gnome-default-applications.xml -%%DATADIR%%/glade/appearance.glade -%%DATADIR%%/glade/at-enable-dialog.glade -%%DATADIR%%/glade/display-capplet.glade -%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade -%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me-fingerprint.glade -%%DATADIR%%/glade/gnome-default-applications-properties.glade -%%DATADIR%%/glade/gnome-keybinding-properties.glade -%%DATADIR%%/glade/gnome-keyboard-properties.glade -%%DATADIR%%/glade/gnome-mouse-properties.glade -%%DATADIR%%/glade/gnome-network-properties.glade -%%DATADIR%%/glade/gnome-window-properties.glade %%DATADIR%%/keybindings/00-multimedia-key.xml %%DATADIR%%/keybindings/01-desktop-key.xml %%DATADIR%%/pixmaps/at-startup.png @@ -65,21 +54,49 @@ share/desktop-directories/gnomecc.directory %%DATADIR%%/pixmaps/double-click-maybe.png %%DATADIR%%/pixmaps/double-click-off.png %%DATADIR%%/pixmaps/double-click-on.png -%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png -%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png +%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png +%%DATADIR%%/pixmaps/gnome-about-me-lock.png %%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png %%DATADIR%%/pixmaps/icon-theme-thumbnailing.png +%%DATADIR%%/pixmaps/left-index-finger.svg +%%DATADIR%%/pixmaps/left-little-finger.svg +%%DATADIR%%/pixmaps/left-middle-finger.svg +%%DATADIR%%/pixmaps/left-ring-finger.svg +%%DATADIR%%/pixmaps/left-thumb.svg %%DATADIR%%/pixmaps/mouse-cursor-normal-large.png %%DATADIR%%/pixmaps/mouse-cursor-normal.png %%DATADIR%%/pixmaps/mouse-cursor-white-large.png %%DATADIR%%/pixmaps/mouse-cursor-white.png %%DATADIR%%/pixmaps/ocean-stripes.png +%%DATADIR%%/pixmaps/print_error.svg +%%DATADIR%%/pixmaps/print_ok.svg +%%DATADIR%%/pixmaps/right-index-finger.svg +%%DATADIR%%/pixmaps/right-little-finger.svg +%%DATADIR%%/pixmaps/right-middle-finger.svg +%%DATADIR%%/pixmaps/right-ring-finger.svg +%%DATADIR%%/pixmaps/right-thumb.svg %%DATADIR%%/pixmaps/subpixel-bgr.png %%DATADIR%%/pixmaps/subpixel-rgb.png %%DATADIR%%/pixmaps/subpixel-vbgr.png %%DATADIR%%/pixmaps/subpixel-vrgb.png %%DATADIR%%/pixmaps/theme-thumbnailing.png %%DATADIR%%/pixmaps/window-theme-thumbnailing.png +%%DATADIR%%/ui/appearance.ui +%%DATADIR%%/ui/at-enable-dialog.ui +%%DATADIR%%/ui/display-capplet.ui +share/gnome-control-center/ui/gnome-about-me-dialog.ui +share/gnome-control-center/ui/gnome-about-me-fingerprint.ui +share/gnome-control-center/ui/gnome-about-me-password.ui +%%DATADIR%%/ui/gnome-default-applications-properties.ui +%%DATADIR%%/ui/gnome-keybinding-properties.ui +share/gnome-control-center/ui/gnome-keyboard-properties-a11y-notifications.ui +share/gnome-control-center/ui/gnome-keyboard-properties-dialog.ui +share/gnome-control-center/ui/gnome-keyboard-properties-layout-chooser.ui +share/gnome-control-center/ui/gnome-keyboard-properties-model-chooser.ui +share/gnome-control-center/ui/gnome-keyboard-properties-options-dialog.ui +share/gnome-control-center/ui/gnome-mouse-properties.ui +%%DATADIR%%/ui/gnome-network-properties.ui +%%DATADIR%%/ui/gnome-window-properties.ui share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf @@ -101,6 +118,7 @@ share/gnome/help/control-center/ca/control-center.xml share/gnome/help/control-center/ca@valencia/control-center.xml share/gnome/help/control-center/cs/control-center.xml share/gnome/help/control-center/de/control-center.xml +share/gnome/help/control-center/el/control-center.xml share/gnome/help/control-center/en_GB/control-center.xml share/gnome/help/control-center/es/control-center.xml share/gnome/help/control-center/fr/control-center.xml @@ -149,6 +167,7 @@ share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ca@valencia/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/crh/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo @@ -229,6 +248,7 @@ share/omf/control-center/control-center-ca.omf share/omf/control-center/control-center-ca@valencia.omf share/omf/control-center/control-center-cs.omf share/omf/control-center/control-center-de.omf +share/omf/control-center/control-center-el.omf share/omf/control-center/control-center-en_GB.omf share/omf/control-center/control-center-es.omf share/omf/control-center/control-center-fr.omf @@ -260,6 +280,7 @@ share/omf/control-center/control-center-zh_CN.omf @dirrm share/gnome/help/control-center/fr @dirrm share/gnome/help/control-center/es @dirrm share/gnome/help/control-center/en_GB +@dirrm share/gnome/help/control-center/el @dirrm share/gnome/help/control-center/de @dirrm share/gnome/help/control-center/cs @dirrm share/gnome/help/control-center/ca@valencia @@ -267,8 +288,8 @@ share/omf/control-center/control-center-zh_CN.omf @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center @dirrm share/gnome/cursor-fonts +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/pixmaps -@dirrm %%DATADIR%%/glade @dirrm %%DATADIR%%/default-apps @dirrmtry share/desktop-directories @dirrmtry share/applications @@ -308,6 +329,8 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index ec4068a88b66..601ea8167393 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/gnome-power-manager/Makefile,v 1.5 2009/04/19 06:23:37 marcus Exp $ +# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.54 2009/10/25 00:02:31 marcus Exp $ # PORTNAME= gnome-power-manager PORTVERSION= 2.24.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c b/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c new file mode 100644 index 000000000000..ea8e92f03661 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c @@ -0,0 +1,12 @@ +--- src/gpm-cell-aray.c.orig 2009-10-24 19:59:07.000000000 -0400 ++++ src/gpm-cell-array.c 2009-10-24 19:59:50.000000000 -0400 +@@ -355,7 +355,8 @@ gpm_cell_array_update (GpmCellArray *cel + * get an with batteries which have a very small charge unit and consequently + * a very high charge. Fixes bug #327471 */ + if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY && +- unit->charge_current > 0 && unit->charge_last_full > 0) { ++ unit->charge_current > 0 && unit->charge_last_full > 0 && ++ unit->percentage > 1) { + gfloat pc = 100.0f * ((gfloat)unit->charge_current / + (gfloat)unit->charge_last_full); + if (pc < 0.0f) { diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index f00dde88dea7..35b2269b7e4e 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,12 +3,12 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/gnome-settings-daemon/Makefile,v 1.2 2009/04/18 10:59:37 kwm Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.53 2009/11/26 06:20:13 marcus Exp $ # PORTNAME= gnome-settings-daemon -PORTVERSION= 2.26.1 -PORTREVISION= 4 +PORTVERSION= 2.28.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +16,9 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 settings daemon -LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio +LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ + notify.1:${PORTSDIR}/devel/libnotify RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb USE_XORG= xxf86misc @@ -27,15 +29,15 @@ USE_GETTEXT= yes USE_GSTREAMER= good GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CONFIGURE_ARGS= --enable-gstreamer=0.10 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= apps_gnome_settings_daemon_keybindings.schemas \ +GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \ + apps_gnome_settings_daemon_keybindings.schemas \ apps_gnome_settings_daemon_xrandr.schemas \ - apps_gnome_settings_daemon_screensaver.schemas \ desktop_gnome_font_rendering.schemas \ desktop_gnome_keybindings.schemas \ + desktop_gnome_peripherals_touchpad.schemas \ gnome-settings-daemon.schemas .include <bsd.port.mk> diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo index 54077390c442..5cced3e1045e 100644 --- a/sysutils/gnome-settings-daemon/distinfo +++ b/sysutils/gnome-settings-daemon/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 7be383de54c0707c64843ae51563c43a -SHA256 (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 4dff1daa84fe485e302f61286df1dd188292302ee792ddb4fb1c34e65aea0a80 -SIZE (gnome2/gnome-settings-daemon-2.26.1.tar.bz2) = 1084129 +MD5 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = cadb2e161846c4df76fec45679db1f50 +SHA256 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1267ef7d4069189b6bd05b915586b5b323688a136d394e571d29991d59bbadb2 +SIZE (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1174173 diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist index dd7b5a3e25f9..3407151e081d 100644 --- a/sysutils/gnome-settings-daemon/pkg-plist +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -4,7 +4,6 @@ include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin -lib/gnome-settings-daemon-2.0/dummy.gnome-settings-plugin lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin @@ -18,9 +17,6 @@ lib/gnome-settings-daemon-2.0/libbackground.so lib/gnome-settings-daemon-2.0/libclipboard.a lib/gnome-settings-daemon-2.0/libclipboard.la lib/gnome-settings-daemon-2.0/libclipboard.so -lib/gnome-settings-daemon-2.0/libdummy.a -lib/gnome-settings-daemon-2.0/libdummy.la -lib/gnome-settings-daemon-2.0/libdummy.so lib/gnome-settings-daemon-2.0/libfont.a lib/gnome-settings-daemon-2.0/libfont.la lib/gnome-settings-daemon-2.0/libfont.so @@ -39,9 +35,6 @@ lib/gnome-settings-daemon-2.0/libmedia-keys.so lib/gnome-settings-daemon-2.0/libmouse.a lib/gnome-settings-daemon-2.0/libmouse.la lib/gnome-settings-daemon-2.0/libmouse.so -lib/gnome-settings-daemon-2.0/libscreensaver.a -lib/gnome-settings-daemon-2.0/libscreensaver.la -lib/gnome-settings-daemon-2.0/libscreensaver.so lib/gnome-settings-daemon-2.0/libsound.a lib/gnome-settings-daemon-2.0/libsound.la lib/gnome-settings-daemon-2.0/libsound.so @@ -59,7 +52,6 @@ lib/gnome-settings-daemon-2.0/libxsettings.la lib/gnome-settings-daemon-2.0/libxsettings.so lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin -lib/gnome-settings-daemon-2.0/screensaver.gnome-settings-plugin lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin @@ -67,12 +59,12 @@ lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin libdata/pkgconfig/gnome-settings-daemon.pc libexec/gnome-settings-daemon +libexec/gsd-locate-pointer share/dbus-1/services/org.gnome.SettingsDaemon.service share/gnome-control-center/keybindings/50-accessibility.xml -%%DATADIR%%/acme-eject.png -%%DATADIR%%/acme.glade -%%DATADIR%%/gsd-a11y-preferences-dialog.glade -%%DATADIR%%/modmap-dialog.glade +%%DATADIR%%/acme.ui +%%DATADIR%%/gsd-a11y-preferences-dialog.ui +%%DATADIR%%/modmap-dialog.ui %%DATADIR%%/xrdb/Editres.ad %%DATADIR%%/xrdb/Emacs.ad %%DATADIR%%/xrdb/General.ad @@ -98,6 +90,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo @@ -129,6 +122,7 @@ share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mai/LC_MESSAGES/gnome-settings-daemon.mo share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo @@ -195,10 +189,14 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 7328a0b22efd..c7b602910571 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/gnome-system-monitor/Makefile,v 1.1 2009/04/15 13:39:54 kwm Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.137 2009/09/21 09:37:19 kwm Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.26.2 -PORTREVISION= 1 +PORTVERSION= 2.28.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -28,7 +27,6 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \ librsvg2 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-pcrecpp CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lutil" diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index b941c30e8b8d..9c0250230f41 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.26.2.tar.bz2) = d69ddb569e51ba381b6bf2d8d32f3b78 -SHA256 (gnome2/gnome-system-monitor-2.26.2.tar.bz2) = 22f67671756c4d5c860d1201f27d87830479fc923384f8dae5bcd24cb5f3dd7e -SIZE (gnome2/gnome-system-monitor-2.26.2.tar.bz2) = 2188963 +MD5 (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 341c8fda9b518729e04465705da62994 +SHA256 (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 638875c6041cd2b0ad7219fecd8fe86eb9d4c8b0662166a84d7659bd6a9db1d3 +SIZE (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 2388199 diff --git a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp index e57a2170425e..9b934be3ddb8 100644 --- a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp +++ b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp @@ -1,11 +1,11 @@ --- src/load-graph.cpp.orig 2008-01-14 23:43:43.000000000 -0600 +++ src/load-graph.cpp 2008-01-14 23:44:15.000000000 -0600 -@@ -501,7 +501,7 @@ - // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10) - // where base10 = 1, coef10 = 101, pow2 = 16 +@@ -412,7 +412,7 @@ + // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10) + // where base10 = 1, coef10 = 101, pow2 = 16 -- unsigned pow2 = std::floor(log2(new_max)); -+ unsigned pow2 = std::floor(log(new_max) / log(2)); - unsigned base10 = pow2 / 10; - unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10))); - g_assert(new_max <= (coef10 * (1UL << (base10 * 10)))); +- unsigned pow2 = std::floor(log2(new_max)); ++ unsigned pow2 = std::floor(log(new_max) / log(2)); + unsigned base10 = pow2 / 10; + unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10))); + g_assert(new_max <= (coef10 * (1UL << (base10 * 10)))); diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index f6bdb12cfbb4..701940d51541 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -57,6 +57,34 @@ share/gnome/help/gnome-system-monitor/ca/figures/sortMenu2.png share/gnome/help/gnome-system-monitor/ca/figures/systemMonitor.png share/gnome/help/gnome-system-monitor/ca/figures/viewMenu.png share/gnome/help/gnome-system-monitor/ca/gnome-system-monitor.xml +share/gnome/help/gnome-system-monitor/cs/figures/addColumn.png +share/gnome/help/gnome-system-monitor/cs/figures/changePriority.png +share/gnome/help/gnome-system-monitor/cs/figures/colorPanel.png +share/gnome/help/gnome-system-monitor/cs/figures/columnContextMenu.png +share/gnome/help/gnome-system-monitor/cs/figures/gnome-system-monitor_window.png +share/gnome/help/gnome-system-monitor/cs/figures/memoryMaps.png +share/gnome/help/gnome-system-monitor/cs/figures/moreInfo.png +share/gnome/help/gnome-system-monitor/cs/figures/processListing.png +share/gnome/help/gnome-system-monitor/cs/figures/sortButton.png +share/gnome/help/gnome-system-monitor/cs/figures/sortMenu.png +share/gnome/help/gnome-system-monitor/cs/figures/sortMenu2.png +share/gnome/help/gnome-system-monitor/cs/figures/systemMonitor.png +share/gnome/help/gnome-system-monitor/cs/figures/viewMenu.png +share/gnome/help/gnome-system-monitor/cs/gnome-system-monitor.xml +share/gnome/help/gnome-system-monitor/da/figures/addColumn.png +share/gnome/help/gnome-system-monitor/da/figures/changePriority.png +share/gnome/help/gnome-system-monitor/da/figures/colorPanel.png +share/gnome/help/gnome-system-monitor/da/figures/columnContextMenu.png +share/gnome/help/gnome-system-monitor/da/figures/gnome-system-monitor_window.png +share/gnome/help/gnome-system-monitor/da/figures/memoryMaps.png +share/gnome/help/gnome-system-monitor/da/figures/moreInfo.png +share/gnome/help/gnome-system-monitor/da/figures/processListing.png +share/gnome/help/gnome-system-monitor/da/figures/sortButton.png +share/gnome/help/gnome-system-monitor/da/figures/sortMenu.png +share/gnome/help/gnome-system-monitor/da/figures/sortMenu2.png +share/gnome/help/gnome-system-monitor/da/figures/systemMonitor.png +share/gnome/help/gnome-system-monitor/da/figures/viewMenu.png +share/gnome/help/gnome-system-monitor/da/gnome-system-monitor.xml share/gnome/help/gnome-system-monitor/de/figures/addColumn.png share/gnome/help/gnome-system-monitor/de/figures/changePriority.png share/gnome/help/gnome-system-monitor/de/figures/colorPanel.png @@ -167,6 +195,7 @@ share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-system-monitor.mo share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo share/locale/da/LC_MESSAGES/gnome-system-monitor.mo @@ -198,6 +227,7 @@ share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo share/locale/li/LC_MESSAGES/gnome-system-monitor.mo share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo +share/locale/mai/LC_MESSAGES/gnome-system-monitor.mo share/locale/mg/LC_MESSAGES/gnome-system-monitor.mo share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo @@ -239,6 +269,8 @@ share/omf/gnome-system-monitor/gnome-system-monitor-C.omf share/omf/gnome-system-monitor/gnome-system-monitor-ar.omf share/omf/gnome-system-monitor/gnome-system-monitor-bg.omf share/omf/gnome-system-monitor/gnome-system-monitor-ca.omf +share/omf/gnome-system-monitor/gnome-system-monitor-cs.omf +share/omf/gnome-system-monitor/gnome-system-monitor-da.omf share/omf/gnome-system-monitor/gnome-system-monitor-de.omf share/omf/gnome-system-monitor/gnome-system-monitor-el.omf share/omf/gnome-system-monitor/gnome-system-monitor-es.omf @@ -265,6 +297,10 @@ share/pixmaps/gnome-system-monitor/upload.svg @dirrm share/gnome/help/gnome-system-monitor/el @dirrm share/gnome/help/gnome-system-monitor/de/figures @dirrm share/gnome/help/gnome-system-monitor/de +@dirrm share/gnome/help/gnome-system-monitor/da/figures +@dirrm share/gnome/help/gnome-system-monitor/da +@dirrm share/gnome/help/gnome-system-monitor/cs/figures +@dirrm share/gnome/help/gnome-system-monitor/cs @dirrm share/gnome/help/gnome-system-monitor/ca/figures @dirrm share/gnome/help/gnome-system-monitor/ca @dirrm share/gnome/help/gnome-system-monitor/bg/figures @@ -295,10 +331,14 @@ share/pixmaps/gnome-system-monitor/upload.svg @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index cf5be7c91975..a1a2a37f124d 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.81 2008/09/27 01:53:00 mezz Exp $ +# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.88 2009/10/19 18:43:32 kwm Exp $ # PORTNAME= gnome-system-tools -PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTVERSION= 2.28.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Tools to configure workstations -LIB_DEPENDS= oobs-1.4:${PORTSDIR}/devel/liboobs +LIB_DEPENDS= oobs-1.4:${PORTSDIR}/devel/liboobs \ + polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome USE_BZIP2= yes USE_GMAKE= yes diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index ff06dde618d2..bce5173440db 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-tools-2.22.2.tar.bz2) = c2c9a2570dd01a38b46a6adb91a2cb2f -SHA256 (gnome2/gnome-system-tools-2.22.2.tar.bz2) = d57b18d859c6c0c67c27137934f62a4737ab459e7a2eb22d9400f821e4b75227 -SIZE (gnome2/gnome-system-tools-2.22.2.tar.bz2) = 4461916 +MD5 (gnome2/gnome-system-tools-2.28.1.tar.bz2) = 1614c0727801a9cb124c773f8bd76291 +SHA256 (gnome2/gnome-system-tools-2.28.1.tar.bz2) = eebc44c570c3af4642ee29859ca8caa0b780e0545c42c2e2bf214ef322299d61 +SIZE (gnome2/gnome-system-tools-2.28.1.tar.bz2) = 5308059 diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index 8c3e6e688aec..69ba8c6603ed 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -24,8 +24,12 @@ share/gnome/help/network-admin/C/legal.xml share/gnome/help/network-admin/C/network-admin.xml share/gnome/help/network-admin/ca/figures/network-tool.png share/gnome/help/network-admin/ca/network-admin.xml +share/gnome/help/network-admin/cs/figures/network-tool.png +share/gnome/help/network-admin/cs/network-admin.xml share/gnome/help/network-admin/de/figures/network-tool.png share/gnome/help/network-admin/de/network-admin.xml +share/gnome/help/network-admin/el/figures/network-tool.png +share/gnome/help/network-admin/el/network-admin.xml share/gnome/help/network-admin/en_GB/figures/network-tool.png share/gnome/help/network-admin/en_GB/network-admin.xml share/gnome/help/network-admin/es/figures/network-tool.png @@ -38,46 +42,48 @@ share/gnome/help/network-admin/oc/figures/network-tool.png share/gnome/help/network-admin/oc/network-admin.xml share/gnome/help/network-admin/sv/figures/network-tool.png share/gnome/help/network-admin/sv/network-admin.xml -share/gnome/help/services-admin/C/figures/service-properties.png +share/gnome/help/network-admin/zh_CN/figures/network-tool.png +share/gnome/help/network-admin/zh_CN/network-admin.xml share/gnome/help/services-admin/C/figures/services-tool.png share/gnome/help/services-admin/C/legal.xml share/gnome/help/services-admin/C/services-admin.xml -share/gnome/help/services-admin/ca/figures/service-properties.png share/gnome/help/services-admin/ca/figures/services-tool.png share/gnome/help/services-admin/ca/services-admin.xml -share/gnome/help/services-admin/de/figures/service-properties.png +share/gnome/help/services-admin/cs/figures/services-tool.png +share/gnome/help/services-admin/cs/services-admin.xml share/gnome/help/services-admin/de/figures/services-tool.png share/gnome/help/services-admin/de/services-admin.xml -share/gnome/help/services-admin/el/figures/service-properties.png share/gnome/help/services-admin/el/figures/services-tool.png share/gnome/help/services-admin/el/services-admin.xml -share/gnome/help/services-admin/en_GB/figures/service-properties.png share/gnome/help/services-admin/en_GB/figures/services-tool.png share/gnome/help/services-admin/en_GB/services-admin.xml -share/gnome/help/services-admin/es/figures/service-properties.png share/gnome/help/services-admin/es/figures/services-tool.png share/gnome/help/services-admin/es/services-admin.xml -share/gnome/help/services-admin/fr/figures/service-properties.png share/gnome/help/services-admin/fr/figures/services-tool.png share/gnome/help/services-admin/fr/services-admin.xml -share/gnome/help/services-admin/it/figures/service-properties.png share/gnome/help/services-admin/it/figures/services-tool.png share/gnome/help/services-admin/it/services-admin.xml share/gnome/help/services-admin/nl/figures/service-properties.png share/gnome/help/services-admin/nl/figures/services-tool.png share/gnome/help/services-admin/nl/legal.xml share/gnome/help/services-admin/nl/services-admin.xml -share/gnome/help/services-admin/oc/figures/service-properties.png share/gnome/help/services-admin/oc/figures/services-tool.png share/gnome/help/services-admin/oc/services-admin.xml -share/gnome/help/services-admin/sv/figures/service-properties.png +share/gnome/help/services-admin/pl/figures/services-tool.png +share/gnome/help/services-admin/pl/services-admin.xml +share/gnome/help/services-admin/pt_BR/figures/services-tool.png +share/gnome/help/services-admin/pt_BR/services-admin.xml share/gnome/help/services-admin/sv/figures/services-tool.png share/gnome/help/services-admin/sv/services-admin.xml +share/gnome/help/services-admin/zh_CN/figures/services-tool.png +share/gnome/help/services-admin/zh_CN/services-admin.xml share/gnome/help/shares-admin/C/figures/shares-tool.png share/gnome/help/shares-admin/C/legal.xml share/gnome/help/shares-admin/C/shares-admin.xml share/gnome/help/shares-admin/ca/figures/shares-tool.png share/gnome/help/shares-admin/ca/shares-admin.xml +share/gnome/help/shares-admin/cs/figures/shares-tool.png +share/gnome/help/shares-admin/cs/shares-admin.xml share/gnome/help/shares-admin/de/figures/shares-tool.png share/gnome/help/shares-admin/de/shares-admin.xml share/gnome/help/shares-admin/el/figures/shares-tool.png @@ -96,6 +102,8 @@ share/gnome/help/shares-admin/pt_BR/figures/shares-tool.png share/gnome/help/shares-admin/pt_BR/shares-admin.xml share/gnome/help/shares-admin/sv/figures/shares-tool.png share/gnome/help/shares-admin/sv/shares-admin.xml +share/gnome/help/shares-admin/zh_CN/figures/shares-tool.png +share/gnome/help/shares-admin/zh_CN/shares-admin.xml share/gnome/help/time-admin/C/figures/time-map.png share/gnome/help/time-admin/C/figures/time-servers.png share/gnome/help/time-admin/C/figures/time-tool-automatic.png @@ -107,11 +115,21 @@ share/gnome/help/time-admin/ca/figures/time-servers.png share/gnome/help/time-admin/ca/figures/time-tool-automatic.png share/gnome/help/time-admin/ca/figures/time-tool-manual.png share/gnome/help/time-admin/ca/time-admin.xml +share/gnome/help/time-admin/cs/figures/time-map.png +share/gnome/help/time-admin/cs/figures/time-servers.png +share/gnome/help/time-admin/cs/figures/time-tool-automatic.png +share/gnome/help/time-admin/cs/figures/time-tool-manual.png +share/gnome/help/time-admin/cs/time-admin.xml share/gnome/help/time-admin/de/figures/time-map.png share/gnome/help/time-admin/de/figures/time-servers.png share/gnome/help/time-admin/de/figures/time-tool-automatic.png share/gnome/help/time-admin/de/figures/time-tool-manual.png share/gnome/help/time-admin/de/time-admin.xml +share/gnome/help/time-admin/el/figures/time-map.png +share/gnome/help/time-admin/el/figures/time-servers.png +share/gnome/help/time-admin/el/figures/time-tool-automatic.png +share/gnome/help/time-admin/el/figures/time-tool-manual.png +share/gnome/help/time-admin/el/time-admin.xml share/gnome/help/time-admin/en_GB/figures/time-map.png share/gnome/help/time-admin/en_GB/figures/time-servers.png share/gnome/help/time-admin/en_GB/figures/time-tool-automatic.png @@ -142,6 +160,11 @@ share/gnome/help/time-admin/oc/figures/time-servers.png share/gnome/help/time-admin/oc/figures/time-tool-automatic.png share/gnome/help/time-admin/oc/figures/time-tool-manual.png share/gnome/help/time-admin/oc/time-admin.xml +share/gnome/help/time-admin/pt_BR/figures/time-map.png +share/gnome/help/time-admin/pt_BR/figures/time-servers.png +share/gnome/help/time-admin/pt_BR/figures/time-tool-automatic.png +share/gnome/help/time-admin/pt_BR/figures/time-tool-manual.png +share/gnome/help/time-admin/pt_BR/time-admin.xml share/gnome/help/time-admin/ru/figures/time-map.png share/gnome/help/time-admin/ru/figures/time-servers.png share/gnome/help/time-admin/ru/figures/time-tool-automatic.png @@ -152,31 +175,54 @@ share/gnome/help/time-admin/sv/figures/time-servers.png share/gnome/help/time-admin/sv/figures/time-tool-automatic.png share/gnome/help/time-admin/sv/figures/time-tool-manual.png share/gnome/help/time-admin/sv/time-admin.xml +share/gnome/help/time-admin/zh_CN/figures/time-map.png +share/gnome/help/time-admin/zh_CN/figures/time-servers.png +share/gnome/help/time-admin/zh_CN/figures/time-tool-automatic.png +share/gnome/help/time-admin/zh_CN/figures/time-tool-manual.png +share/gnome/help/time-admin/zh_CN/time-admin.xml +share/gnome/help/users-admin/C/figures/groups.png share/gnome/help/users-admin/C/figures/users-tool.png share/gnome/help/users-admin/C/legal.xml share/gnome/help/users-admin/C/users-admin.xml +share/gnome/help/users-admin/ca/figures/groups.png share/gnome/help/users-admin/ca/figures/users-tool.png share/gnome/help/users-admin/ca/users-admin.xml +share/gnome/help/users-admin/cs/figures/groups.png +share/gnome/help/users-admin/cs/figures/users-tool.png +share/gnome/help/users-admin/cs/users-admin.xml +share/gnome/help/users-admin/de/figures/groups.png share/gnome/help/users-admin/de/figures/users-tool.png share/gnome/help/users-admin/de/users-admin.xml +share/gnome/help/users-admin/el/figures/groups.png share/gnome/help/users-admin/el/figures/users-tool.png share/gnome/help/users-admin/el/users-admin.xml +share/gnome/help/users-admin/en_GB/figures/groups.png share/gnome/help/users-admin/en_GB/figures/users-tool.png share/gnome/help/users-admin/en_GB/users-admin.xml +share/gnome/help/users-admin/es/figures/groups.png share/gnome/help/users-admin/es/figures/users-tool.png share/gnome/help/users-admin/es/users-admin.xml +share/gnome/help/users-admin/fr/figures/groups.png share/gnome/help/users-admin/fr/figures/users-tool.png share/gnome/help/users-admin/fr/users-admin.xml +share/gnome/help/users-admin/it/figures/groups.png share/gnome/help/users-admin/it/figures/users-tool.png share/gnome/help/users-admin/it/users-admin.xml +share/gnome/help/users-admin/oc/figures/groups.png share/gnome/help/users-admin/oc/figures/users-tool.png share/gnome/help/users-admin/oc/users-admin.xml +share/gnome/help/users-admin/pt_BR/figures/groups.png share/gnome/help/users-admin/pt_BR/figures/users-tool.png share/gnome/help/users-admin/pt_BR/users-admin.xml +share/gnome/help/users-admin/ru/figures/groups.png share/gnome/help/users-admin/ru/figures/users-tool.png share/gnome/help/users-admin/ru/users-admin.xml +share/gnome/help/users-admin/sv/figures/groups.png share/gnome/help/users-admin/sv/figures/users-tool.png share/gnome/help/users-admin/sv/users-admin.xml +share/gnome/help/users-admin/zh_CN/figures/groups.png +share/gnome/help/users-admin/zh_CN/figures/users-tool.png +share/gnome/help/users-admin/zh_CN/users-admin.xml share/icons/hicolor/16x16/apps/time-admin.png share/icons/hicolor/22x22/apps/time-admin.png share/icons/hicolor/24x24/apps/time-admin.png @@ -196,6 +242,7 @@ share/locale/bg/LC_MESSAGES/gnome-system-tools.mo share/locale/bn/LC_MESSAGES/gnome-system-tools.mo share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo share/locale/ca/LC_MESSAGES/gnome-system-tools.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-system-tools.mo share/locale/cs/LC_MESSAGES/gnome-system-tools.mo share/locale/cy/LC_MESSAGES/gnome-system-tools.mo share/locale/da/LC_MESSAGES/gnome-system-tools.mo @@ -227,6 +274,7 @@ share/locale/ko/LC_MESSAGES/gnome-system-tools.mo share/locale/ku/LC_MESSAGES/gnome-system-tools.mo share/locale/lt/LC_MESSAGES/gnome-system-tools.mo share/locale/lv/LC_MESSAGES/gnome-system-tools.mo +share/locale/mai/LC_MESSAGES/gnome-system-tools.mo share/locale/mg/LC_MESSAGES/gnome-system-tools.mo share/locale/mk/LC_MESSAGES/gnome-system-tools.mo share/locale/ml/LC_MESSAGES/gnome-system-tools.mo @@ -269,15 +317,19 @@ share/omf/gnome-system-tools/services-admin-nl.omf share/omf/gnome-system-tools/time-admin-nl.omf share/omf/network-admin/network-admin-C.omf share/omf/network-admin/network-admin-ca.omf +share/omf/network-admin/network-admin-cs.omf share/omf/network-admin/network-admin-de.omf +share/omf/network-admin/network-admin-el.omf share/omf/network-admin/network-admin-en_GB.omf share/omf/network-admin/network-admin-es.omf share/omf/network-admin/network-admin-fr.omf share/omf/network-admin/network-admin-it.omf share/omf/network-admin/network-admin-oc.omf share/omf/network-admin/network-admin-sv.omf +share/omf/network-admin/network-admin-zh_CN.omf share/omf/services-admin/services-admin-C.omf share/omf/services-admin/services-admin-ca.omf +share/omf/services-admin/services-admin-cs.omf share/omf/services-admin/services-admin-de.omf share/omf/services-admin/services-admin-el.omf share/omf/services-admin/services-admin-en_GB.omf @@ -285,9 +337,13 @@ share/omf/services-admin/services-admin-es.omf share/omf/services-admin/services-admin-fr.omf share/omf/services-admin/services-admin-it.omf share/omf/services-admin/services-admin-oc.omf +share/omf/services-admin/services-admin-pl.omf +share/omf/services-admin/services-admin-pt_BR.omf share/omf/services-admin/services-admin-sv.omf +share/omf/services-admin/services-admin-zh_CN.omf share/omf/shares-admin/shares-admin-C.omf share/omf/shares-admin/shares-admin-ca.omf +share/omf/shares-admin/shares-admin-cs.omf share/omf/shares-admin/shares-admin-de.omf share/omf/shares-admin/shares-admin-el.omf share/omf/shares-admin/shares-admin-en_GB.omf @@ -297,18 +353,24 @@ share/omf/shares-admin/shares-admin-it.omf share/omf/shares-admin/shares-admin-oc.omf share/omf/shares-admin/shares-admin-pt_BR.omf share/omf/shares-admin/shares-admin-sv.omf +share/omf/shares-admin/shares-admin-zh_CN.omf share/omf/time-admin/time-admin-C.omf share/omf/time-admin/time-admin-ca.omf +share/omf/time-admin/time-admin-cs.omf share/omf/time-admin/time-admin-de.omf +share/omf/time-admin/time-admin-el.omf share/omf/time-admin/time-admin-en_GB.omf share/omf/time-admin/time-admin-es.omf share/omf/time-admin/time-admin-fr.omf share/omf/time-admin/time-admin-it.omf share/omf/time-admin/time-admin-oc.omf +share/omf/time-admin/time-admin-pt_BR.omf share/omf/time-admin/time-admin-ru.omf share/omf/time-admin/time-admin-sv.omf +share/omf/time-admin/time-admin-zh_CN.omf share/omf/users-admin/users-admin-C.omf share/omf/users-admin/users-admin-ca.omf +share/omf/users-admin/users-admin-cs.omf share/omf/users-admin/users-admin-de.omf share/omf/users-admin/users-admin-el.omf share/omf/users-admin/users-admin-en_GB.omf @@ -319,12 +381,15 @@ share/omf/users-admin/users-admin-oc.omf share/omf/users-admin/users-admin-pt_BR.omf share/omf/users-admin/users-admin-ru.omf share/omf/users-admin/users-admin-sv.omf +share/omf/users-admin/users-admin-zh_CN.omf @dirrm share/omf/users-admin @dirrm share/omf/time-admin @dirrm share/omf/shares-admin @dirrm share/omf/services-admin @dirrm share/omf/network-admin @dirrm share/omf/gnome-system-tools +@dirrm share/gnome/help/users-admin/zh_CN/figures +@dirrm share/gnome/help/users-admin/zh_CN @dirrm share/gnome/help/users-admin/sv/figures @dirrm share/gnome/help/users-admin/sv @dirrm share/gnome/help/users-admin/ru/figures @@ -345,15 +410,21 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/users-admin/el @dirrm share/gnome/help/users-admin/de/figures @dirrm share/gnome/help/users-admin/de +@dirrm share/gnome/help/users-admin/cs/figures +@dirrm share/gnome/help/users-admin/cs @dirrm share/gnome/help/users-admin/ca/figures @dirrm share/gnome/help/users-admin/ca @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C @dirrm share/gnome/help/users-admin +@dirrm share/gnome/help/time-admin/zh_CN/figures +@dirrm share/gnome/help/time-admin/zh_CN @dirrm share/gnome/help/time-admin/sv/figures @dirrm share/gnome/help/time-admin/sv @dirrm share/gnome/help/time-admin/ru/figures @dirrm share/gnome/help/time-admin/ru +@dirrm share/gnome/help/time-admin/pt_BR/figures +@dirrm share/gnome/help/time-admin/pt_BR @dirrm share/gnome/help/time-admin/oc/figures @dirrm share/gnome/help/time-admin/oc @dirrm share/gnome/help/time-admin/nl/figures @@ -366,13 +437,19 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/time-admin/es @dirrm share/gnome/help/time-admin/en_GB/figures @dirrm share/gnome/help/time-admin/en_GB +@dirrm share/gnome/help/time-admin/el/figures +@dirrm share/gnome/help/time-admin/el @dirrm share/gnome/help/time-admin/de/figures @dirrm share/gnome/help/time-admin/de +@dirrm share/gnome/help/time-admin/cs/figures +@dirrm share/gnome/help/time-admin/cs @dirrm share/gnome/help/time-admin/ca/figures @dirrm share/gnome/help/time-admin/ca @dirrm share/gnome/help/time-admin/C/figures @dirrm share/gnome/help/time-admin/C @dirrm share/gnome/help/time-admin +@dirrm share/gnome/help/shares-admin/zh_CN/figures +@dirrm share/gnome/help/shares-admin/zh_CN @dirrm share/gnome/help/shares-admin/sv/figures @dirrm share/gnome/help/shares-admin/sv @dirrm share/gnome/help/shares-admin/pt_BR/figures @@ -391,13 +468,21 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/shares-admin/el @dirrm share/gnome/help/shares-admin/de/figures @dirrm share/gnome/help/shares-admin/de +@dirrm share/gnome/help/shares-admin/cs/figures +@dirrm share/gnome/help/shares-admin/cs @dirrm share/gnome/help/shares-admin/ca/figures @dirrm share/gnome/help/shares-admin/ca @dirrm share/gnome/help/shares-admin/C/figures @dirrm share/gnome/help/shares-admin/C @dirrm share/gnome/help/shares-admin +@dirrm share/gnome/help/services-admin/zh_CN/figures +@dirrm share/gnome/help/services-admin/zh_CN @dirrm share/gnome/help/services-admin/sv/figures @dirrm share/gnome/help/services-admin/sv +@dirrm share/gnome/help/services-admin/pt_BR/figures +@dirrm share/gnome/help/services-admin/pt_BR +@dirrm share/gnome/help/services-admin/pl/figures +@dirrm share/gnome/help/services-admin/pl @dirrm share/gnome/help/services-admin/oc/figures @dirrm share/gnome/help/services-admin/oc @dirrm share/gnome/help/services-admin/nl/figures @@ -414,11 +499,15 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/services-admin/el @dirrm share/gnome/help/services-admin/de/figures @dirrm share/gnome/help/services-admin/de +@dirrm share/gnome/help/services-admin/cs/figures +@dirrm share/gnome/help/services-admin/cs @dirrm share/gnome/help/services-admin/ca/figures @dirrm share/gnome/help/services-admin/ca @dirrm share/gnome/help/services-admin/C/figures @dirrm share/gnome/help/services-admin/C @dirrm share/gnome/help/services-admin +@dirrm share/gnome/help/network-admin/zh_CN/figures +@dirrm share/gnome/help/network-admin/zh_CN @dirrm share/gnome/help/network-admin/sv/figures @dirrm share/gnome/help/network-admin/sv @dirrm share/gnome/help/network-admin/oc/figures @@ -431,8 +520,12 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/network-admin/es @dirrm share/gnome/help/network-admin/en_GB/figures @dirrm share/gnome/help/network-admin/en_GB +@dirrm share/gnome/help/network-admin/el/figures +@dirrm share/gnome/help/network-admin/el @dirrm share/gnome/help/network-admin/de/figures @dirrm share/gnome/help/network-admin/de +@dirrm share/gnome/help/network-admin/cs/figures +@dirrm share/gnome/help/network-admin/cs @dirrm share/gnome/help/network-admin/ca/figures @dirrm share/gnome/help/network-admin/ca @dirrm share/gnome/help/network-admin/C/figures @@ -462,10 +555,14 @@ share/omf/users-admin/users-admin-sv.omf @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index c83611bfa3b3..bf18e1e15daf 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.54 2008/12/21 06:20:19 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.72 2009/11/28 05:59:03 mezz Exp $ # PORTNAME= hal -DISTVERSION= 0.5.11 -PORTREVISION= 26 +DISTVERSION= 0.5.13 +PORTREVISION= 12 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ @@ -43,7 +43,7 @@ CONFIGURE_ARGS= --disable-gtk-doc \ --with-pid-file=/var/run/hald/hald.pid \ --with-deprecated-keys \ --localstatedir=/var -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CK_0_3" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" @@ -78,13 +78,6 @@ OPTIONS= FIXED_MOUNTPOINTS "use fixed mountpoints" off RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif -.if ${OSVERSION} <= 601100 -NEEDS_MEDIA= yes -PLIST_SUB+= MEDIA="" -.else -PLIST_SUB+= MEDIA="@comment " -.endif - .if defined(WITH_FIXED_MOUNTPOINTS) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c .endif @@ -96,11 +89,12 @@ PLIST_SUB+= USB2="@comment " .endif post-patch: - @${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \ + @${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \ ${WRKSRC}/tools/Makefile.in \ ${WRKSRC}/tools/freebsd/Makefile.in - @${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \ - ${WRKSRC}/hald/Makefile.in + @${REINPLACE_CMD} -e 's|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \ + ${WRKSRC}/hald/Makefile.in \ + ${WRKSRC}/tools/Makefile.in @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \ ${WRKSRC}/hal.conf.in @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ @@ -117,9 +111,6 @@ post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if defined(NEEDS_MEDIA) - ${MKDIR} /media -.endif .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index 00f32dd5190c..5885af28aef5 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,3 +1,3 @@ -MD5 (hal-0.5.11.tar.gz) = 750cf074e88b6fb7012f26d99cd39b9b -SHA256 (hal-0.5.11.tar.gz) = 730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90 -SIZE (hal-0.5.11.tar.gz) = 1672992 +MD5 (hal-0.5.13.tar.gz) = 46ecc5d2e5bd964fb78099688f01bb6a +SHA256 (hal-0.5.13.tar.gz) = ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af +SIZE (hal-0.5.13.tar.gz) = 1199224 diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index 9ccdbc16e6d1..42643888c954 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/sysutils/hal/files/hald.in,v 1.14 2008/08/21 16:04:48 mezz Exp $ +# $MCom: ports/sysutils/hal/files/hald.in,v 1.17 2009/09/26 13:42:01 marcus Exp $ # # PROVIDE: hald # REQUIRE: DAEMON usbd devd dbus moused @@ -9,12 +9,13 @@ # Add the following line to /etc/rc.conf to enable the HAL daemon: # # hald_enable="YES" -# hald_flags="<set as needed>" +# . %%RC_SUBR%% . %%GNOME_SUBR%% hald_enable=${hald_enable-${gnome_enable}} +hald_flags=${hald_flags-""} name=hald rcvar=`set_rcvar` diff --git a/sysutils/hal/files/patch-configure b/sysutils/hal/files/patch-configure index e70d7d60f497..bc4df6d96423 100644 --- a/sysutils/hal/files/patch-configure +++ b/sysutils/hal/files/patch-configure @@ -1,183 +1,53 @@ ---- configure.orig 2009-03-14 00:22:20.000000000 -0400 -+++ configure 2009-03-14 00:22:44.000000000 -0400 -@@ -930,6 +930,9 @@ HALD_COMPILE_FREEBSD_FALSE - HALD_COMPILE_SOLARIS_TRUE - HALD_COMPILE_SOLARIS_FALSE - HALD_BACKEND -+HAVE_LIBUSB20_TRUE -+HAVE_LIBUSB20_FALSE -+LIBUSB20_LIBS - HAVE_CONKIT_TRUE - HAVE_CONKIT_FALSE +--- configure.orig 2009-07-18 21:14:47.000000000 -0400 ++++ configure 2009-07-18 21:14:47.000000000 -0400 +@@ -818,6 +818,8 @@ XMLTO + HALD_OS_LIBS + BLKID_LIBS + BLKID_CFLAGS ++VOLUME_ID_LIBS ++VOLUME_ID_CFLAGS + GLIB_LIBS + GLIB_CFLAGS + DBUS_LIBS +@@ -847,6 +849,9 @@ HAVE_GPERF GPERF -@@ -5944,7 +5947,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5947 "configure"' > conftest.$ac_ext -+ echo '#line 5950 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -8596,11 +8599,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8599: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8602: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8603: \$? = $ac_status" >&5 -+ echo "$as_me:8606: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -8886,11 +8889,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8889: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8892: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8893: \$? = $ac_status" >&5 -+ echo "$as_me:8896: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -8990,11 +8993,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8993: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8996: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8997: \$? = $ac_status" >&5 -+ echo "$as_me:9000: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -11354,7 +11357,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11357 "configure" -+#line 11360 "configure" - #include "confdefs.h" + HAVE_CONKIT_FALSE + HAVE_CONKIT_TRUE ++LIBUSB20_LIBS ++HAVE_LIBUSB20_FALSE ++HAVE_LIBUSB20_TRUE + HALD_BACKEND + HALD_COMPILE_SOLARIS_FALSE + HALD_COMPILE_SOLARIS_TRUE +@@ -1101,6 +1106,8 @@ DBUS_CFLAGS + DBUS_LIBS + GLIB_CFLAGS + GLIB_LIBS ++VOLUME_ID_CFLAGS ++VOLUME_ID_LIBS + BLKID_CFLAGS + BLKID_LIBS' - #if HAVE_DLFCN_H -@@ -11454,7 +11457,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11457 "configure" -+#line 11460 "configure" - #include "confdefs.h" +@@ -1825,6 +1832,10 @@ Some influential environment variables: + DBUS_LIBS linker flags for DBUS, overriding pkg-config + GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config + GLIB_LIBS linker flags for GLIB, overriding pkg-config ++ VOLUME_ID_CFLAGS ++ C compiler flags for VOLUME_ID, overriding pkg-config ++ VOLUME_ID_LIBS ++ linker flags for VOLUME_ID, overriding pkg-config + BLKID_CFLAGS + C compiler flags for BLKID, overriding pkg-config + BLKID_LIBS linker flags for BLKID, overriding pkg-config +@@ -2794,6 +2805,7 @@ fi + glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61" + dbus_module="dbus-1 >= 0.61" + blkid_module="blkid >= 1.43" ++volume_id_module="libvolume_id >= 0.77" + polkit_module="polkit >= 0.5" - #if HAVE_DLFCN_H -@@ -13855,11 +13858,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13858: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13861: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:13862: \$? = $ac_status" >&5 -+ echo "$as_me:13865: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -13959,11 +13962,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13962: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13965: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:13966: \$? = $ac_status" >&5 -+ echo "$as_me:13969: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -15542,11 +15545,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15545: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15548: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15549: \$? = $ac_status" >&5 -+ echo "$as_me:15552: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -15646,11 +15649,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15649: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15652: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15653: \$? = $ac_status" >&5 -+ echo "$as_me:15656: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -17853,11 +17856,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17856: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17859: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17860: \$? = $ac_status" >&5 -+ echo "$as_me:17863: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18143,11 +18146,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18146: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18149: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18150: \$? = $ac_status" >&5 -+ echo "$as_me:18153: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -18247,11 +18250,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18250: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18253: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18254: \$? = $ac_status" >&5 -+ echo "$as_me:18257: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -23420,6 +23423,9 @@ else + # libtool versioning - this applies to libhal and libhal-storage +@@ -19129,6 +19141,9 @@ else fi @@ -187,15 +57,15 @@ # Check whether --with-backend was given. if test "${with_backend+set}" = set; then -@@ -23477,6 +23483,176 @@ else +@@ -19186,6 +19201,184 @@ else fi +if test "x$HALD_BACKEND" = "xfreebsd"; then -+ { echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb20" >&5 -+echo $ECHO_N "checking for libusb20_dev_get_info in -lusb20... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb20" >&5 ++$as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; } +if test "${ac_cv_lib_usb20_libusb20_dev_get_info+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lusb20 $LIBS" @@ -227,33 +97,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_usb20_libusb20_dev_get_info=yes +else -+ echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_usb20_libusb20_dev_get_info=no +fi + ++rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5 -+echo "${ECHO_T}$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; } -+if test $ac_cv_lib_usb20_libusb20_dev_get_info = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5 ++$as_echo "$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; } ++if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = x""yes; then + USE_LIBUSB20=yes +else + USE_LIBUSB20=no @@ -261,10 +135,10 @@ + +fi +if test "x$USE_LIBUSB20" = "xno"; then -+ { echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb" >&5 -+echo $ECHO_N "checking for libusb20_dev_get_info in -lusb... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb" >&5 ++$as_echo_n "checking for libusb20_dev_get_info in -lusb... " >&6; } +if test "${ac_cv_lib_usb_libusb20_dev_get_info+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lusb $LIBS" @@ -296,33 +170,37 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then + ac_cv_lib_usb_libusb20_dev_get_info=yes +else -+ echo "$as_me: failed program was:" >&5 ++ $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_usb_libusb20_dev_get_info=no +fi + ++rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5 -+echo "${ECHO_T}$ac_cv_lib_usb_libusb20_dev_get_info" >&6; } -+if test $ac_cv_lib_usb_libusb20_dev_get_info = yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5 ++$as_echo "$ac_cv_lib_usb_libusb20_dev_get_info" >&6; } ++if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = x""yes; then + USE_LIBUSB=yes +else + USE_LIBUSB=no @@ -364,63 +242,157 @@ cat >>confdefs.h <<_ACEOF -@@ -25602,6 +25778,20 @@ echo "$as_me: error: conditional \"HALD_ +@@ -19943,8 +20136,132 @@ fi + { $as_echo "$as_me:$LINENO: result: $have_glib_2_14" >&5 + $as_echo "$have_glib_2_14" >&6; } + ++case "$host" in ++*-*-freebsd*) ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for VOLUME_ID" >&5 ++$as_echo_n "checking for VOLUME_ID... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$VOLUME_ID_CFLAGS"; then ++ pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_VOLUME_ID_CFLAGS=`$PKG_CONFIG --cflags "$volume_id_module" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$VOLUME_ID_LIBS"; then ++ pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_VOLUME_ID_LIBS=`$PKG_CONFIG --libs "$volume_id_module" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$volume_id_module"` ++ else ++ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$volume_id_module"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$VOLUME_ID_PKG_ERRORS" >&5 ++ ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ($volume_id_module) were not met: ++ ++$VOLUME_ID_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables VOLUME_ID_CFLAGS ++and VOLUME_ID_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&5 ++$as_echo "$as_me: error: Package requirements ($volume_id_module) were not met: ++ ++$VOLUME_ID_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables VOLUME_ID_CFLAGS ++and VOLUME_ID_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} ++ { (exit 1); exit 1; }; } ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables VOLUME_ID_CFLAGS ++and VOLUME_ID_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables VOLUME_ID_CFLAGS ++and VOLUME_ID_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } ++else ++ VOLUME_ID_CFLAGS=$pkg_cv_VOLUME_ID_CFLAGS ++ VOLUME_ID_LIBS=$pkg_cv_VOLUME_ID_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : ++fi ++ ++ ++ ;; ++*) ++ ;; ++esac ++ + # blkid + case "$host" in ++*-*-freebsd*) ++ ;; + *-*-solaris*) + ;; + *) +@@ -21441,6 +21758,20 @@ $as_echo "$as_me: error: conditional \"H Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined. ++ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined. ++$as_echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_CONKIT\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CONKIT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -@@ -26568,6 +26758,9 @@ HALD_COMPILE_FREEBSD_FALSE!$HALD_COMPILE - HALD_COMPILE_SOLARIS_TRUE!$HALD_COMPILE_SOLARIS_TRUE$ac_delim - HALD_COMPILE_SOLARIS_FALSE!$HALD_COMPILE_SOLARIS_FALSE$ac_delim - HALD_BACKEND!$HALD_BACKEND$ac_delim -+HAVE_LIBUSB20_TRUE!$HAVE_LIBUSB20_TRUE$ac_delim -+HAVE_LIBUSB20_FALSE!$HAVE_LIBUSB20_FALSE$ac_delim -+LIBUSB20_LIBS!$LIBUSB20_LIBS$ac_delim - HAVE_CONKIT_TRUE!$HAVE_CONKIT_TRUE$ac_delim - HAVE_CONKIT_FALSE!$HAVE_CONKIT_FALSE$ac_delim - GPERF!$GPERF$ac_delim -@@ -26597,9 +26790,6 @@ DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim - DBUS_LIBS!$DBUS_LIBS$ac_delim - GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim - GLIB_LIBS!$GLIB_LIBS$ac_delim --VOLUME_ID_CFLAGS!$VOLUME_ID_CFLAGS$ac_delim --VOLUME_ID_LIBS!$VOLUME_ID_LIBS$ac_delim --HALD_OS_LIBS!$HALD_OS_LIBS$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -26641,6 +26831,9 @@ _ACEOF - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -+VOLUME_ID_CFLAGS!$VOLUME_ID_CFLAGS$ac_delim -+VOLUME_ID_LIBS!$VOLUME_ID_LIBS$ac_delim -+HALD_OS_LIBS!$HALD_OS_LIBS$ac_delim - XMLTO!$XMLTO$ac_delim - XMLLINT!$XMLLINT$ac_delim - DOCBOOK_DOCS_ENABLED_TRUE!$DOCBOOK_DOCS_ENABLED_TRUE$ac_delim -@@ -26672,7 +26865,7 @@ LIBOBJS!$LIBOBJS$ac_delim - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/sysutils/hal/files/patch-configure.in b/sysutils/hal/files/patch-configure.in index 37fb1534e484..84e12d18796b 100644 --- a/sysutils/hal/files/patch-configure.in +++ b/sysutils/hal/files/patch-configure.in @@ -1,6 +1,14 @@ ---- configure.in.orig 2008-05-07 19:24:31.000000000 -0400 -+++ configure.in 2009-03-14 00:14:25.000000000 -0400 -@@ -446,6 +446,9 @@ if test "x$with_libpci" != xno ; then +--- configure.in.orig 2009-05-10 15:43:52.000000000 -0400 ++++ configure.in 2009-05-17 00:53:29.000000000 -0400 +@@ -14,6 +14,7 @@ AM_MAINTAINER_MODE + glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61" + dbus_module="dbus-1 >= 0.61" + blkid_module="blkid >= 1.43" ++volume_id_module="libvolume_id >= 0.77" + polkit_module="polkit >= 0.5" + + # libtool versioning - this applies to libhal and libhal-storage +@@ -477,6 +478,9 @@ if test "x$with_libpci" != xno ; then fi AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) @@ -10,7 +18,7 @@ AC_ARG_WITH([backend], AS_HELP_STRING([--with-backend=<name>], [backend to use (linux/solaris/freebsd/dummy)]), -@@ -473,6 +476,22 @@ AM_CONDITIONAL(HALD_COMPILE_LINUX, [test +@@ -504,6 +508,22 @@ AM_CONDITIONAL(HALD_COMPILE_LINUX, [test AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD]) AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) AC_SUBST(HALD_BACKEND) @@ -33,3 +41,24 @@ dnl DBUS API is subject to changes AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) +@@ -685,8 +705,20 @@ else + fi + AC_MSG_RESULT($have_glib_2_14) + ++case "$host" in ++*-*-freebsd*) ++ PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) ++ AC_SUBST(VOLUME_ID_CFLAGS) ++ AC_SUBST(VOLUME_ID_LIBS) ++ ;; ++*) ++ ;; ++esac ++ + # blkid + case "$host" in ++*-*-freebsd*) ++ ;; + *-*-solaris*) + ;; + *) diff --git a/sysutils/hal/files/patch-consolekit03 b/sysutils/hal/files/patch-consolekit03 deleted file mode 100644 index 13ac31849390..000000000000 --- a/sysutils/hal/files/patch-consolekit03 +++ /dev/null @@ -1,66 +0,0 @@ -diff -p -up hal-0.5.11/configure.in.ck03 hal-0.5.11/configure.in ---- hal-0.5.11/configure.in.ck03 2008-05-07 19:24:31.000000000 -0400 -+++ configure.in 2008-08-11 06:18:07.000000000 -0400 -diff -p -up hal-0.5.11/hald/ck-tracker.c.ck03 hal-0.5.11/hald/ck-tracker.c ---- hal-0.5.11/hald/ck-tracker.c.ck03 2008-05-07 19:23:48.000000000 -0400 -+++ hald/ck-tracker.c 2008-08-12 12:34:47.000000000 -0400 -@@ -256,7 +256,11 @@ ck_session_get_info (CKTracker *tracker, - goto error; - } - if (!dbus_message_get_args (reply, NULL, -+#ifdef HAVE_CK_0_3 -+ DBUS_TYPE_UINT32, &(session->user), -+#else - DBUS_TYPE_INT32, &(session->user), -+#endif - DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid GetUnixUser reply from CK")); - goto error; -@@ -531,7 +535,11 @@ ck_tracker_process_system_bus_message (C - seat_objpath = dbus_message_get_path (message); - - if (!dbus_message_get_args (message, NULL, -+#ifdef HAVE_CK_0_3 -+ DBUS_TYPE_OBJECT_PATH, &seat_objpath, -+#else - DBUS_TYPE_STRING, &seat_objpath, -+#endif - DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid SeatAdded signal from CK")); - goto out; -@@ -558,7 +566,11 @@ ck_tracker_process_system_bus_message (C - seat_objpath = dbus_message_get_path (message); - - if (!dbus_message_get_args (message, NULL, -+#ifdef HAVE_CK_0_3 -+ DBUS_TYPE_OBJECT_PATH, &seat_objpath, -+#else - DBUS_TYPE_STRING, &seat_objpath, -+#endif - DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid SeatRemoved signal from CK")); - goto out; -@@ -588,7 +600,11 @@ ck_tracker_process_system_bus_message (C - seat_objpath = dbus_message_get_path (message); - - if (!dbus_message_get_args (message, NULL, -+#ifdef HAVE_CK_0_3 -+ DBUS_TYPE_OBJECT_PATH, &session_objpath, -+#else - DBUS_TYPE_STRING, &session_objpath, -+#endif - DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid SessionAdded signal from CK")); - goto out; -@@ -624,7 +640,11 @@ ck_tracker_process_system_bus_message (C - seat_objpath = dbus_message_get_path (message); - - if (!dbus_message_get_args (message, NULL, -+#ifdef HAVE_CK_0_3 -+ DBUS_TYPE_OBJECT_PATH, &session_objpath, -+#else - DBUS_TYPE_STRING, &session_objpath, -+#endif - DBUS_TYPE_INVALID)) { - HAL_ERROR (("Invalid SessionRemoved signal from CK")); - goto out; diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi index b4fd8b3ff74c..bb18f33107a3 100644 --- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi +++ b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi @@ -1,9 +1,9 @@ ---- fdi/policy/10osvendor/10-x11-input.fdi.orig 2008-05-07 19:21:15.000000000 -0400 -+++ fdi/policy/10osvendor/10-x11-input.fdi 2009-01-23 18:20:10.000000000 -0500 -@@ -1,19 +1,10 @@ - <?xml version="1.0" encoding="ISO-8859-1"?> - <deviceinfo version="0.2"> - <device> +--- fdi/policy/10osvendor/10-x11-input.fdi.orig 2009-06-26 03:28:39.000000000 -0400 ++++ fdi/policy/10osvendor/10-x11-input.fdi 2009-07-18 21:19:15.000000000 -0400 +@@ -7,15 +7,6 @@ + <merge key="input.x11_driver" type="string">evdev</merge> + </match> + - <!-- FIXME: Support tablets too. --> - <match key="info.capabilities" contains="input.mouse"> - <merge key="input.x11_driver" type="string">mouse</merge> @@ -13,6 +13,13 @@ - </match> - </match> - + <match key="info.capabilities" contains="input.tablet"> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" + string="Linux"> +@@ -23,10 +14,10 @@ + </match> + </match> + - <match key="info.capabilities" contains="input.keys"> + <match key="info.capabilities" contains="input.keyboard"> <!-- If we're using Linux, we use evdev by default (falling back to diff --git a/sysutils/hal/files/patch-hal.conf.in b/sysutils/hal/files/patch-hal.conf.in deleted file mode 100644 index 2d11e7133b18..000000000000 --- a/sysutils/hal/files/patch-hal.conf.in +++ /dev/null @@ -1,25 +0,0 @@ -fix for 'stderr' error - -dbus-daemon: Would reject message, 1 matched rules; type="method_call", sender=":1.33" (uid=1002 pid=23124 comm=") interface="org.freedesktop.DBus.Introspectable" member="Introspect" error name="(unset)" requested_reply=0 destination="org.freedesktop.Hal" (uid=0 pid=25899 comm=")) - -here is a patch for hal.conf. Fixed in upstream, obrient from https://bugs.freedesktop.org/show_bug.cgi?id=18985 - ---- hal.conf.in.orig 2008-08-14 04:32:12.000000000 -0400 -+++ hal.conf.in 2008-12-19 12:11:02.000000000 -0500 -@@ -16,6 +16,8 @@ - - <!-- Allow anyone to invoke methods on the Manager and Device interfaces --> - <policy context="default"> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_interface="org.freedesktop.Hal.Manager"/> - <allow send_interface="org.freedesktop.Hal.Device"/> - <allow receive_interface="org.freedesktop.Hal.Manager" -@@ -26,6 +28,7 @@ - <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/> - <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/> - <allow send_interface="org.freedesktop.Hal.Device.Volume"/> -+ <allow send_interface="org.freedesktop.Hal.Device.KillSwitch"/> - <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/> - <allow receive_interface="org.freedesktop.Hal.Device.SystemPowerManagement" - receive_sender="org.freedesktop.Hal"/> diff --git a/sysutils/hal/files/patch-hald_freebsd_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_Makefile.in index 793066528491..44dbf8adc88a 100644 --- a/sysutils/hal/files/patch-hald_freebsd_Makefile.in +++ b/sysutils/hal/files/patch-hald_freebsd_Makefile.in @@ -1,5 +1,5 @@ ---- hald/freebsd/Makefile.in.orig 2009-02-17 18:59:04.000000000 -0500 -+++ hald/freebsd/Makefile.in 2009-02-18 00:18:00.000000000 -0500 +--- hald/freebsd/Makefile.in.orig 2009-05-17 00:43:12.000000000 -0400 ++++ hald/freebsd/Makefile.in 2009-05-17 00:43:12.000000000 -0400 @@ -32,6 +32,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ @@ -43,15 +43,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ -@@ -228,6 +242,7 @@ sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - SUBDIRS = libprobe probing addons . -@@ -241,46 +256,15 @@ AM_CPPFLAGS = \ +@@ -250,46 +264,15 @@ AM_CPPFLAGS = \ @GLIB_CFLAGS@ @DBUS_CFLAGS@ @POLKIT_CFLAGS@ @HALD_COMPILE_FREEBSD_TRUE@noinst_LTLIBRARIES = libhald_freebsd.la @@ -107,7 +99,7 @@ EXTRA_DIST = README TODO all: all-recursive -@@ -349,6 +333,7 @@ distclean-compile: +@@ -358,6 +341,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-sound.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-storage.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-usb.Plo@am__quote@ diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c index 474658423dc7..f19b7e92dcea 100644 --- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c +++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c @@ -1,6 +1,6 @@ ---- hald/freebsd/addons/addon-storage.c.orig 2008-05-07 19:24:04.000000000 -0400 -+++ hald/freebsd/addons/addon-storage.c 2008-05-19 02:18:59.000000000 -0400 -@@ -36,17 +36,23 @@ +--- hald/freebsd/addons/addon-storage.c.orig 2008-08-10 09:50:10.000000000 -0400 ++++ hald/freebsd/addons/addon-storage.c 2009-09-13 17:23:52.000000000 -0400 +@@ -36,17 +36,24 @@ #include "../libprobe/hfp.h" #include "../libprobe/hfp-cdrom.h" @@ -22,11 +22,22 @@ } addon = { { 2, 0 } }; +static void update_proc_title (const char *device); ++static void unmount_volumes (void); + /* see MMC-3 Working Draft Revision 10 */ static boolean hf_addon_storage_cdrom_eject_pressed (HFPCDROM *cdrom) -@@ -144,18 +150,49 @@ hf_addon_storage_update (void) +@@ -100,8 +107,7 @@ hf_addon_storage_update (void) + + if (hf_addon_storage_cdrom_eject_pressed(cdrom)) + { +- libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", &hfp_error); +- dbus_error_free(&hfp_error); ++ libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", NULL); + } + + hfp_cdrom_free(cdrom); +@@ -144,18 +150,142 @@ hf_addon_storage_update (void) } } @@ -36,6 +47,102 @@ return has_media; } ++static void ++unmount_volumes (void) ++{ ++ int num_volumes; ++ char **volumes; ++ ++ if ((volumes = libhal_manager_find_device_string_match(hfp_ctx, ++ "block.storage_device", ++ hfp_udi, ++ &num_volumes, ++ NULL)) != NULL) ++ { ++ int i; ++ ++ for (i = 0; i < num_volumes; i++) ++ { ++ char *vol_udi; ++ ++ vol_udi = volumes[i]; ++ ++ if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", NULL)) ++ { ++ DBusMessage *msg = NULL; ++ DBusMessage *reply = NULL; ++ DBusConnection *dbus_connection; ++ unsigned int num_options = 0; ++ char **options = NULL; ++ char *devfile; ++ ++ hfp_info("Forcing unmount of volume '%s'", vol_udi); ++ ++ dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx); ++ msg = dbus_message_new_method_call("org.freedesktop.Hal", vol_udi, ++ "org.freedesktop.Hal.Device.Volume", ++ "Unmount"); ++ if (msg == NULL) ++ { ++ hfp_warning("Could not create dbus message for %s", vol_udi); ++ continue; ++ } ++ ++ options = calloc(1, sizeof (char *)); ++ if (options == NULL) ++ { ++ hfp_warning("Could not allocation memory for options"); ++ dbus_message_unref(msg); ++ continue; ++ } ++ ++ options[0] = "force"; ++ num_options = 1; ++ ++ devfile = libhal_device_get_property_string(hfp_ctx, vol_udi, "block.device", NULL); ++ if (devfile != NULL) ++ { ++ hfp_info("Forcibly attempting to unmount %s as media was removed", devfile); ++ libhal_free_string(devfile); ++ } ++ ++ if (! dbus_message_append_args(msg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, num_options, DBUS_TYPE_INVALID)) ++ { ++ hfp_warning("Could not append args to dbus message for %s", vol_udi); ++ free(options); ++ dbus_message_unref(msg); ++ continue; ++ } ++ ++ if (! (reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, -1, &hfp_error))) ++ { ++ hfp_warning("Unmount failed for %s: %s: %s", vol_udi, hfp_error.name, hfp_error.message); ++ dbus_error_free(&hfp_error); ++ free(options); ++ dbus_message_unref(msg); ++ continue; ++ } ++ ++ if (dbus_error_is_set(&hfp_error)) ++ { ++ hfp_warning("Unmount failed for %s: %s : %s", vol_udi, hfp_error.name, hfp_error.message); ++ dbus_error_free(&hfp_error); ++ free(options); ++ dbus_message_unref(msg); ++ dbus_message_unref(reply); ++ continue; ++ } ++ ++ hfp_info("Successfully unmounted udi '%s'", vol_udi); ++ free(options); ++ dbus_message_unref(msg); ++ dbus_message_unref(reply); ++ } ++ } ++ libhal_free_string_array(volumes); ++ } ++} ++ static boolean -poll_for_media (void) +poll_for_media (boolean check_only, boolean force) @@ -49,10 +156,9 @@ + check_lock_state = FALSE; + + hfp_info("Checking whether device %s is locked by HAL", addon.device_file); -+ if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", &hfp_error)) ++ if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", NULL)) + { + hfp_info("... device %s is locked by HAL", addon.device_file); -+ dbus_error_free(&hfp_error); + is_locked_by_hal = TRUE; + update_proc_title(addon.device_file); + goto skip_check; @@ -62,10 +168,8 @@ + hfp_info("... device %s is not locked by HAL", addon.device_file); + is_locked_by_hal = FALSE; + } -+ dbus_error_free(&hfp_error); + -+ should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error); -+ dbus_error_free(&hfp_error); ++ should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", NULL); + polling_disabled = ! should_poll; + update_proc_title(addon.device_file); + } @@ -80,7 +184,23 @@ if (has_media != addon.had_media) { /* -@@ -175,20 +212,33 @@ poll_for_media (void) +@@ -168,27 +298,47 @@ poll_for_media (void) + * then hung while rebooting and did not unmount my other + * filesystems. + */ ++#if __FreeBSD_version >= 800066 ++ /* ++ * With newusb, it is safe to force unmount volumes. This may be ++ * safe on newer versions of the old USB stack, but we'll be ++ * extra cautious. ++ */ ++ unmount_volumes(); ++#endif + +- libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error); +- dbus_error_free(&hfp_error); ++ libhal_device_rescan(hfp_ctx, hfp_udi, NULL); + addon.had_media = has_media; return TRUE; } @@ -119,7 +239,7 @@ { if (dbus_message_is_method_call(message, "org.freedesktop.Hal.Device.Storage.Removable", -@@ -199,7 +249,7 @@ filter_function (DBusConnection *connect +@@ -199,7 +349,7 @@ filter_function (DBusConnection *connect hfp_info("Forcing poll for media becusse CheckForMedia() was called"); @@ -128,7 +248,7 @@ reply = dbus_message_new_method_return (message); dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID); -@@ -217,8 +267,9 @@ main (int argc, char **argv) +@@ -217,8 +367,9 @@ main (int argc, char **argv) char *removable; char *bus; char *driver; @@ -139,19 +259,19 @@ if (! hfp_init(argc, argv)) goto end; -@@ -251,16 +302,41 @@ main (int argc, char **argv) +@@ -251,16 +402,39 @@ main (int argc, char **argv) addon.is_scsi_removable = (! strcmp(bus, "scsi") || (! strcmp(bus, "usb") && (! strcmp(driver, "da") || ! strcmp(driver, "sa") || ! strcmp(driver, "cd")))) && ! strcmp(removable, "true"); - addon.had_media = hf_addon_storage_update(); + addon.had_media = poll_for_media(TRUE, FALSE); - if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error)) +- if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error)) ++ if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, NULL)) goto end; - dbus_error_free(&hfp_error); - -+ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, &hfp_error); -+ dbus_error_free(&hfp_error); +- dbus_error_free(&hfp_error); ++ ++ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + assert(syscon != NULL); + dbus_connection_set_exit_on_disconnect(syscon, 0); + @@ -174,7 +294,7 @@ + hfp_free(filter_str); + + dbus_connection_add_filter(syscon, dbus_filter_function, NULL, NULL); -+ + connection = libhal_ctx_get_dbus_connection(hfp_ctx); assert(connection != NULL); dbus_connection_set_exit_on_disconnect(connection, 0); @@ -183,7 +303,20 @@ if (! libhal_device_claim_interface(hfp_ctx, hfp_udi, -@@ -280,40 +356,32 @@ main (int argc, char **argv) +@@ -268,52 +442,43 @@ main (int argc, char **argv) + " <method name=\"CheckForMedia\">\n" + " <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n" + " </method>\n", +- &hfp_error)) ++ NULL)) + { + hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'"); + goto end; + } +- dbus_error_free(&hfp_error); + + while (TRUE) + { /* process dbus traffic until update interval has elapsed */ while (TRUE) { diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-computer.c b/sysutils/hal/files/patch-hald_freebsd_hf-computer.c new file mode 100644 index 000000000000..e2921c58aa12 --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_hf-computer.c @@ -0,0 +1,26 @@ +--- hald/freebsd/hf-computer.c.orig 2009-07-18 21:22:48.000000000 -0400 ++++ hald/freebsd/hf-computer.c 2009-07-18 21:23:51.000000000 -0400 +@@ -26,6 +26,7 @@ + # include <config.h> + #endif + ++#include <stdio.h> + #include <string.h> + #include <sys/utsname.h> + +@@ -133,11 +134,11 @@ hf_computer_device_add (void) + if (PACKAGE_VERSION) { + int major, minor, micro; + +- hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION); ++ hal_device_property_set_string (device, "org.freedesktop.Hal.version", PACKAGE_VERSION); + if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, µ ) == 3 ) { +- hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major); +- hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor); +- hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro); ++ hal_device_property_set_int (device, "org.freedesktop.Hal.version.major", major); ++ hal_device_property_set_int (device, "org.freedesktop.Hal.version.minor", minor); ++ hal_device_property_set_int (device, "org.freedesktop.Hal.version.micro", micro); + } + } + diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c new file mode 100644 index 000000000000..bc7ad871d67d --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c @@ -0,0 +1,11 @@ +--- hald/freebsd/hf-scsi.c.orig 2009-08-18 16:19:02.000000000 -0400 ++++ hald/freebsd/hf-scsi.c 2009-08-18 16:19:24.000000000 -0400 +@@ -549,7 +549,7 @@ hf_scsi_probe (void) + break; /* only use the first peripheral */ + + match = &ccb.cdm.matches[i].result.periph_result; +- if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass")) ++ if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass") || ! strcmp(match->periph_name, "probe")) + break; + + pending_devname = g_strdup_printf("%s%i", match->periph_name, match->unit_number); diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c index 0da9bc2bc566..9f0f5726186c 100644 --- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c +++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c @@ -1,6 +1,6 @@ ---- hald/freebsd/hf-usb2.c.orig 2009-03-02 20:16:10.000000000 -0600 -+++ hald/freebsd/hf-usb2.c 2009-03-02 20:33:13.000000000 -0600 -@@ -0,0 +1,287 @@ +--- hald/freebsd/hf-usb2.c.orig 2009-11-21 19:57:40.000000000 -0500 ++++ hald/freebsd/hf-usb2.c 2009-11-21 19:58:07.000000000 -0500 +@@ -0,0 +1,312 @@ +/*************************************************************************** + * CVSID: $Id$ + * @@ -102,7 +102,7 @@ + { + if (! strcmp(driver, "ukbd")) + hf_device_set_input(device, "keyboard", NULL); -+ else if (! strcmp(driver, "ums")) ++ else if (! strcmp(driver, "ums") || ! strcmp(driver, "atp")) + { + hf_device_set_input(device, "mouse", devname); + hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL); @@ -195,11 +195,12 @@ + addr = libusb20_dev_get_address(pdev); + + if (addr == 1) -+ parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus); ++ parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus); + else + parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number", + HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number", -+ HAL_PROPERTY_TYPE_INT32, addr - 1, NULL); ++ HAL_PROPERTY_TYPE_INT32, addr - 1, "info.bus", ++ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL); + if (! parent || hal_device_property_get_bool(parent, "info.ignore")) + continue; + @@ -219,7 +220,13 @@ + HalDevice *parent_device; + int bus, addr, pbus, paddr; + -+ if (strncmp(name, "ugen", strlen("ugen"))) ++ if (! parent) ++ return FALSE; ++ ++ if (strncmp(name, "ugen", strlen("ugen")) && ++ ! strncmp(parent, "uhub", strlen("uhub"))) ++ return TRUE; ++ else if (strncmp(name, "ugen", strlen("ugen"))) + return FALSE; + else if (strncmp(parent, "ugen", strlen("ugen"))) + return TRUE; @@ -235,7 +242,8 @@ + + parent_device = hf_device_store_match(hald_get_gdl(), + "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus, -+ "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, NULL); ++ "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, "info.bus", ++ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL); + + if (parent_device && ! hal_device_property_get_bool(parent_device, + "info.ignore")) @@ -258,8 +266,6 @@ + + if (strncmp(name, "ugen", strlen("ugen"))) + return FALSE; -+ else if (strncmp(parent, "ugen", strlen("ugen"))) -+ return TRUE; + + if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2) + return FALSE; @@ -268,7 +274,8 @@ + + device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number", + HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number", -+ HAL_PROPERTY_TYPE_INT32, addr, NULL); ++ HAL_PROPERTY_TYPE_INT32, addr, "info.bus", ++ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL); + + if (device) + { @@ -279,6 +286,23 @@ + return FALSE; +} + ++static gboolean ++hf_usb2_devd_notify (const char *system, ++ const char *subsystem, ++ const char *type, ++ const char *data) ++{ ++ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || ++ (strcmp(type, "CREATE") && strcmp(type, "DESTROY"))) ++ return FALSE; ++ ++ if (! strncmp(data, "cdev=ugen", strlen("cdev=ugen")) || ++ ! strncmp(data, "cdev=usb", strlen("cdev=usb"))) ++ return TRUE; ++ ++ return FALSE; ++} ++ +HFHandler hf_usb2_handler = { + .privileged_init = hf_usb2_privileged_init, + .probe = hf_usb2_probe @@ -286,5 +310,6 @@ + +HFDevdHandler hf_usb2_devd_handler = { + .add = hf_usb2_devd_add, -+ .remove = hf_usb2_devd_remove ++ .remove = hf_usb2_devd_remove, ++ .notify = hf_usb2_devd_notify +}; diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c index 039a1a6760f4..6ee93b139a6b 100644 --- a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c +++ b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c @@ -1,5 +1,5 @@ ---- hald/freebsd/hf-volume.c.orig 2008-05-07 19:24:03.000000000 -0400 -+++ hald/freebsd/hf-volume.c 2008-10-26 15:17:09.000000000 -0400 +--- hald/freebsd/hf-volume.c.orig 2008-08-10 09:50:10.000000000 -0400 ++++ hald/freebsd/hf-volume.c 2009-09-19 02:06:37.000000000 -0400 @@ -45,6 +45,7 @@ #include "hf-util.h" @@ -8,7 +8,7 @@ static void hf_volume_get_mounts (struct statfs **mounts, int *n_mounts) -@@ -60,6 +61,55 @@ hf_volume_get_mounts (struct statfs **mo +@@ -60,6 +61,58 @@ hf_volume_get_mounts (struct statfs **mo } } @@ -37,9 +37,12 @@ + { + if (strcmp(fields[0], special) == 0) + { ++ char *ret; ++ ++ ret = g_strdup(fields[1]); + g_strfreev(fields); + g_strfreev(lines); -+ return g_strdup(fields[1]); ++ return ret; + } + } + g_strfreev(fields); @@ -64,7 +67,7 @@ static const struct statfs * hf_volume_mounts_find (const struct statfs *mounts, int n_mounts, -@@ -71,8 +121,18 @@ hf_volume_mounts_find (const struct stat +@@ -71,8 +124,18 @@ hf_volume_mounts_find (const struct stat g_return_val_if_fail(special != NULL, NULL); for (i = 0; i < n_mounts; i++) @@ -85,7 +88,7 @@ return NULL; } -@@ -92,7 +152,13 @@ hf_volume_device_update_mount_properties +@@ -92,7 +155,13 @@ hf_volume_device_update_mount_properties special = hal_device_property_get_string(device, "block.device"); if (special) diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am index 405026cc65b3..091af3c1ca0e 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am +++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am @@ -1,5 +1,5 @@ ---- hald/freebsd/probing/Makefile.am.orig 2008-05-07 19:24:08.000000000 -0400 -+++ hald/freebsd/probing/Makefile.am 2009-02-18 00:16:28.000000000 -0500 +--- hald/freebsd/probing/Makefile.am.orig 2008-08-10 09:50:10.000000000 -0400 ++++ hald/freebsd/probing/Makefile.am 2009-07-17 02:31:02.000000000 -0400 @@ -9,11 +9,18 @@ AM_CPPFLAGS = \ if HALD_COMPILE_FREEBSD @@ -49,3 +49,9 @@ hald_probe_smbios_SOURCES = probe-smbios.c hald_probe_smbios_LDADD = \ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la +@@ -41,4 +67,5 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA + hald_probe_volume_LDADD = \ + @GLIB_LIBS@ \ + @VOLUME_ID_LIBS@ \ ++ -lufs \ + $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in index 5cc771653f20..4a8ea2f053e3 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in +++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in @@ -1,5 +1,5 @@ ---- hald/freebsd/probing/Makefile.in.orig 2009-02-15 13:42:09.000000000 -0500 -+++ hald/freebsd/probing/Makefile.in 2009-02-18 00:18:00.000000000 -0500 +--- hald/freebsd/probing/Makefile.in.orig 2009-07-16 22:17:53.000000000 -0400 ++++ hald/freebsd/probing/Makefile.in 2009-07-17 02:32:09.000000000 -0400 @@ -34,10 +34,16 @@ build_triplet = @build@ host_triplet = @host@ @HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS = \ @@ -75,15 +75,7 @@ $(hald_probe_volume_SOURCES) ETAGS = etags CTAGS = ctags -@@ -238,6 +266,7 @@ sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AM_CPPFLAGS = \ -@@ -254,6 +283,23 @@ hald_probe_hiddev_LDADD = \ +@@ -263,6 +291,23 @@ hald_probe_hiddev_LDADD = \ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ -lusbhid @@ -107,7 +99,15 @@ hald_probe_smbios_SOURCES = probe-smbios.c hald_probe_smbios_LDADD = \ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la -@@ -340,6 +386,9 @@ clean-libexecPROGRAMS: +@@ -283,6 +328,7 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA + hald_probe_volume_LDADD = \ + @GLIB_LIBS@ \ + @VOLUME_ID_LIBS@ \ ++ -lufs \ + $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la + + all: all-am +@@ -349,6 +395,9 @@ clean-libexecPROGRAMS: hald-probe-hiddev$(EXEEXT): $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_DEPENDENCIES) @rm -f hald-probe-hiddev$(EXEEXT) $(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS) @@ -117,7 +117,7 @@ hald-probe-scsi$(EXEEXT): $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_DEPENDENCIES) @rm -f hald-probe-scsi$(EXEEXT) $(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS) -@@ -349,6 +398,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe +@@ -358,6 +407,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe hald-probe-storage$(EXEEXT): $(hald_probe_storage_OBJECTS) $(hald_probe_storage_DEPENDENCIES) @rm -f hald-probe-storage$(EXEEXT) $(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS) @@ -130,7 +130,7 @@ hald-probe-volume$(EXEEXT): $(hald_probe_volume_OBJECTS) $(hald_probe_volume_DEPENDENCIES) @rm -f hald-probe-volume$(EXEEXT) $(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS) -@@ -359,6 +414,7 @@ mostlyclean-compile: +@@ -368,6 +423,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -138,7 +138,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-probe-storage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po@am__quote@ -@@ -366,6 +422,8 @@ distclean-compile: +@@ -375,6 +431,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-hiddev.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-scsi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-smbios.Po@am__quote@ @@ -147,7 +147,7 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -388,6 +446,20 @@ distclean-compile: +@@ -397,6 +455,20 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c index b9dc099e63b3..c92b7026654d 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c @@ -1,6 +1,19 @@ ---- hald/freebsd/probing/probe-volume.c.orig 2008-04-07 00:41:22.000000000 -0400 -+++ hald/freebsd/probing/probe-volume.c 2008-04-07 00:43:32.000000000 -0400 -@@ -502,7 +502,8 @@ main (int argc, char **argv) +--- hald/freebsd/probing/probe-volume.c.orig 2008-08-10 09:50:10.000000000 -0400 ++++ hald/freebsd/probing/probe-volume.c 2009-09-26 03:54:16.000000000 -0400 +@@ -36,7 +36,12 @@ + #include <sys/disk.h> + #include <sys/cdio.h> + #include <sys/param.h> ++#include <sys/mount.h> + #include <sys/types.h> ++#include <ufs/ufs/ufsmount.h> ++#include <ufs/ufs/dinode.h> ++#include <ufs/ffs/fs.h> ++#include <libufs.h> + #include <isofs/cd9660/iso.h> + #include <glib.h> + #include <libvolume_id.h> +@@ -502,7 +507,8 @@ main (int argc, char **argv) hfp_cdrom_free(cdrom); } @@ -10,3 +23,52 @@ hf_probe_volume_advanced_disc_detect(fd); } else +@@ -555,6 +561,48 @@ main (int argc, char **argv) + + libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children || is_swap, &hfp_error); + ++ if (vid && ! strcmp (vid->type, "ufs")) ++ { ++ struct uufsd ufsdisk; ++ ++ if (ufs_disk_fillout(&ufsdisk, device_file) == 0) ++ { ++ char ufsid[64]; ++ char **ufs_devs = NULL; ++ int num_udis; ++ int i; ++ ++ snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]); ++ libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error); ++ dbus_error_free(&hfp_error); ++ ufs_devs = libhal_manager_find_device_string_match(hfp_ctx, ++ "volume.freebsd.ufsid", ++ ufsid, ++ &num_udis, ++ &hfp_error); ++ dbus_error_free(&hfp_error); ++ for (i = 0; i < num_udis; i++) ++ { ++ if (ufs_devs[i] != NULL && strcmp(ufs_devs[i], hfp_udi)) ++ { ++ gboolean mounted; ++ ++ mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error); ++ dbus_error_free(&hfp_error); ++ if (mounted) ++ { ++ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error); ++ dbus_error_free(&hfp_error); ++ break; ++ } ++ } ++ } ++ if (ufs_devs) ++ libhal_free_string_array(ufs_devs); ++ ufs_disk_close(&ufsdisk); ++ } ++ } ++ + if (has_children) + usage = "partitiontable"; + else if (is_swap) diff --git a/sysutils/hal/files/patch-hald_hf-storage.c b/sysutils/hal/files/patch-hald_hf-storage.c index 605342c36b3b..a699ca827e57 100644 --- a/sysutils/hal/files/patch-hald_hf-storage.c +++ b/sysutils/hal/files/patch-hald_hf-storage.c @@ -1,14 +1,15 @@ ---- hald/freebsd/hf-storage.c.orig 2008-08-10 09:50:10.000000000 -0400 -+++ hald/freebsd/hf-storage.c 2009-05-23 18:52:52.000000000 -0400 -@@ -30,6 +30,7 @@ +--- hald/freebsd/hf-storage.c.orig 2009-05-12 08:24:28.000000000 -0400 ++++ hald/freebsd/hf-storage.c 2009-10-24 02:30:22.000000000 -0400 +@@ -30,6 +30,8 @@ #include <limits.h> #include <inttypes.h> #include <string.h> ++#include <unistd.h> +#include <sys/param.h> #include <sys/types.h> #include <sys/disklabel.h> -@@ -38,6 +39,7 @@ +@@ -38,6 +40,7 @@ #include "hf-storage.h" #include "hf-block.h" @@ -16,7 +17,7 @@ #include "hf-devtree.h" #include "hf-volume.h" #include "hf-util.h" -@@ -64,7 +66,7 @@ typedef struct +@@ -64,7 +67,7 @@ typedef struct static GNode *hf_storage_geom_tree = NULL; static GHashTable *hf_storage_geom_hash = NULL; @@ -25,7 +26,7 @@ static gboolean hf_storage_device_has_addon (HalDevice *device); static void -@@ -104,6 +106,8 @@ hf_storage_class_is_partitionable (const +@@ -104,6 +107,8 @@ hf_storage_class_is_partitionable (const { return (! strcmp(geom_class, "MBR") || ! strcmp(geom_class, "MBREXT") || @@ -34,7 +35,7 @@ ! strcmp(geom_class, "GPT") || ! strcmp(geom_class, "APPLE") || ! strcmp(geom_class, "SUN")); } -@@ -117,6 +121,7 @@ hf_storage_geom_has_partitions (const Ge +@@ -117,6 +122,7 @@ hf_storage_geom_has_partitions (const Ge if (g_node_n_children(node) > 0) return TRUE; @@ -42,7 +43,7 @@ if (hf_storage_class_is_partitionable(geom_obj->class) && g_node_next_sibling(node) != NULL) { -@@ -135,6 +140,7 @@ hf_storage_geom_has_partitions (const Ge +@@ -135,6 +141,7 @@ hf_storage_geom_has_partitions (const Ge return TRUE; } } @@ -50,7 +51,7 @@ return FALSE; } -@@ -294,7 +300,7 @@ hf_storage_device_probe (HalDevice *devi +@@ -294,7 +301,7 @@ hf_storage_device_probe (HalDevice *devi { g_return_if_fail(HAL_IS_DEVICE(device)); @@ -59,7 +60,7 @@ if (hf_runner_run_sync(device, 0, "hald-probe-storage", "HF_HAS_CHILDREN", HF_BOOL_TO_STRING(hf_storage_device_has_partitions(device)), -@@ -403,13 +409,20 @@ hf_storage_parse_conftxt (const char *co +@@ -403,13 +410,49 @@ hf_storage_parse_conftxt (const char *co continue; } @@ -72,17 +73,46 @@ + continue; + } + ++ /* XXX This is a hack, but we need to ignore dynamic labels like ++ * ufsids which are created and destroyed based on whether or not ++ * the actual device is mounted or not. If we don't then strange ++ * things happen in applications like nautilus. ++ */ ++ if ((! strcmp(fields[1], "LABEL") || ++ ! strcmp(fields[1], "BSD")) && ++ ! strncmp(fields[2], "ufsid/", strlen("ufsid/"))) ++ { ++ g_strfreev(fields); ++ continue; ++ } ++ geom_obj = g_new0(Geom_Object, 1); - depth = atoi(fields[0]); geom_obj->class = g_strdup(fields[1]); geom_obj->dev = g_strdup(fields[2]); ++ /* Allow for spaces in label names. */ ++ if (! strcmp(fields[1], "LABEL")) ++ { ++ int j; ++ ++ for (j = 3; g_strv_length(fields) > (j + 2) && ++ strcmp(fields[j + 2], "i"); j++) ++ { ++ char *tmp; ++ ++ tmp = g_strdup_printf("%s %s", geom_obj->dev, fields[j]); ++ g_free(geom_obj->dev); ++ geom_obj->dev = tmp; ++ } ++ } ++ geom_obj->type = -1; /* We use -1 here to denote a missing type. */ - hash = g_str_hash(geom_obj->dev); geom_obj->hash = hash; if (g_strv_length(fields) >= 5) -@@ -433,6 +446,30 @@ hf_storage_parse_conftxt (const char *co +@@ -433,6 +476,30 @@ hf_storage_parse_conftxt (const char *co if (! strcmp (geom_obj->class, "GPT") || ! strcmp (geom_obj->class, "APPLE")) geom_obj->str_type = g_strdup(fields[10]); @@ -113,7 +143,7 @@ else geom_obj->type = atoi(fields[10]); } -@@ -541,15 +578,20 @@ hf_storage_device_rescan_real (HalDevice +@@ -541,17 +608,27 @@ hf_storage_device_rescan_real (HalDevice } static gboolean @@ -131,13 +161,20 @@ - if (hf_is_waiting) - return TRUE; -+ if (strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || ++ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || + (strcmp(type, "CREATE") && strcmp(type, "DESTROY"))) + return FALSE; ++ ++ if (! strcmp(type, "DESTROY")) ++ g_usleep(G_USEC_PER_SEC/2); conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt"); ++ if (! conftxt) ++ return FALSE; new_disks = hf_storage_parse_conftxt(conftxt); -@@ -572,6 +614,7 @@ hf_storage_conftxt_timeout_cb (gpointer + g_free(conftxt); + +@@ -572,6 +649,7 @@ hf_storage_conftxt_timeout_cb (gpointer if (! hf_storage_find_disk(disks, disk->name)) { osspec_probe(); /* catch new disk(s) */ @@ -145,7 +182,7 @@ break; } } -@@ -593,7 +636,10 @@ hf_storage_conftxt_timeout_cb (gpointer +@@ -593,7 +671,10 @@ hf_storage_conftxt_timeout_cb (gpointer device = hf_devtree_find_from_name(hald_get_gdl(), disk->name); if (device && hal_device_has_capability(device, "storage") && ! hf_storage_device_has_addon(device)) @@ -157,7 +194,7 @@ } } else -@@ -601,7 +647,10 @@ hf_storage_conftxt_timeout_cb (gpointer +@@ -601,7 +682,10 @@ hf_storage_conftxt_timeout_cb (gpointer /* disk removed */ device = hf_devtree_find_from_name(hald_get_gdl(), disk->name); if (device && hal_device_has_capability(device, "storage")) @@ -169,7 +206,7 @@ } } } -@@ -610,17 +659,30 @@ hf_storage_conftxt_timeout_cb (gpointer +@@ -610,17 +694,30 @@ hf_storage_conftxt_timeout_cb (gpointer g_slist_free(disks); disks = new_disks; @@ -183,7 +220,7 @@ + if (hf_is_waiting) + return TRUE; + -+ hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", NULL); ++ hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", ""); + return TRUE; } @@ -202,7 +239,7 @@ return; conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt"); -@@ -636,8 +698,10 @@ hf_storage_init_geom (void) +@@ -636,8 +733,10 @@ hf_storage_init_geom (void) static void hf_storage_init (void) { @@ -214,7 +251,7 @@ } void -@@ -720,8 +784,6 @@ hf_storage_device_add (HalDevice *device +@@ -719,8 +818,6 @@ hf_storage_device_add (HalDevice *device { g_return_if_fail(HAL_IS_DEVICE(device)); @@ -223,7 +260,7 @@ if (hf_device_preprobe(device)) { hf_storage_device_probe(device, FALSE); -@@ -739,7 +801,7 @@ hf_storage_get_geoms (const char *devnam +@@ -738,7 +835,7 @@ hf_storage_get_geoms (const char *devnam g_return_val_if_fail(devname != NULL, NULL); @@ -232,7 +269,7 @@ hash = g_str_hash(devname); node = g_node_find(hf_storage_geom_tree, G_PRE_ORDER, G_TRAVERSE_ALL, -@@ -802,3 +864,7 @@ HFHandler hf_storage_handler = { +@@ -801,3 +898,7 @@ HFHandler hf_storage_handler = { .probe = hf_storage_probe, .device_rescan = hf_storage_device_rescan }; diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist index 03a497327d34..0f42ef11f040 100644 --- a/sysutils/hal/pkg-plist +++ b/sysutils/hal/pkg-plist @@ -1,5 +1,4 @@ @unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true -%%MEDIA%%@exec mkdir -p /media bin/hal-device bin/hal-disable-polling bin/hal-find-by-capability @@ -83,6 +82,7 @@ sbin/hald %%DATADIR%%/fdi/policy/10osvendor/10-dockstation.fdi %%DATADIR%%/fdi/policy/10osvendor/10-input-policy.fdi %%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-leds.fdi %%DATADIR%%/fdi/policy/10osvendor/10-mouse-sysmouse.fdi %%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi %%DATADIR%%/fdi/policy/10osvendor/10-rfkill-switch.fdi @@ -94,6 +94,7 @@ sbin/hald %%DATADIR%%/mount-fuse share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy +share/PolicyKit/policy/org.freedesktop.hal.leds.policy share/PolicyKit/policy/org.freedesktop.hal.policy share/PolicyKit/policy/org.freedesktop.hal.power-management.policy share/PolicyKit/policy/org.freedesktop.hal.storage.policy @@ -131,4 +132,3 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy @unexec rmdir /var/cache 2>/dev/null || true @unexec /var/lib/hal 2>/dev/null || true @unexec /var/lib 2>/dev/null || true -%%MEDIA%%@unexec rmdir /media 2>/dev/null || true diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 78684e9dfca4..088c7f640852 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.147 2009/04/07 03:11:00 marcus Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.149 2009/09/25 18:40:01 kwm Exp $ # PORTNAME= nautilus-cd-burner PORTVERSION= 2.24.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,7 +26,7 @@ USE_GETTEXT= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \ - desktopfileutils ltasneededhack eel2 + desktopfileutils ltasneededhack eel2 libgnomeui USE_CDRTOOLS= yes INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool:22 diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure deleted file mode 100644 index e8dbb4a5b891..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-configure +++ /dev/null @@ -1,27 +0,0 @@ ---- configure.orig Thu Jul 22 10:27:35 2004 -+++ configure Thu Jul 22 10:29:32 2004 -@@ -21015,6 +21015,8 @@ - if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -+ ac_check_lib_save_LIBS=$LIBS -+ LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21097,6 +21099,7 @@ - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -+ LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -21104,6 +21107,7 @@ - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -+LIBS="-lintl $LIBS" - - fi - done diff --git a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c deleted file mode 100644 index 71f43178c354..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/list_cddrives.c.orig 2008-01-21 11:14:45.000000000 -0500 -+++ src/list_cddrives.c 2008-01-21 19:48:49.000000000 -0500 -@@ -49,6 +49,7 @@ list_drive_info (NautilusBurnDrive *driv - g_print ("Drive:\n"); - g_print (" name:\t\t\t%s\n", display_name); - g_print (" device:\t\t%s\n", nautilus_burn_drive_get_device (drive)); -+ g_print (" cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive)); - g_print (" door:\t\t\t%s\n", door_is_open ? "open" : "closed"); - g_print (" type:\t\t\t%s\n", type_str); - g_print (" is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE"); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c deleted file mode 100644 index 18183a421d3b..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c +++ /dev/null @@ -1,38 +0,0 @@ ---- src/make-iso.c.orig Sun Nov 19 13:34:29 2006 -+++ src/make-iso.c Sun Nov 19 13:36:03 2006 -@@ -1367,7 +1367,7 @@ get_disc_info (NautilusBurnIso *iso, - &has_data, - &_has_audio); - if (_has_audio) { -- device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive)); -+ device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive)); - - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "cdrdao"); -@@ -1377,7 +1377,7 @@ get_disc_info (NautilusBurnIso *iso, - g_ptr_array_add (argv, NULL); - - } else { -- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive)); -+ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "readcd"); -@@ -1547,7 +1547,7 @@ nautilus_burn_iso_make_from_drive (Nauti - g_ptr_array_add (argv, "--datafile"); - g_ptr_array_add (argv, (char *)filename); - g_ptr_array_add (argv, "--device"); -- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); -+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, "-v"); - g_ptr_array_add (argv, "2"); - g_ptr_array_add (argv, (char *)toc_filename_arg); -@@ -1559,7 +1559,7 @@ nautilus_burn_iso_make_from_drive (Nauti - - filename_arg = g_strdup_printf ("f=%s", filename); - -- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "readcd"); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c deleted file mode 100644 index 2d62886636fa..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c +++ /dev/null @@ -1,48 +0,0 @@ ---- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400 -+++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500 -@@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo - */ - if (drive->priv->device != NULL && - (strcmp (drive->priv->device, target) == 0 || -- strcmp (drive->priv->device, device) == 0)) { -+ strcmp (drive->priv->device, device) == 0 || -+ strcmp (drive->priv->cdrecord_device, device) == 0)) { - ret = nautilus_burn_drive_ref (drive); - break; - } -@@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx, - NautilusBurnDrive *drive; - char **write_speeds = NULL; - char *raw_device = NULL; -+ char *cam_path = NULL; -+ char *cam_device = NULL; - - LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE); - -@@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx, - - LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device); - LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device); -+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device); -+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path); - LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name); - - LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read); -@@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx, - drive->priv->device = raw_device; - } - -+ if (cam_device != NULL) { -+ g_free (drive->priv->device); -+ drive->priv->device = cam_device; -+ } -+ -+ if (cam_path != NULL) { -+ drive->priv->cdrecord_device = cam_path; -+ } else { -+ drive->priv->cdrecord_device = g_strdup (drive->priv->device); -+ } -+ - drive->priv->drive_udi = g_strdup (udi); - drive->priv->write_speeds = hal_parse_write_speeds (write_speeds); - /* we do not own write_speeds so do not free it. */ diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h deleted file mode 100644 index a4da309cbb17..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/nautilus-burn-drive-private.h.orig Sun Nov 19 13:43:24 2006 -+++ src/nautilus-burn-drive-private.h Sun Nov 19 13:43:50 2006 -@@ -34,6 +34,7 @@ struct NautilusBurnDrivePrivate { - - int type; - char *device; -+ char *cdrecord_device; - char *display_name; - int max_speed_write; - int max_speed_read; diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c deleted file mode 100644 index 17a0384464ec..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c +++ /dev/null @@ -1,44 +0,0 @@ ---- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006 -+++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006 -@@ -266,6 +266,25 @@ nautilus_burn_drive_get_device (Nautilus - } - - /** -+ * nautilus_burn_drive_get_cdrecord_device: -+ * @drive: #NautilusBurnDrive -+ * -+ * Get the name of the device associated with the drive suitable for -+ * user with cdrcord. -+ * -+ * Returns: device name. Must be not be freed. -+ * -+ * Since: 2.16 -+ **/ -+const char * -+nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive) -+{ -+ g_return_val_if_fail (drive != NULL, NULL); -+ -+ return drive->priv->cdrecord_device; -+} -+ -+/** - * nautilus_burn_drive_get_drive_type: - * @drive: #NautilusBurnDrive - * -@@ -1021,6 +1044,7 @@ nautilus_burn_drive_finalize (GObject *o - g_free (drive->priv->write_speeds); - g_free (drive->priv->display_name); - g_free (drive->priv->device); -+ g_free (drive->priv->cdrecord_device); - - if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) { - (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object); -@@ -1038,6 +1062,7 @@ nautilus_burn_drive_init (NautilusBurnDr - drive->priv->max_speed_read = 0; - drive->priv->write_speeds = NULL; - drive->priv->device = NULL; -+ drive->priv->cdrecord_device = NULL; - } - - /** diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h deleted file mode 100644 index f033fa3ba295..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/nautilus-burn-drive.h.orig Sun Nov 19 13:37:32 2006 -+++ src/nautilus-burn-drive.h Sun Nov 19 13:37:55 2006 -@@ -127,6 +127,7 @@ gboolean nautilus_burn_driv - int nautilus_burn_drive_get_drive_type (NautilusBurnDrive *drive); - char * nautilus_burn_drive_get_name_for_display (NautilusBurnDrive *drive); - const char * nautilus_burn_drive_get_device (NautilusBurnDrive *drive); -+const char * nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive); - - /* Capabilities */ - gboolean nautilus_burn_drive_can_write (NautilusBurnDrive *drive); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c deleted file mode 100644 index 85f6416abcfe..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c +++ /dev/null @@ -1,29 +0,0 @@ ---- src/nautilus-burn-recorder.c.orig Fri Sep 29 14:18:37 2006 -+++ src/nautilus-burn-recorder.c Mon Nov 20 18:13:24 2006 -@@ -1343,7 +1343,7 @@ nautilus_burn_recorder_write_cdrecord (N - g_ptr_array_add (argv, "cdrdao"); - g_ptr_array_add (argv, "write"); - g_ptr_array_add (argv, "--device"); -- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); -+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, "--speed"); - speed_str = g_strdup_printf ("%d", speed); - g_ptr_array_add (argv, speed_str); -@@ -1375,7 +1375,7 @@ nautilus_burn_recorder_write_cdrecord (N - if (speed != 0) { - g_ptr_array_add (argv, speed_str); - } -- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, dev_str); - if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) { - g_ptr_array_add (argv, "-dummy"); -@@ -1486,7 +1486,7 @@ nautilus_burn_recorder_blank_disc_cdreco - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "cdrecord"); - -- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, dev_str); - g_ptr_array_add (argv, "-v"); - diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c deleted file mode 100644 index 13cfcc6be76e..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/nautilus-cd-burner.c.orig 2008-01-21 11:16:24.000000000 -0500 -+++ src/nautilus-cd-burner.c 2008-04-02 16:48:23.000000000 -0400 -@@ -27,6 +27,8 @@ - - #include "config.h" - -+#include <sys/types.h> -+#include <sys/stat.h> - #include <time.h> - #include <stdio.h> - #include <stdlib.h> diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile index e2e166dc052c..36ce4ee74aeb 100644 --- a/sysutils/pessulus/Makefile +++ b/sysutils/pessulus/Makefile @@ -3,12 +3,11 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports-stable/sysutils/pessulus/Makefile,v 1.1 2009/04/15 21:45:06 kwm Exp $ +# $MCom: ports/sysutils/pessulus/Makefile,v 1.24 2009/09/23 13:07:48 kwm Exp $ # PORTNAME= pessulus -PORTVERSION= 2.26.2 -PORTREVISION= 1 +PORTVERSION= 2.28.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo index d476ca623da0..8ab858b7b6b0 100644 --- a/sysutils/pessulus/distinfo +++ b/sysutils/pessulus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pessulus-2.26.2.tar.bz2) = 255ec0743714b6fc50da796f6bc95009 -SHA256 (gnome2/pessulus-2.26.2.tar.bz2) = 019923718cf92f821a2d2f2067cf121dd91ea2f7c3377324019e6c5ec5928785 -SIZE (gnome2/pessulus-2.26.2.tar.bz2) = 160342 +MD5 (gnome2/pessulus-2.28.0.tar.bz2) = 792485aac615a8f36f7d77bc06a40036 +SHA256 (gnome2/pessulus-2.28.0.tar.bz2) = f6efb78f234f8fa5c2d1310e13340ec46d49c22d6de710daeb5136e75ff1a012 +SIZE (gnome2/pessulus-2.28.0.tar.bz2) = 178550 diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist index 78aa89faa10e..f8034c268616 100644 --- a/sysutils/pessulus/pkg-plist +++ b/sysutils/pessulus/pkg-plist @@ -55,12 +55,14 @@ share/icons/hicolor/scalable/apps/pessulus.svg %%PORTDOCS%%%%DOCSDIR%%/TODO share/locale/ar/LC_MESSAGES/pessulus.mo share/locale/as/LC_MESSAGES/pessulus.mo +share/locale/ast/LC_MESSAGES/pessulus.mo share/locale/bal/LC_MESSAGES/pessulus.mo share/locale/be/LC_MESSAGES/pessulus.mo share/locale/be@latin/LC_MESSAGES/pessulus.mo share/locale/bg/LC_MESSAGES/pessulus.mo share/locale/bn/LC_MESSAGES/pessulus.mo share/locale/bn_IN/LC_MESSAGES/pessulus.mo +share/locale/br/LC_MESSAGES/pessulus.mo share/locale/ca/LC_MESSAGES/pessulus.mo share/locale/ca@valencia/LC_MESSAGES/pessulus.mo share/locale/crh/LC_MESSAGES/pessulus.mo @@ -91,11 +93,13 @@ share/locale/kn/LC_MESSAGES/pessulus.mo share/locale/ku/LC_MESSAGES/pessulus.mo share/locale/lt/LC_MESSAGES/pessulus.mo share/locale/lv/LC_MESSAGES/pessulus.mo +share/locale/mai/LC_MESSAGES/pessulus.mo share/locale/mk/LC_MESSAGES/pessulus.mo share/locale/ml/LC_MESSAGES/pessulus.mo share/locale/mn/LC_MESSAGES/pessulus.mo share/locale/mr/LC_MESSAGES/pessulus.mo share/locale/nb/LC_MESSAGES/pessulus.mo +share/locale/nds/LC_MESSAGES/pessulus.mo share/locale/ne/LC_MESSAGES/pessulus.mo share/locale/nl/LC_MESSAGES/pessulus.mo share/locale/nn/LC_MESSAGES/pessulus.mo @@ -124,8 +128,8 @@ share/locale/vi/LC_MESSAGES/pessulus.mo share/locale/zh_CN/LC_MESSAGES/pessulus.mo share/locale/zh_HK/LC_MESSAGES/pessulus.mo share/locale/zh_TW/LC_MESSAGES/pessulus.mo -%%DATADIR%%/glade/pessulus.glade -@dirrm %%DATADIR%%/glade +%%DATADIR%%/ui/pessulus.ui +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/Pessulus @@ -142,8 +146,12 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @@ -152,11 +160,15 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/locale/crh @dirrmtry share/locale/ca@valencia/LC_MESSAGES @dirrmtry share/locale/ca@valencia +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin @dirrmtry share/locale/bal/LC_MESSAGES @dirrmtry share/locale/bal +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile new file mode 100644 index 000000000000..0b525ec44a54 --- /dev/null +++ b/sysutils/polkit-gnome/Makefile @@ -0,0 +1,32 @@ +# New ports collection makefile for: polkit-gnome +# Date Created: 30 Juli 2009 +# Whom: Koop Mast<kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.5 2009/11/24 02:22:19 marcus Exp $ +# + +PORTNAME= polkit-gnome +PORTVERSION= 0.95 +CATEGORIES= sysutils gnome +MASTER_SITES= http://hal.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GNOME frontend to the PolicKit framework + +BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 +LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit +RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20 + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GETTEXT= yes +USE_GNOME= gnomehack gnomeprefix gtk20 intlhack +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +CONFIGURE_ARGS= --disable-gtk-doc \ + --localstatedir=/var +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/sysutils/polkit-gnome/distinfo b/sysutils/polkit-gnome/distinfo new file mode 100644 index 000000000000..e43e18c8caaa --- /dev/null +++ b/sysutils/polkit-gnome/distinfo @@ -0,0 +1,3 @@ +MD5 (polkit-gnome-0.95.tar.bz2) = e52555258ebae5d3f080b7b4cd6aedd4 +SHA256 (polkit-gnome-0.95.tar.bz2) = 3ee6bfe7475856f2287736d7174bbe4199ca32d803e23e1ce653434e1ba56c06 +SIZE (polkit-gnome-0.95.tar.bz2) = 361305 diff --git a/sysutils/polkit-gnome/pkg-descr b/sysutils/polkit-gnome/pkg-descr new file mode 100644 index 000000000000..57dad7b5d29a --- /dev/null +++ b/sysutils/polkit-gnome/pkg-descr @@ -0,0 +1,5 @@ +PolicyKit is a framework for defining policy for system-wide components and +for desktop pieces to configure it. PolicyKit-gnome is a GTK+/GNOME frontend +for that framework. + +WWW: http://www.freedesktop.org/wiki/Software/PolicyKit diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist new file mode 100644 index 000000000000..bfa353ff1107 --- /dev/null +++ b/sysutils/polkit-gnome/pkg-plist @@ -0,0 +1,66 @@ +etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop +include/polkit-gtk-1/polkitgtk/polkitgtk.h +include/polkit-gtk-1/polkitgtk/polkitgtktypes.h +include/polkit-gtk-1/polkitgtk/polkitlockbutton.h +lib/girepository-1.0/PolkitGtk-1.0.typelib +lib/libpolkit-gtk-1.a +lib/libpolkit-gtk-1.la +lib/libpolkit-gtk-1.so +lib/libpolkit-gtk-1.so.0 +libexec/polkit-gnome-authentication-agent-1 +libdata/pkgconfig/polkit-gtk-1.pc +share/gir-1.0/PolkitGtk-1.0.gir +share/locale/ar/LC_MESSAGES/polkit-gnome-1.mo +share/locale/be/LC_MESSAGES/polkit-gnome-1.mo +share/locale/ca/LC_MESSAGES/polkit-gnome-1.mo +share/locale/cs/LC_MESSAGES/polkit-gnome-1.mo +share/locale/da/LC_MESSAGES/polkit-gnome-1.mo +share/locale/de/LC_MESSAGES/polkit-gnome-1.mo +share/locale/el/LC_MESSAGES/polkit-gnome-1.mo +share/locale/en_GB/LC_MESSAGES/polkit-gnome-1.mo +share/locale/es/LC_MESSAGES/polkit-gnome-1.mo +share/locale/eu/LC_MESSAGES/polkit-gnome-1.mo +share/locale/fi/LC_MESSAGES/polkit-gnome-1.mo +share/locale/fr/LC_MESSAGES/polkit-gnome-1.mo +share/locale/gl/LC_MESSAGES/polkit-gnome-1.mo +share/locale/gu/LC_MESSAGES/polkit-gnome-1.mo +share/locale/he/LC_MESSAGES/polkit-gnome-1.mo +share/locale/hu/LC_MESSAGES/polkit-gnome-1.mo +share/locale/it/LC_MESSAGES/polkit-gnome-1.mo +share/locale/ja/LC_MESSAGES/polkit-gnome-1.mo +share/locale/lt/LC_MESSAGES/polkit-gnome-1.mo +share/locale/nb/LC_MESSAGES/polkit-gnome-1.mo +share/locale/pa/LC_MESSAGES/polkit-gnome-1.mo +share/locale/pl/LC_MESSAGES/polkit-gnome-1.mo +share/locale/pt/LC_MESSAGES/polkit-gnome-1.mo +share/locale/pt_BR/LC_MESSAGES/polkit-gnome-1.mo +share/locale/ru/LC_MESSAGES/polkit-gnome-1.mo +share/locale/sk/LC_MESSAGES/polkit-gnome-1.mo +share/locale/sv/LC_MESSAGES/polkit-gnome-1.mo +share/locale/zh_CN/LC_MESSAGES/polkit-gnome-1.mo +share/locale/zh_HK/LC_MESSAGES/polkit-gnome-1.mo +share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be +@dirrm include/polkit-gtk-1/polkitgtk +@dirrm include/polkit-gtk-1 diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile new file mode 100644 index 000000000000..67cddeda6203 --- /dev/null +++ b/sysutils/polkit/Makefile @@ -0,0 +1,66 @@ +# New ports collection makefile for: polkit +# Date Created: 30 Juli 2009 +# Whom: Koop Mast<kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/polkit/Makefile,v 1.5 2009/11/26 14:22:58 mezz Exp $ +# + +PORTNAME= polkit +PORTVERSION= 0.95 +PORTREVISION= 1 +CATEGORIES= sysutils gnome +MASTER_SITES= http://hal.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Framework for controlling access to system-wide components + +BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= eggdbus-1.0:${PORTSDIR}/devel/eggdbus \ + expat.6:${PORTSDIR}/textproc/expat2 +RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection + +USE_GNOME= gnomehack glib20 intlhack +USE_GMAKE= yes +USE_GETTEXT= yes +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +CONFIGURE_ARGS= --disable-gtk-doc \ + --with-authfw=pam \ + --with-pam-include=system \ + --with-os-type=freebsd \ + --enable-introspection \ + --localstatedir=/var \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + GTKDOC="false" + +.if defined(NO_INSTALL_MANPAGES) +CONFIGURE_ARGS+=--disable-man-pages +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl + +MAN1= pkaction.1 pkcheck.1 pkexec.1 +MAN8= pklocalauthority.8 polkit.8 polkitd.8 +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' \ + ${WRKSRC}/docs/man/pkexec.xml \ + ${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in + +post-install: + ${MKDIR} ${PREFIX}/etc/dbus-1/system.d/ + if [ ! -f ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ]; then \ + ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \ + ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; \ + fi + ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \ + ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist +.if !defined(PACKAGE_BUILDING) + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif + +.include <bsd.port.mk> diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo new file mode 100644 index 000000000000..b37677cf92cf --- /dev/null +++ b/sysutils/polkit/distinfo @@ -0,0 +1,3 @@ +MD5 (polkit-0.95.tar.gz) = 10971f5d334550025897b02d779fddd1 +SHA256 (polkit-0.95.tar.gz) = b484248ed8fa7419170cf98d7cba51d68290783c3c7cac7c5dab7605dfe3c79c +SIZE (polkit-0.95.tar.gz) = 1025805 diff --git a/sysutils/polkit/files/patch-data_Makefile.in b/sysutils/polkit/files/patch-data_Makefile.in new file mode 100644 index 000000000000..c2895461f523 --- /dev/null +++ b/sysutils/polkit/files/patch-data_Makefile.in @@ -0,0 +1,11 @@ +--- data/Makefile.in.orig 2009-08-01 16:02:38.000000000 +0200 ++++ data/Makefile.in 2009-08-01 16:05:13.000000000 +0200 +@@ -471,7 +471,7 @@ + + info-am: + +-install-data-am: install-dbusconfDATA install-pamDATA \ ++install-data-am: install-pamDATA \ + install-pkgconfigDATA install-serviceDATA + + install-dvi: install-dvi-am diff --git a/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in b/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in new file mode 100644 index 000000000000..b3bb5b72105b --- /dev/null +++ b/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in @@ -0,0 +1,15 @@ +--- src/polkitbackend/Makefile.in.orig 2009-08-01 11:56:22.000000000 +0200 ++++ src/polkitbackend/Makefile.in 2009-08-01 11:57:18.000000000 +0200 +@@ -852,7 +852,11 @@ clean-local : + + install-exec-hook: + mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1 +- mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d} ++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d ++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/20-org.d ++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/30-site.d ++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/50-local.d ++ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/90-mandatory.d + -chmod 700 $(DESTDIR)$(localstatedir)/lib/polkit-1 + mkdir -p $(DESTDIR)$(libdir)/polkit-1/extensions + diff --git a/sysutils/polkit/pkg-descr b/sysutils/polkit/pkg-descr new file mode 100644 index 000000000000..9746a6470c1d --- /dev/null +++ b/sysutils/polkit/pkg-descr @@ -0,0 +1,4 @@ +PolicyKit is a framework for defining policy for system-wide components and +for desktop pieces to configure it. It is used by HAL. + +WWW: http://www.freedesktop.org/wiki/Software/PolicyKit diff --git a/sysutils/polkit/pkg-install b/sysutils/polkit/pkg-install new file mode 100644 index 000000000000..93efeea2297b --- /dev/null +++ b/sysutils/polkit/pkg-install @@ -0,0 +1,12 @@ +#!/bin/sh + +case $2 in +POST-INSTALL) + mkdir -p /var/lib/polkit-1 + for i in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d; do + mkdir -p /var/lib/polkit-1/${i} + done + chmod 0700 /var/lib/polkit-1 + exit 0 + ;; +esac diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist new file mode 100644 index 000000000000..2685cac96f6f --- /dev/null +++ b/sysutils/polkit/pkg-plist @@ -0,0 +1,82 @@ +bin/pkaction +bin/pkcheck +bin/pkexec +@unexec if cmp -s %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist; then rm -f %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; fi +etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist +@exec [ -f %B/org.freedesktop.PolicyKit1.conf ] || cp %B/%f %B/org.freedesktop.PolicyKit1.conf +etc/pam.d/polkit-1 +etc/polkit-1/localauthority.conf.d/50-localauthority.conf +etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf +include/polkit-1/polkit/polkit.h +include/polkit-1/polkit/polkitactiondescription.h +include/polkit-1/polkit/polkitauthorityfeatures.h +include/polkit-1/polkit/polkitauthority.h +include/polkit-1/polkit/polkitauthorizationresult.h +include/polkit-1/polkit/polkitcheckauthorizationflags.h +include/polkit-1/polkit/polkitdetails.h +include/polkit-1/polkit/polkitenumtypes.h +include/polkit-1/polkit/polkiterror.h +include/polkit-1/polkit/polkitidentity.h +include/polkit-1/polkit/polkitimplicitauthorization.h +include/polkit-1/polkit/polkitprivate.h +include/polkit-1/polkit/polkitsubject.h +include/polkit-1/polkit/polkitsystembusname.h +include/polkit-1/polkit/polkittemporaryauthorization.h +include/polkit-1/polkit/polkittypes.h +include/polkit-1/polkit/polkitunixgroup.h +include/polkit-1/polkit/polkitunixprocess.h +include/polkit-1/polkit/polkitunixsession.h +include/polkit-1/polkit/polkitunixuser.h +include/polkit-1/polkitagent/polkitagent.h +include/polkit-1/polkitagent/polkitagentlistener.h +include/polkit-1/polkitagent/polkitagentsession.h +include/polkit-1/polkitagent/polkitagenttypes.h +include/polkit-1/polkitbackend/polkitbackend.h +include/polkit-1/polkitbackend/polkitbackendactionlookup.h +include/polkit-1/polkitbackend/polkitbackendactionpool.h +include/polkit-1/polkitbackend/polkitbackendauthority.h +include/polkit-1/polkitbackend/polkitbackendconfigsource.h +include/polkit-1/polkitbackend/polkitbackendinteractiveauthority.h +include/polkit-1/polkitbackend/polkitbackendlocalauthority.h +include/polkit-1/polkitbackend/polkitbackendlocalauthorizationstore.h +include/polkit-1/polkitbackend/polkitbackendsessionmonitor.h +include/polkit-1/polkitbackend/polkitbackendtypes.h +lib/girepository-1.0/Polkit-1.0.typelib +lib/libpolkit-agent-1.a +lib/libpolkit-agent-1.la +lib/libpolkit-agent-1.so +lib/libpolkit-agent-1.so.0 +lib/libpolkit-backend-1.a +lib/libpolkit-backend-1.la +lib/libpolkit-backend-1.so +lib/libpolkit-backend-1.so.0 +lib/libpolkit-gobject-1.a +lib/libpolkit-gobject-1.la +lib/libpolkit-gobject-1.so +lib/libpolkit-gobject-1.so.0 +lib/polkit-1/extensions/libnullbackend.a +lib/polkit-1/extensions/libnullbackend.la +lib/polkit-1/extensions/libnullbackend.so +lib/polkit-1/extensions/libpkexec-action-lookup.a +lib/polkit-1/extensions/libpkexec-action-lookup.la +lib/polkit-1/extensions/libpkexec-action-lookup.so +libdata/pkgconfig/polkit-agent-1.pc +libdata/pkgconfig/polkit-backend-1.pc +libdata/pkgconfig/polkit-gobject-1.pc +libexec/polkit-agent-helper-1 +libexec/polkitd +share/dbus-1/system-services/org.freedesktop.PolicyKit1.service +share/gir-1.0/Polkit-1.0.gir +share/locale/da/LC_MESSAGES/polkit-1.mo +share/polkit-1/actions/org.freedesktop.policykit.policy +@dirrmtry share/polkit-1/actions +@dirrmtry share/polkit-1 +@dirrm lib/polkit-1/extensions +@dirrm lib/polkit-1 +@dirrm include/polkit-1/polkitbackend +@dirrm include/polkit-1/polkitagent +@dirrm include/polkit-1/polkit +@dirrm include/polkit-1 +@dirrm etc/polkit-1/nullbackend.conf.d +@dirrm etc/polkit-1/localauthority.conf.d +@dirrm etc/polkit-1 diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 415007b1ed88..d38d86a52c39 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/system-tools-backends/Makefile,v 1.1 2009/04/16 08:56:17 kwm Exp $ +# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.54 2009/10/11 19:13:30 marcus Exp $ # PORTNAME= system-tools-backends -PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTVERSION= 2.8.2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +17,7 @@ COMMENT= Backend system admin scripts for gnome-system-tools BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - polkit-dbus.2:${PORTSDIR}/sysutils/policykit + polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus USE_BZIP2= yes diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo index 43e2f1c0fc1b..d5b28d398ae7 100644 --- a/sysutils/system-tools-backends/distinfo +++ b/sysutils/system-tools-backends/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/system-tools-backends-2.6.1.tar.bz2) = c82a9d305c3a1bf924bba6b1bced3e86 -SHA256 (gnome2/system-tools-backends-2.6.1.tar.bz2) = 7f56dd08cf5425218b697d5db82e6ce03aff4f7b57f58d3053f0a7af632b3747 -SIZE (gnome2/system-tools-backends-2.6.1.tar.bz2) = 441586 +MD5 (gnome2/system-tools-backends-2.8.2.tar.bz2) = 689c79b36d2929b264c29ff39db4b10b +SHA256 (gnome2/system-tools-backends-2.8.2.tar.bz2) = bbbef8a0d160c6dfd44d60a5026a6c51ac97818d18febcf716e218983af4bf6c +SIZE (gnome2/system-tools-backends-2.8.2.tar.bz2) = 458579 diff --git a/sysutils/system-tools-backends/files/patch-Users_Users.pm b/sysutils/system-tools-backends/files/patch-Users_Users.pm index 5e2598972c24..909f28dff134 100644 --- a/sysutils/system-tools-backends/files/patch-Users_Users.pm +++ b/sysutils/system-tools-backends/files/patch-Users_Users.pm @@ -1,42 +1,42 @@ ---- Users/Users.pm.orig Thu Oct 5 09:27:21 2006 -+++ Users/Users.pm Sun Apr 22 23:05:41 2007 -@@ -458,7 +458,7 @@ +--- Users/Users.pm.orig 2009-09-28 05:49:10.000000000 -0400 ++++ Users/Users.pm 2009-10-11 15:09:31.000000000 -0400 +@@ -443,7 +443,7 @@ sub del_user if ($Utils::Backend::tool{"system"} eq "FreeBSD") { -- $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' "; -+ $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' -r "; +- @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN]); ++ @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN], "-r"); } else { -@@ -538,10 +538,10 @@ - { +@@ -551,9 +551,7 @@ sub add_user my $pwdpipe; my $home; -+ my $user; - # FreeBSD doesn't create the home directory $home = $$user[$HOME]; -- &Utils::File::run ("$tool_mkdir -p $home"); -+ $user = $$user[$LOGIN]; +- &Utils::File::run ($tool_mkdir, "-p", $home); $command = "$cmd_pw useradd " . " -n \'" . $$user[$LOGIN] . "\'" . -@@ -549,11 +549,12 @@ +@@ -561,7 +559,7 @@ sub add_user " -d \'" . $$user[$HOME] . "\'" . " -g \'" . $$user[$GID] . "\'" . " -s \'" . $$user[$SHELL] . "\'" . - " -H 0"; # pw(8) reads password from STDIN + " -m -h 0"; # pw(8) reads password from STDIN + # @command = ($cmd_pw, "useradd", "-n", $$user[$LOGIN], + # "-u", $$user[$UID], +@@ -573,6 +571,7 @@ sub add_user $pwdpipe = &Utils::File::run_pipe_write ($command); print $pwdpipe $$user[$PASSWD]; &Utils::File::close_file ($pwdpipe); -+ &Utils::File::run ("chown -R $user $home"); ++ &Utils::File::run ("chown -R " . $$user[$LOGIN] . " $home"); } elsif ($Utils::Backend::tool{"system"} eq "SunOS") { -@@ -629,7 +630,7 @@ +@@ -651,7 +650,7 @@ sub change_user " -d \'" . $$new_user[$HOME] . "\'" . " -g \'" . $$new_user[$GID] . "\'" . " -s \'" . $$new_user[$SHELL] . "\'" . diff --git a/sysutils/system-tools-backends/files/patch-policykit b/sysutils/system-tools-backends/files/patch-policykit deleted file mode 100644 index aaac9aa69979..000000000000 --- a/sysutils/system-tools-backends/files/patch-policykit +++ /dev/null @@ -1,46 +0,0 @@ -Allow root to send messages to all the system tools backends, so they -work even when CVE-2008-4311 has been fixed. - -Also disallow normal user access by destination, not by interface (fd.o -#18961). - -Original patch by Simon McVittie, updated for the PolicyKit version by -Josselin Mouette with advice from Colin Walters. - -Index: system-tools-backends-2.6.0/system-tools-backends.conf -=================================================================== ---- system-tools-backends.conf 2008-03-09 14:21:45.000000000 +0100 -+++ system-tools-backends.conf 2009-03-11 22:21:09.145371060 +0100 -@@ -22,11 +22,7 @@ - <allow send_interface="org.freedesktop.SystemToolsBackends.Platform" send_member="getPlatform"/> - --> - -- <!-- configuration modules can't be accessed directly... --> -- <deny send_interface="org.freedesktop.SystemToolsBackends"/> -- <deny send_interface="org.freedesktop.SystemToolsBackends.Platform"/> -- -- <!-- ...so petitions go through the dispatcher instead --> -+ <!-- Only allow talking to the dispatcher --> - <allow send_destination="org.freedesktop.SystemToolsBackends"/> - </policy> - -@@ -49,7 +45,17 @@ - - <!-- be able to speak to configuration modules, - so any message to them has to go through the dispatcher --> -- <allow send_interface="org.freedesktop.SystemToolsBackends"/> -- <allow send_interface="org.freedesktop.SystemToolsBackends.Platform"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.Platform"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.GroupsConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.HostsConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.IfacesConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.NFSConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.NTPConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.ServicesConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.SMBConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.TimeConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.UserConfig"/> -+ <allow send_destination="org.freedesktop.SystemToolsBackends.UsersConfig"/> - </policy> - </busconfig> diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index 26aca35ca483..b300daf2d77c 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -1,7 +1,6 @@ -bin/system-tools-backends -etc/dbus-1/system.d/system-tools-backends.conf +etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf +sbin/system-tools-backends libdata/pkgconfig/system-tools-backends-2.0.pc -share/PolicyKit/policy/system-tools-backends.policy share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.IfacesConfig.service @@ -14,23 +13,47 @@ share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.serv share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service +share/locale/ar/LC_MESSAGES/system-tools-backends.mo share/locale/bg/LC_MESSAGES/system-tools-backends.mo +share/locale/bn_IN/LC_MESSAGES/system-tools-backends.mo share/locale/ca/LC_MESSAGES/system-tools-backends.mo +share/locale/cs/LC_MESSAGES/system-tools-backends.mo share/locale/da/LC_MESSAGES/system-tools-backends.mo share/locale/de/LC_MESSAGES/system-tools-backends.mo share/locale/el/LC_MESSAGES/system-tools-backends.mo +share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo share/locale/es/LC_MESSAGES/system-tools-backends.mo +share/locale/et/LC_MESSAGES/system-tools-backends.mo +share/locale/eu/LC_MESSAGES/system-tools-backends.mo share/locale/fi/LC_MESSAGES/system-tools-backends.mo share/locale/fr/LC_MESSAGES/system-tools-backends.mo +share/locale/gl/LC_MESSAGES/system-tools-backends.mo +share/locale/gu/LC_MESSAGES/system-tools-backends.mo share/locale/he/LC_MESSAGES/system-tools-backends.mo +share/locale/hi/LC_MESSAGES/system-tools-backends.mo share/locale/hu/LC_MESSAGES/system-tools-backends.mo share/locale/it/LC_MESSAGES/system-tools-backends.mo +share/locale/ja/LC_MESSAGES/system-tools-backends.mo +share/locale/kn/LC_MESSAGES/system-tools-backends.mo +share/locale/or/LC_MESSAGES/system-tools-backends.mo +share/locale/pa/LC_MESSAGES/system-tools-backends.mo share/locale/pl/LC_MESSAGES/system-tools-backends.mo +share/locale/pt/LC_MESSAGES/system-tools-backends.mo share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo share/locale/ro/LC_MESSAGES/system-tools-backends.mo share/locale/sl/LC_MESSAGES/system-tools-backends.mo +share/locale/sr/LC_MESSAGES/system-tools-backends.mo +share/locale/sr@latin/LC_MESSAGES/system-tools-backends.mo share/locale/sv/LC_MESSAGES/system-tools-backends.mo +share/locale/ta/LC_MESSAGES/system-tools-backends.mo +share/locale/te/LC_MESSAGES/system-tools-backends.mo +share/locale/th/LC_MESSAGES/system-tools-backends.mo +share/locale/tr/LC_MESSAGES/system-tools-backends.mo +share/locale/uk/LC_MESSAGES/system-tools-backends.mo share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo +share/locale/zh_HK/LC_MESSAGES/system-tools-backends.mo +share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo +share/polkit-1/actions/org.freedesktop.SystemToolsBackends.policy share/system-tools-backends-2.0/files/general_gprs_chatscript share/system-tools-backends-2.0/files/general_isdn_ppp_options share/system-tools-backends-2.0/files/general_pppoe_ppp_options @@ -77,17 +100,33 @@ share/system-tools-backends-2.0/scripts/Utils/XML.pm @dirrm share/system-tools-backends-2.0/scripts @dirrm share/system-tools-backends-2.0/files @dirrm share/system-tools-backends-2.0 +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrmtry share/locale/zh_CN/LC_MESSAGES @dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/sl/LC_MESSAGES @dirrmtry share/locale/sl @dirrmtry share/locale/ro/LC_MESSAGES @dirrmtry share/locale/ro @dirrmtry share/locale/pl/LC_MESSAGES @dirrmtry share/locale/pl +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl @dirrmtry share/locale/fi/LC_MESSAGES @dirrmtry share/locale/fi @dirrmtry share/locale/el/LC_MESSAGES @dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrmtry share/locale/ca/LC_MESSAGES @dirrmtry share/locale/ca +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile index 1a86865beb54..74af4cfd03b4 100644 --- a/sysutils/tracker-client/Makefile +++ b/sysutils/tracker-client/Makefile @@ -3,14 +3,14 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/tracker-client/Makefile,v 1.6 2009/02/27 00:23:22 marcus Exp $ +# $MCom: ports/sysutils/tracker-client/Makefile,v 1.10 2009/10/11 11:11:33 kwm Exp $ # PORTNAME= tracker -PORTVERSION= 0.6.6 -PORTREVISION= 11 +PORTVERSION= 0.6.95 +PORTREVISION= 1 CATEGORIES= sysutils gnome -MASTER_SITES= http://www.gnome.org/~jamiemcc/tracker/ +MASTER_SITES= GNOME PKGNAMESUFFIX?= -client MAINTAINER= gnome@FreeBSD.org @@ -23,7 +23,12 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ wv-1.2.3:${PORTSDIR}/textproc/wv \ gmime-2.0.4:${PORTSDIR}/mail/gmime2 \ qdbm.14:${PORTSDIR}/databases/qdbm \ - exempi.3:${PORTSDIR}/textproc/exempi + exempi.3:${PORTSDIR}/textproc/exempi \ + hal.1:${PORTSDIR}/sysutils/hal \ + totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ + raptor.2:${PORTSDIR}/textproc/raptor \ + ogg.6:${PORTSDIR}/audio/libogg \ + iptcdata.3:${PORTSDIR}/graphics/libiptcdata RUN_DEPENDS= xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \ o3totxt:${PORTSDIR}/converters/o3read \ pdftotext:${PORTSDIR}/graphics/poppler-utils \ @@ -33,7 +38,7 @@ USE_BZIP2= yes USE_FAM= yes WANT_FAM_SYSTEM=gamin INSTALLS_ICONS= yes -USE_GNOME= gnomehack gnomeprefix ltasneededhack intltool +USE_GNOME= gnomehack gnomeprefix ltasneededhack intltool ltverhack USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes @@ -41,11 +46,12 @@ USE_GSTREAMER= core INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-video-extractor=gstreamer \ --enable-file-monitoring=fam \ --with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \ - --enable-external-qdbm + --enable-external-qdbm --enable-libexif --enable-libvorbis \ + --enable-libiptcdata .include <bsd.port.pre.mk> @@ -59,7 +65,7 @@ INSTALL_WRKSRC= ${WRKSRC}/src/tracker-applet EXTRA_WRKSRC= src/tracker-preferences src/tracker-search-tool RUN_DEPENDS+= ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet USE_GNOME+= gnomedesktop libgsf -MAN1+= tracker-applet.1 tracker-search-tool.1 tracker-preferences.1 +MAN1+= tracker-applet.1 tracker-search-tool.1 tracker-preferences.1 CONFIGURE_ARGS+=--enable-deskbar-applet \ --with-deskbar-applet-handler-dir=${LOCALBASE}/lib/deskbar-applet/handlers . endif @@ -71,14 +77,17 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} . endif .else MAN1+= tracker-extract.1 tracker-files.1 \ + tracker-info.1 \ tracker-meta-folder.1 tracker-query.1 \ - tracker-search.1 tracker-stats.1 \ - tracker-status.1 tracker-tag.1 tracker-thumbnailer.1 trackerd.1 + tracker-search.1 tracker-services.1 tracker-stats.1 \ + tracker-status.1 tracker-tag.1 tracker-thumbnailer.1 tracker-unique.1 trackerd.1 + MAN5+= tracker.cfg.5 -MAN7+= tracker-services.7 CONFIGURE_ARGS+= --disable-libtrackergtk --disable-gui \ --disable-trackerapplet --disable-gsf \ - --disable-preferences + --disable-preferences --disable-deskbar-applet \ + --disable-tracker-applet --disable-tracker-preferences \ + --disable-libgsf .endif post-patch: @@ -104,7 +113,7 @@ post-install: @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) . endfor . for man in ${MAN1} - @(cd ${WRKSRC} && ${INSTALL_DATA} docs/${man} ${PREFIX}/man/man1/${man}) + @(cd ${WRKSRC} && ${INSTALL_DATA} docs/manpages/${man} ${PREFIX}/man/man1/${man}) . endfor .endif diff --git a/sysutils/tracker-client/distinfo b/sysutils/tracker-client/distinfo index 435cb9e83cb9..2848e25a3864 100644 --- a/sysutils/tracker-client/distinfo +++ b/sysutils/tracker-client/distinfo @@ -1,3 +1,3 @@ -MD5 (tracker-0.6.6.tar.bz2) = 0845998f8f0d715b3f1b306d59fdae4d -SHA256 (tracker-0.6.6.tar.bz2) = ffa374989db365f388edf0a52f901ae3becfa7a25a7e1b2dd76832eff9606a97 -SIZE (tracker-0.6.6.tar.bz2) = 901549 +MD5 (tracker-0.6.95.tar.bz2) = a4edc8aa830070bd3f1d80a7df07c80c +SHA256 (tracker-0.6.95.tar.bz2) = 0fe42353117c62ccc9de3b3c9c11acf707a0702d30cd24b8d1cd1e2581dec339 +SIZE (tracker-0.6.95.tar.bz2) = 1399996 diff --git a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c new file mode 100644 index 000000000000..d2467b17cd3f --- /dev/null +++ b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c @@ -0,0 +1,12 @@ +--- src/libtracker-common/tracker-albumart.c.orig 2009-08-08 17:37:48.000000000 +0000 ++++ src/libtracker-common/tracker-albumart.c 2009-08-08 17:38:14.000000000 +0000 +@@ -81,7 +81,8 @@ + return retval; + } + +-#ifndef HAVE_STRCASESTR ++#if 0 ++// #ifndef HAVE_STRCASESTR + + static gchar * + strcasestr (const gchar *haystack, diff --git a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c new file mode 100644 index 000000000000..c6f07b336e52 --- /dev/null +++ b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c @@ -0,0 +1,13 @@ +--- src/libtracker-common/tracker-type-utils.c.orig 2009-08-08 17:29:36.000000000 +0000 ++++ src/libtracker-common/tracker-type-utils.c 2009-08-08 17:30:09.000000000 +0000 +@@ -531,8 +531,8 @@ + /* mktime() always assumes that "tm" is in locale time but we + * want to keep control on time, so we go to UTC + */ +- t = mktime (&tm); +- t -= timezone; ++ ++ t = timegm (&tm); + + if (*date_string == '+' || + *date_string == '-') { diff --git a/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in b/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in index df2beaaac844..a5d3b6c1788b 100644 --- a/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in +++ b/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in @@ -1,19 +1,19 @@ ---- src/libtracker-gtk/Makefile.in.orig 2008-03-30 15:48:54.539689924 -0400 -+++ src/libtracker-gtk/Makefile.in 2008-03-30 15:50:09.289800343 -0400 -@@ -56,7 +56,6 @@ +--- src/libtracker-gtk/Makefile.in.orig 2009-08-08 17:07:00.000000000 +0000 ++++ src/libtracker-gtk/Makefile.in 2009-08-08 17:09:07.000000000 +0000 +@@ -66,7 +66,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libtracker_gtk_la_DEPENDENCIES = \ - $(top_builddir)/src/libtracker/libtrackerclient.la \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libtracker_gtk_la_OBJECTS = tracker-utils.lo tracker-ui.lo \ tracker-metadata-tile.lo tracker-tag-bar.lo \ -@@ -316,7 +315,7 @@ +@@ -355,7 +354,7 @@ tracker-keyword-store.c libtracker_gtk_la_LIBADD = \ -- $(top_builddir)/src/libtracker/libtrackerclient.la \ -+ -ltrackerclient \ - $(LIBTRACKERGTK_LIBS) +- $(top_builddir)/src/libtracker/libtrackerclient.la \ ++ -ltrackerclient \ + $(LIBTRACKERGTK_LIBS) \ + $(GCOV_LIBS) - libtracker_gtk_la_LDFLAGS = -version-info 0:0:0 diff --git a/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in b/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in deleted file mode 100644 index ee9e1903a1a4..000000000000 --- a/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/text-filters/Makefile.in.orig 2008-03-03 13:14:00.000000000 +0900 -+++ ./src/text-filters/Makefile.in 2008-08-22 21:40:00.000000000 +0900 -@@ -266,7 +266,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = ooo_converter -+#SUBDIRS = ooo_converter - all: all-recursive - - .SUFFIXES: diff --git a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in index f964d78ce7f3..e00d83cf4e40 100644 --- a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in +++ b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in @@ -1,19 +1,22 @@ ---- src/tracker-applet/Makefile.in.orig 2008-03-30 16:20:32.345933535 -0400 -+++ src/tracker-applet/Makefile.in 2008-03-30 16:20:52.759690870 -0400 -@@ -55,7 +55,6 @@ +--- src/tracker-applet/Makefile.in.orig 2009-08-08 17:11:05.000000000 +0000 ++++ src/tracker-applet/Makefile.in 2009-08-08 17:12:21.000000000 +0000 +@@ -65,8 +65,6 @@ tracker_applet_OBJECTS = $(am_tracker_applet_OBJECTS) am__DEPENDENCIES_1 = tracker_applet_DEPENDENCIES = \ - $(top_builddir)/src/libtracker/libtrackerclient.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -312,7 +311,7 @@ - tracker-applet-marshallers.h +- $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +@@ -345,8 +343,8 @@ + $(GCOV_CFLAGS) tracker_applet_LDADD = \ -- $(top_builddir)/src/libtracker/libtrackerclient.la \ -+ -ltrackerclient \ - $(LIBGLADE_LIBS) \ - $(TRACKERAPPLET_LIBS) - +- $(top_builddir)/src/libtracker/libtrackerclient.la \ +- $(top_builddir)/src/libtracker-common/libtracker-common.la \ ++ -ltrackerclient \ ++ -ltracker-common \ + $(TRACKER_APPLET_LIBS) \ + $(LIBGLADE_LIBS) \ + $(GCOV_LIBS) diff --git a/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in index acbe9556b169..76095e88bcad 100644 --- a/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in +++ b/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in @@ -1,21 +1,22 @@ ---- src/tracker-preferences/Makefile.in.orig 2008-03-30 16:28:05.657537943 -0400 -+++ src/tracker-preferences/Makefile.in 2008-03-30 16:29:01.927868390 -0400 -@@ -59,8 +59,7 @@ +--- src/tracker-preferences/Makefile.in.orig 2009-08-08 17:13:03.000000000 +0000 ++++ src/tracker-preferences/Makefile.in 2009-08-08 17:14:08.000000000 +0000 +@@ -67,8 +67,6 @@ tracker_preferences_OBJECTS = $(am_tracker_preferences_OBJECTS) am__DEPENDENCIES_1 = - tracker_preferences_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -- $(top_builddir)/src/libtracker/libtrackerclient.la -+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -329,7 +328,7 @@ - $(GTK2_LIBS) \ - $(LIBGLADE_LIBS) \ - $(DBUS_LIBS) \ -- $(top_builddir)/src/libtracker/libtrackerclient.la \ -+ -ltrackerclient \ - $(NULL) + tracker_preferences_DEPENDENCIES = \ +- $(top_builddir)/src/libtracker/libtrackerclient.la \ +- $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +@@ -361,8 +359,8 @@ + tracker-preferences-utils.h - EXTRA_DIST = $(pkgdata_DATA) + tracker_preferences_LDADD = \ +- $(top_builddir)/src/libtracker/libtrackerclient.la \ +- $(top_builddir)/src/libtracker-common/libtracker-common.la \ ++ -ltrackerclient \ ++ -ltracker-common \ + $(LIBGLADE_LIBS) \ + $(GTK2_LIBS) \ + $(DBUS_LIBS) \ diff --git a/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in index 67de120b0227..0130754f0431 100644 --- a/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in +++ b/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in @@ -1,23 +1,24 @@ ---- src/tracker-search-tool/Makefile.in.orig 2008-03-30 16:33:18.729811374 -0400 -+++ src/tracker-search-tool/Makefile.in 2008-03-30 16:33:36.248603008 -0400 -@@ -57,9 +57,7 @@ - am__DEPENDENCIES_1 = +--- src/tracker-search-tool/Makefile.in.orig 2009-08-08 17:14:44.000000000 +0000 ++++ src/tracker-search-tool/Makefile.in 2009-08-08 17:15:51.000000000 +0000 +@@ -69,9 +69,7 @@ tracker_search_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) \ - $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \ - $(top_builddir)/src/libtracker/libtrackerclient.la -+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ ++ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -327,8 +325,7 @@ - $(GNOMEVFS_LIBS) \ - $(GNOMEDESKTOP_LIBS) \ - $(DBUS_LIBS) \ -- $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \ +@@ -367,8 +365,8 @@ + $(GCOV_LIBS) \ + $(GNOMEDESKTOP_LIBS) \ + $(DBUS_LIBS) \ +- $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \ - $(top_builddir)/src/libtracker/libtrackerclient.la -+ -ltracker-gtk -ltrackerclient ++ -ltracker-gtk \ ++ -ltrackerclient - desktop_in_files = tracker-search-tool.desktop.in - desktop_files = $(desktop_in_files:.desktop.in=.desktop) + desktopdir = $(datadir)/applications + desktop_DATA = tracker-search-tool.desktop diff --git a/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c b/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c deleted file mode 100644 index 132346af41a9..000000000000 --- a/sysutils/tracker-client/files/patch-src_trackerd_tracker-utils.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/trackerd/tracker-utils.c.orig 2007-08-05 01:53:12.000000000 +0400 -+++ src/trackerd/tracker-utils.c 2007-08-24 22:31:05.000000000 +0400 -@@ -727,10 +727,7 @@ - tm.tm_sec = strtoul (timestamp, (char **)×tamp, 10); - } - -- tt = mktime (&tm); -- /* mktime() always assumes that "tm" is in locale time but -- we want to keep control on time, so we go to UTC */ -- tt -= timezone; -+ tt = timegm (&tm); - - if (*timestamp == '+' || *timestamp == '-') { - int sign; diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist index 3daea5a6c3ba..e55381d7c1de 100644 --- a/sysutils/tracker-client/pkg-plist +++ b/sysutils/tracker-client/pkg-plist @@ -1,15 +1,36 @@ -bin/tracker-extract bin/tracker-files +bin/tracker-info bin/tracker-meta-folder +bin/tracker-processes bin/tracker-query bin/tracker-search +bin/tracker-services bin/tracker-stats bin/tracker-status bin/tracker-tag -bin/tracker-thumbnailer -bin/trackerd +bin/tracker-unique etc/xdg/autostart/trackerd.desktop -include/tracker-client.h +include/tracker-1.0/libtracker-common/tracker-common.h +include/tracker-1.0/libtracker-common/tracker-config.h +include/tracker-1.0/libtracker-common/tracker-field.h +include/tracker-1.0/libtracker-common/tracker-file-utils.h +include/tracker-1.0/libtracker-common/tracker-language.h +include/tracker-1.0/libtracker-common/tracker-module-config.h +include/tracker-1.0/libtracker-common/tracker-ontology.h +include/tracker-1.0/libtracker-common/tracker-parser.h +include/tracker-1.0/libtracker-common/tracker-service.h +include/tracker-1.0/libtracker-common/tracker-type-utils.h +include/tracker-1.0/libtracker-common/tracker-utils.h +include/tracker-1.0/libtracker-module/tracker-module-file.h +include/tracker-1.0/libtracker-module/tracker-module-iteratable.h +include/tracker-1.0/libtracker-module/tracker-module-metadata-utils.h +include/tracker-1.0/libtracker-module/tracker-module-metadata.h +include/tracker-1.0/libtracker-module/tracker-module.h +include/tracker-daemon-glue.h +include/tracker-files-glue.h +include/tracker-keywords-glue.h +include/tracker-metadata-glue.h +include/tracker-search-glue.h include/tracker.h lib/libtrackerclient.a lib/libtrackerclient.la @@ -18,39 +39,39 @@ lib/libtrackerclient.so.0 lib/tracker/extract-modules/libextract-abw.a lib/tracker/extract-modules/libextract-abw.la lib/tracker/extract-modules/libextract-abw.so -lib/tracker/extract-modules/libextract-exif.a -lib/tracker/extract-modules/libextract-exif.la -lib/tracker/extract-modules/libextract-exif.so lib/tracker/extract-modules/libextract-gstreamer.a lib/tracker/extract-modules/libextract-gstreamer.la lib/tracker/extract-modules/libextract-gstreamer.so lib/tracker/extract-modules/libextract-html.a lib/tracker/extract-modules/libextract-html.la lib/tracker/extract-modules/libextract-html.so -lib/tracker/extract-modules/libextract-imagemagick.a -lib/tracker/extract-modules/libextract-imagemagick.la -lib/tracker/extract-modules/libextract-imagemagick.so +lib/tracker/extract-modules/libextract-jpeg.a +lib/tracker/extract-modules/libextract-jpeg.la +lib/tracker/extract-modules/libextract-jpeg.so lib/tracker/extract-modules/libextract-mp3.a lib/tracker/extract-modules/libextract-mp3.la lib/tracker/extract-modules/libextract-mp3.so -lib/tracker/extract-modules/libextract-mplayer.a -lib/tracker/extract-modules/libextract-mplayer.la -lib/tracker/extract-modules/libextract-mplayer.so lib/tracker/extract-modules/libextract-oasis.a lib/tracker/extract-modules/libextract-oasis.la lib/tracker/extract-modules/libextract-oasis.so lib/tracker/extract-modules/libextract-pdf.a lib/tracker/extract-modules/libextract-pdf.la lib/tracker/extract-modules/libextract-pdf.so +lib/tracker/extract-modules/libextract-playlist.a +lib/tracker/extract-modules/libextract-playlist.la +lib/tracker/extract-modules/libextract-playlist.so lib/tracker/extract-modules/libextract-png.a lib/tracker/extract-modules/libextract-png.la lib/tracker/extract-modules/libextract-png.so lib/tracker/extract-modules/libextract-ps.a lib/tracker/extract-modules/libextract-ps.la lib/tracker/extract-modules/libextract-ps.so -lib/tracker/extract-modules/libextract-totem.a -lib/tracker/extract-modules/libextract-totem.la -lib/tracker/extract-modules/libextract-totem.so +lib/tracker/extract-modules/libextract-tiff.a +lib/tracker/extract-modules/libextract-tiff.la +lib/tracker/extract-modules/libextract-tiff.so +lib/tracker/extract-modules/libextract-vorbis.a +lib/tracker/extract-modules/libextract-vorbis.la +lib/tracker/extract-modules/libextract-vorbis.so lib/tracker/extract-modules/libextract-xmp.a lib/tracker/extract-modules/libextract-xmp.la lib/tracker/extract-modules/libextract-xmp.so @@ -83,17 +104,101 @@ lib/tracker/filters/text/tab-separated-values_filter lib/tracker/filters/text/x-comma-separated-values_filter lib/tracker/filters/text/x-tex_filter lib/tracker/filters/text/xml_filter -lib/tracker/thumbnailers/application/pdf_thumbnailer -lib/tracker/thumbnailers/application/vnd.oasis.opendocument.graphics_thumbnailer -lib/tracker/thumbnailers/application/vnd.oasis.opendocument.presentation_thumbnailer -lib/tracker/thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumbnailer -lib/tracker/thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer -lib/tracker/thumbnailers/image/gif_thumbnailer -lib/tracker/thumbnailers/image/jpeg_thumbnailer -lib/tracker/thumbnailers/image/png_thumbnailer -lib/tracker/thumbnailers/image/tiff_thumbnailer +lib/tracker/indexer-modules/libtracker-module-applications.a +lib/tracker/indexer-modules/libtracker-module-applications.la +lib/tracker/indexer-modules/libtracker-module-applications.so +lib/tracker/indexer-modules/libtracker-module-evolution.a +lib/tracker/indexer-modules/libtracker-module-evolution.la +lib/tracker/indexer-modules/libtracker-module-evolution.so +lib/tracker/indexer-modules/libtracker-module-files.a +lib/tracker/indexer-modules/libtracker-module-files.la +lib/tracker/indexer-modules/libtracker-module-files.so +lib/tracker/indexer-modules/libtracker-module-gaim-conversations.a +lib/tracker/indexer-modules/libtracker-module-gaim-conversations.la +lib/tracker/indexer-modules/libtracker-module-gaim-conversations.so +lib/tracker/libstemmer.a +lib/tracker/libstemmer.la +lib/tracker/libstemmer.so +lib/tracker/libstemmer.so.0 +lib/tracker/libtracker-common.a +lib/tracker/libtracker-common.la +lib/tracker/libtracker-common.so +lib/tracker/libtracker-common.so.0 +lib/tracker/libtracker-data.a +lib/tracker/libtracker-data.la +lib/tracker/libtracker-data.so +lib/tracker/libtracker-data.so.0 +lib/tracker/libtracker-db.a +lib/tracker/libtracker-db.la +lib/tracker/libtracker-db.so +lib/tracker/libtracker-db.so.0 +lib/tracker/libtracker-module.a +lib/tracker/libtracker-module.la +lib/tracker/libtracker-module.so +lib/tracker/libtracker-module.so.0 +libdata/pkgconfig/tracker-module-1.0.pc libdata/pkgconfig/tracker.pc -share/dbus-1/services/tracker.service +libexec/tracker-extract +libexec/tracker-indexer +libexec/trackerd +share/dbus-1/services/org.freedesktop.Tracker.Extract.service +share/dbus-1/services/org.freedesktop.Tracker.Indexer.service +share/dbus-1/services/org.freedesktop.Tracker.service +share/doc/libtracker-common/ch01.html +share/doc/libtracker-common/ch02.html +share/doc/libtracker-common/ch03.html +share/doc/libtracker-common/ch04.html +share/doc/libtracker-common/ch05.html +share/doc/libtracker-common/home.png +share/doc/libtracker-common/index.html +share/doc/libtracker-common/index.sgml +share/doc/libtracker-common/left.png +share/doc/libtracker-common/libtracker-common-Config.html +share/doc/libtracker-common/libtracker-common-DBus.html +share/doc/libtracker-common/libtracker-common-Fields.html +share/doc/libtracker-common/libtracker-common-File-Operations.html +share/doc/libtracker-common/libtracker-common-General.html +share/doc/libtracker-common/libtracker-common-HAL.html +share/doc/libtracker-common/libtracker-common-IO-Priority.html +share/doc/libtracker-common/libtracker-common-Language.html +share/doc/libtracker-common/libtracker-common-Logging.html +share/doc/libtracker-common/libtracker-common-Module-Config.html +share/doc/libtracker-common/libtracker-common-NFS-Locking.html +share/doc/libtracker-common/libtracker-common-Ontology.html +share/doc/libtracker-common/libtracker-common-Parser.html +share/doc/libtracker-common/libtracker-common-Service.html +share/doc/libtracker-common/libtracker-common-Type-Conversions.html +share/doc/libtracker-common/libtracker-common.devhelp +share/doc/libtracker-common/libtracker-common.devhelp2 +share/doc/libtracker-common/libtracker-common.html +share/doc/libtracker-common/right.png +share/doc/libtracker-common/style.css +share/doc/libtracker-common/up.png +share/doc/libtracker-module/adding-categories.html +share/doc/libtracker-module/ch01.html +share/doc/libtracker-module/ch02.html +share/doc/libtracker-module/creating-extractor-module-binary.html +share/doc/libtracker-module/defining-properties.html +share/doc/libtracker-module/home.png +share/doc/libtracker-module/how-to-add-an-extractor.html +share/doc/libtracker-module/index.html +share/doc/libtracker-module/index.sgml +share/doc/libtracker-module/installing-an-extractor.html +share/doc/libtracker-module/integrating-applications.html +share/doc/libtracker-module/left.png +share/doc/libtracker-module/libtracker-module-Iteratable-files.html +share/doc/libtracker-module/libtracker-module-Metadata-Convenience-Fallback-Functions.html +share/doc/libtracker-module/libtracker-module-Metadata-Object.html +share/doc/libtracker-module/libtracker-module-Module-files.html +share/doc/libtracker-module/libtracker-module.devhelp +share/doc/libtracker-module/libtracker-module.devhelp2 +share/doc/libtracker-module/right.png +share/doc/libtracker-module/style.css +share/doc/libtracker-module/testing-an-extractor.html +share/doc/libtracker-module/tracker-indexer.html +share/doc/libtracker-module/up.png +share/doc/libtracker-module/writing-an-extractor.html +share/doc/libtracker-module/writing-an-indexer-module.html share/icons/hicolor/16x16/apps/tracker.png share/icons/hicolor/22x22/apps/tracker.png share/icons/hicolor/24x24/apps/tracker.png @@ -101,18 +206,24 @@ share/icons/hicolor/32x32/apps/tracker.png share/icons/hicolor/48x48/apps/tracker.png share/icons/hicolor/scalable/apps/tracker.svg share/locale/ar/LC_MESSAGES/tracker.mo +share/locale/be/LC_MESSAGES/tracker.mo share/locale/be@latin/LC_MESSAGES/tracker.mo share/locale/ca/LC_MESSAGES/tracker.mo +share/locale/cs/LC_MESSAGES/tracker.mo +share/locale/da/LC_MESSAGES/tracker.mo share/locale/de/LC_MESSAGES/tracker.mo share/locale/dz/LC_MESSAGES/tracker.mo +share/locale/el/LC_MESSAGES/tracker.mo share/locale/en_GB/LC_MESSAGES/tracker.mo share/locale/es/LC_MESSAGES/tracker.mo share/locale/et/LC_MESSAGES/tracker.mo share/locale/fi/LC_MESSAGES/tracker.mo share/locale/fr/LC_MESSAGES/tracker.mo share/locale/gl/LC_MESSAGES/tracker.mo +share/locale/he/LC_MESSAGES/tracker.mo share/locale/hu/LC_MESSAGES/tracker.mo share/locale/it/LC_MESSAGES/tracker.mo +share/locale/ja/LC_MESSAGES/tracker.mo share/locale/ko/LC_MESSAGES/tracker.mo share/locale/lt/LC_MESSAGES/tracker.mo share/locale/mk/LC_MESSAGES/tracker.mo @@ -126,6 +237,7 @@ share/locale/ru/LC_MESSAGES/tracker.mo share/locale/sk/LC_MESSAGES/tracker.mo share/locale/sl/LC_MESSAGES/tracker.mo share/locale/sv/LC_MESSAGES/tracker.mo +share/locale/th/LC_MESSAGES/tracker.mo share/locale/zh_CN/LC_MESSAGES/tracker.mo %%DATADIR%%/languages/stopwords.da %%DATADIR%%/languages/stopwords.de @@ -133,25 +245,33 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo %%DATADIR%%/languages/stopwords.es %%DATADIR%%/languages/stopwords.fi %%DATADIR%%/languages/stopwords.fr +%%DATADIR%%/languages/stopwords.hu %%DATADIR%%/languages/stopwords.it %%DATADIR%%/languages/stopwords.nb %%DATADIR%%/languages/stopwords.nl %%DATADIR%%/languages/stopwords.pt %%DATADIR%%/languages/stopwords.ru %%DATADIR%%/languages/stopwords.sv +%%DATADIR%%/modules/applications.module +%%DATADIR%%/modules/evolution.module +%%DATADIR%%/modules/files.module +%%DATADIR%%/modules/gaim-conversations.module %%DATADIR%%/services/application.metadata %%DATADIR%%/services/audio.metadata +%%DATADIR%%/services/conversation.metadata %%DATADIR%%/services/default.metadata %%DATADIR%%/services/default.service %%DATADIR%%/services/document.metadata %%DATADIR%%/services/email.metadata %%DATADIR%%/services/file.metadata %%DATADIR%%/services/image.metadata +%%DATADIR%%/services/playlist.metadata %%DATADIR%%/services/video.metadata %%DATADIR%%/sqlite-cache.sql +%%DATADIR%%/sqlite-contents.sql %%DATADIR%%/sqlite-email.sql +%%DATADIR%%/sqlite-fulltext.sql %%DATADIR%%/sqlite-metadata.sql -%%DATADIR%%/sqlite-service-stored-procs.sql %%DATADIR%%/sqlite-service-triggers.sql %%DATADIR%%/sqlite-service-types.sql %%DATADIR%%/sqlite-service.sql @@ -159,21 +279,32 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo %%DATADIR%%/sqlite-tracker-triggers.sql %%DATADIR%%/sqlite-tracker.sql %%DATADIR%%/sqlite-user-data.sql -%%DATADIR%%/tracker-introspect.xml +%%DATADIR%%/tracker-backup.xml +%%DATADIR%%/tracker-daemon.xml +%%DATADIR%%/tracker-extract.xml +%%DATADIR%%/tracker-files.xml +%%DATADIR%%/tracker-indexer.xml +%%DATADIR%%/tracker-keywords.xml +%%DATADIR%%/tracker-metadata.xml +%%DATADIR%%/tracker-search.xml @dirrm %%DATADIR%%/services +@dirrm %%DATADIR%%/modules @dirrm %%DATADIR%%/languages @dirrm %%DATADIR%% -@dirrm lib/tracker/thumbnailers/image -@dirrm lib/tracker/thumbnailers/application -@dirrm lib/tracker/thumbnailers -@dirrm lib/tracker/filters/text -@dirrm lib/tracker/filters/application -@dirrm lib/tracker/filters -@dirrm lib/tracker/extract-modules -@dirrm lib/tracker @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrm share/doc/libtracker-module +@dirrm share/doc/libtracker-common +@dirrm lib/tracker/indexer-modules +@dirrm lib/tracker/filters/text +@dirrm lib/tracker/filters/application +@dirrm lib/tracker/filters +@dirrm lib/tracker/extract-modules +@dirrm lib/tracker +@dirrm include/tracker-1.0/libtracker-module +@dirrm include/tracker-1.0/libtracker-common +@dirrm include/tracker-1.0 diff --git a/sysutils/tracker-gnome/Makefile b/sysutils/tracker-gnome/Makefile index fa7c585b9b37..d75ed4cf245f 100644 --- a/sysutils/tracker-gnome/Makefile +++ b/sysutils/tracker-gnome/Makefile @@ -3,9 +3,9 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/tracker-gnome/Makefile,v 1.2 2009/04/09 03:24:09 mezz Exp $ +# $MCom: ports/sysutils/tracker-gnome/Makefile,v 1.4 2009/08/08 18:46:42 ahze Exp $ -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Tracker GNOME applet, search tool, and preference programs diff --git a/sysutils/tracker-gnome/pkg-plist b/sysutils/tracker-gnome/pkg-plist index a6d62ab27d95..2587a84e1e41 100644 --- a/sysutils/tracker-gnome/pkg-plist +++ b/sysutils/tracker-gnome/pkg-plist @@ -11,6 +11,5 @@ share/applications/tracker-search-tool.desktop %%DATADIR%%/icons/tracker-applet-paused.png %%DATADIR%%/tracker-applet-prefs.glade %%DATADIR%%/tracker-preferences.glade -@dirrmtry %%DATADIR%%/icons -@dirrmtry %%DATADIR%% +@dirrm %%DATADIR%%/icons @dirrmtry share/applications diff --git a/sysutils/tracker-libtrackergtk/Makefile b/sysutils/tracker-libtrackergtk/Makefile index 247b978bec4f..0ad05f45cd27 100644 --- a/sysutils/tracker-libtrackergtk/Makefile +++ b/sysutils/tracker-libtrackergtk/Makefile @@ -3,9 +3,9 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/tracker-libtrackergtk/Makefile,v 1.1 2008/03/30 20:39:09 ahze Exp $ +# $MCom: ports/sysutils/tracker-libtrackergtk/Makefile,v 1.1 2009/08/08 18:46:43 ahze Exp $ -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= Gtk bindings to tracker and GSF data extract module (MS docs) diff --git a/sysutils/tracker-libtrackergtk/pkg-plist b/sysutils/tracker-libtrackergtk/pkg-plist index 4cee5053d4f4..a4408617c565 100644 --- a/sysutils/tracker-libtrackergtk/pkg-plist +++ b/sysutils/tracker-libtrackergtk/pkg-plist @@ -11,6 +11,4 @@ lib/libtracker-gtk.so.0 lib/tracker/extract-modules/libextract-msoffice.a lib/tracker/extract-modules/libextract-msoffice.la lib/tracker/extract-modules/libextract-msoffice.so -@dirrm lib/tracker/extract-modules -@dirrm lib/tracker @dirrm include/libtracker-gtk diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile index cb4deecaff15..7ee5a3c7a3ef 100644 --- a/sysutils/tracker/Makefile +++ b/sysutils/tracker/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/tracker/Makefile,v 1.2 2008/03/31 00:28:58 ahze Exp $ +# $MCom: ports/sysutils/tracker/Makefile,v 1.18 2009/08/08 18:46:41 ahze Exp $ # PORTNAME= tracker -PORTVERSION= 0.6.6 -PORTREVISION= 2 +PORTVERSION= 0.6.95 CATEGORIES= sysutils gnome MASTER_SITES= # empty DISTFILES= # empty |