diff options
| author | marcus <marcus@FreeBSD.org> | 2009-01-10 13:22:13 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2009-01-10 13:22:13 +0800 |
| commit | 6d8ed8f7c7511223163de715a97ffc04bf6fada9 (patch) | |
| tree | 40dc015efe383243b0880df377f73ee250da7de7 | |
| parent | c7f342a8d7b82e85b9625c4403600fc20ce41da6 (diff) | |
| download | freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.gz freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.tar.zst freebsd-ports-gnome-6d8ed8f7c7511223163de715a97ffc04bf6fada9.zip | |
Presenting GNOME 2.24 for FreeBSD.
See http://library.gnome.org/misc/release-notes/2.24/ for the general
release notes. On the FreeBSD front, this release introduces Fuse support
in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some
long-standing seahorse and gnome-keyring bugs. The documentation updates
to the website are forthcoming.
This release features commits by adamw, ahze, kwm, mezz, and myself. It would
not have been possible without are contributors and testers:
Alexander Loginov
Craig Butler [1]
Dmitry Marakasov [6]
Eric L. Chen
Joseph S. Atkinson
Kris Moore
Lapo Luchini [7]
Nikos Ntarmos
Pawel Worach
Romain Tartiere
TAOKA Fumiyoshi [3]
Yasuda Keisuke
Zyl
aZ [4]
bf [2] [5]
Florent Thoumie
Peter Wemm
pluknet
PR: 125857 [1]
126993 [2]
130031 [3]
127399 [4]
127661 [5]
124302 [6]
129570 [7]
129936
123790
720 files changed, 12893 insertions, 17516 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 67963e6e4573..ad0ca88a6336 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,10 +3,23 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports-stable/Mk/bsd.gnome.mk,v 1.8 2008/06/16 21:35:56 mezz Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.471 2008/09/01 16:45:46 ahze Exp $ # # Please view me with 4 column tabs! +####################################################### +# +# *** WARNING: Disable MARCUSCOM before merge in FreeBSD! +# +#MARCUSCOM_CVS=yes + +# ======================= USERS ================================= +# +# There are no significant user-definable settings in here. +# This file is a framework to make it easier to create GNOME ports. +# +# ======================= /USERS ================================ + .if !defined(_POSTMKINCLUDED) && !defined(Gnome_Pre_Include) # Please make sure all changes to this file are passed through the maintainer. @@ -57,11 +70,11 @@ _USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 glibwww \ oaf orbit pygnome pygtk # GNOME 2 components -_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \ - gal2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ +_USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \ + gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \ - libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \ + libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 libgda4 \ libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \ libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \ librsvg2 libwnck libxml2 libxslt libzvt linc metacity nautilus2 \ @@ -103,9 +116,6 @@ gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \ --disable-gtk-doc \ --with-gconf-source=${GCONF_CONFIG_SOURCE} gnomeprefix_USE_GNOME_IMPL=gnomehier -.if !defined(WITHOUT_HACK) -gnomeprefix_PREFIX=${LOCALBASE} -.endif ESD_CONFIG?= ${LOCALBASE}/bin/esd-config esound_LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound @@ -252,7 +262,7 @@ pygnome_USE_GNOME_IMPL= gtkhtml pygtk _glib20_LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 _glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc -_glib20_USE_GNOME_IMPL= gnometarget pkgconfig +_glib20_USE_GNOME_IMPL= pkgconfig glib20_RUN_DEPENDS= ${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend glib20_DETECT= ${LOCALBASE}/lib/gio/modules/libgiofam.so @@ -307,13 +317,9 @@ gnomevfs2_LIB_DEPENDS= gnomevfs-2.0:${PORTSDIR}/devel/gnome-vfs gnomevfs2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-vfs-2.0.pc gnomevfs2_USE_GNOME_IMPL=gconf2 gnomemimedata -gail_LIB_DEPENDS= gailutil.18:${PORTSDIR}/accessibility/gail -gail_DETECT= ${LOCALBASE}/libdata/pkgconfig/gail.pc -gail_USE_GNOME_IMPL= gtk20 - libgnomecanvas_LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas libgnomecanvas_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc -libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 gail +libgnomecanvas_USE_GNOME_IMPL= libglade2 libartlgpl2 libartlgpl2_LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl libartlgpl2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc @@ -341,7 +347,7 @@ libgnomeui_USE_GNOME_IMPL= libbonoboui atspi_LIB_DEPENDS= spi.10:${PORTSDIR}/accessibility/at-spi atspi_DETECT= ${LOCALBASE}/libdata/pkgconfig/cspi-1.0.pc -atspi_USE_GNOME_IMPL= gail libbonobo +atspi_USE_GNOME_IMPL= gtk20 libbonobo libgailgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgail-gnome.pc libgailgnome_RUN_DEPENDS= ${libgailgnome_DETECT}:${PORTSDIR}/x11-toolkits/libgail-gnome @@ -349,9 +355,9 @@ libgailgnome_USE_GNOME_IMPL= libgnomeui atspi libgtkhtml_LIB_DEPENDS= gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml libgtkhtml_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc -libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 gail +libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2 -gnomedesktop_LIB_DEPENDS= gnome-desktop-2.2:${PORTSDIR}/x11/gnome-desktop +gnomedesktop_LIB_DEPENDS= gnome-desktop-2.7:${PORTSDIR}/x11/gnome-desktop gnomedesktop_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-desktop-2.0.pc gnomedesktop_USE_GNOME_IMPL= libgnomeui gnomedocutils gnomedesktop_GNOME_DESKTOP_VERSION=2 @@ -374,7 +380,7 @@ librsvg2_USE_GNOME_IMPL=libgsf gtk20 eel2_LIB_DEPENDS= eel-2.2:${PORTSDIR}/x11-toolkits/eel eel2_DETECT= ${LOCALBASE}/libdata/pkgconfig/eel-2.0.pc -eel2_USE_GNOME_IMPL= gnomedesktop gail +eel2_USE_GNOME_IMPL= gnomedesktop gnomepanel_LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnome-panel gnomepanel_DETECT= ${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc @@ -406,6 +412,10 @@ libgda3_LIB_DEPENDS= gda-3.0.3:${PORTSDIR}/databases/libgda3 libgda3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-3.0.pc libgda3_USE_GNOME_IMPL= glib20 libxslt +libgda4_LIB_DEPENDS= gda-4.0.4:${PORTSDIR}/databases/libgda4 +libgda4_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-4.0.pc +libgda4_USE_GNOME_IMPL= glib20 libxslt + libgnomedb_LIB_DEPENDS= gnomedb-3.0.4:${PORTSDIR}/databases/libgnomedb libgnomedb_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomedb.pc libgnomedb_USE_GNOME_IMPL=libgnomeui libgda3 @@ -452,13 +462,13 @@ intlhack_USE_GNOME_IMPL=intltool gtkhtml3_LIB_DEPENDS= gtkhtml-3.14.19:${PORTSDIR}/www/gtkhtml3 gtkhtml3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc -gtkhtml3_USE_GNOME_IMPL=gail libgnomeui +gtkhtml3_USE_GNOME_IMPL=libgnomeui gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech gnomespeech_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc gnomespeech_USE_GNOME_IMPL=libbonobo -evolutiondataserver_LIB_DEPENDS=edataserver-1.2.9:${PORTSDIR}/databases/evolution-data-server +evolutiondataserver_LIB_DEPENDS=edataserver-1.2.11:${PORTSDIR}/databases/evolution-data-server evolutiondataserver_DETECT= ${LOCALBASE}/libdata/pkgconfig/evolution-data-server-1.2.pc evolutiondataserver_USE_GNOME_IMPL=libgnomeui @@ -506,7 +516,7 @@ gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome- gnomesharp20_USE_GNOME_IMPL= gnomepanel gtkhtml3 gtksharp20 librsvg2 vte libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc -libgnomekbd_LIB_DEPENDS= gnomekbd.2:${PORTSDIR}/x11/libgnomekbd +libgnomekbd_LIB_DEPENDS= gnomekbd.3:${PORTSDIR}/x11/libgnomekbd libgnomekbd_USE_GNOME_IMPL= libgnomeui pygtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc @@ -518,6 +528,12 @@ gvfs_DETECT= ${LOCALBASE}/lib/libgvfscommon.so gvfs_LIB_DEPENDS= gvfscommon.0:${PORTSDIR}/devel/gvfs gvfs_USE_GNOME_IMPL= glib20 gconf2 +.if defined(MARCUSCOM_CVS) +. if exists(${PORTSDIR}/Mk/bsd.gnome-experimental.mk) +.include "${PORTSDIR}/Mk/bsd.gnome-experimental.mk" +. endif +.endif + # End component definition section # This section defines tests for optional software. These work off four @@ -614,24 +630,7 @@ Gnome_Post_Include= bsd.gnome.mk .error The Pre include part of bsd.gnome.mk part is not included. Did you forget WANT_GNOME=yes before bsd.port.pre.mk? .endif -# DO NOT USE THESE MACROS! They are obsolete, and only provided for -# backward compatibility with old ports that have not converted to the new -# GNOME infrastructure. -.if defined(USE_GTK) -#.warning The USE_GTK macro is deprecated. It should be replaced by USE_GNOME=gtk12. -USE_GNOME+= gtk12 -.endif -# End of obsolete macros - .if defined(USE_GNOME) -# Hack USE_GNOME to the modular infrastructure for port maintainers that -# didn't do so themselves. New ports should NOT set USE_GNOME=yes. -. if ${USE_GNOME}=="yes" -#.warning The USE_GNOME=yes component is deprecated. It should be replaced by some combination of gnomeprefix, gnomehack, and gtkhtml -USE_GNOME:= ${USE_GNOME:S/yes//} -USE_GNOME+= gnomeprefix gnomehack gtkhtml -. endif - # First of all expand all USE_GNOME_IMPL recursively . for component in ${_USE_GNOME_ALL} . for subcomponent in ${${component}_USE_GNOME_IMPL} @@ -666,7 +665,7 @@ PLIST_SUB+= GTK2_VERSION="${GTK2_VERSION}" # we rely on some bsd.autotools.mk variables, and bsd.autotools.mk is # included in the post-makefile section). .if defined(AUTOTOOL_libtool) -lthacks_CONFIGURE_ENV= ac_cv_path_DOLT_BASH= +lthacks_CONFIGURE_ENV= ac_cv_path_DOLT_BASH= lthacks_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ ${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \ for file in ${LIBTOOLFILES}; do \ @@ -717,22 +716,15 @@ PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} FETCH_DEPENDS+= ${${component}_FETCH_DEPENDS} EXTRACT_DEPENDS+=${${component}_EXTRACT_DEPENDS} BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} -####################################################### - +. if defined(MARCUSCOM_CVS) +. if !defined(NODEPENDS) LIB_DEPENDS+= ${${component}_LIB_DEPENDS} RUN_DEPENDS+= ${${component}_RUN_DEPENDS} - -.if !defined(WITHOUT_HACK) -.if defined(${component}_PREFIX) -.if ${.MAKEFLAGS:MPREFIX=*}=="" -PREFIX= ${${component}_PREFIX} -.endif -.if defined(USE_X_PREFIX) -.undef USE_X_PREFIX -USE_XLIB= yes -.endif -.endif -.endif +. endif +. else +LIB_DEPENDS+= ${${component}_LIB_DEPENDS} +RUN_DEPENDS+= ${${component}_RUN_DEPENDS} +. endif CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS} CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV} @@ -787,12 +779,12 @@ CONFIGURE_FAIL_MESSAGE= "Please run the gnomelogalyzer, available from \"http:// .if defined(GCONF_SCHEMAS) || defined(INSTALLS_OMF) || defined(INSTALLS_ICONS) \ - || (defined(_USE_GNOME) && ${_USE_GNOME:Mgnomeprefix}!="") + || (defined(_USE_GNOME) && ${_USE_GNOME:Mgnomehier}!="") pre-su-install: gnome-pre-su-install post-install: gnome-post-install gnome-pre-su-install: -.if defined(_USE_GNOME) && ${_USE_GNOME:Mgnomeprefix}!="" && !defined(NO_MTREE) +.if defined(_USE_GNOME) && ${_USE_GNOME:Mgnomehier}!="" && !defined(NO_MTREE) @${MTREE_CMD} ${MTREE_ARGS:S/${MTREE_FILE}/${GNOME_MTREE_FILE}/} ${PREFIX}/ >/dev/null .endif .if defined(GCONF_SCHEMAS) diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile index fcbd288d2337..7ad0af553276 100644 --- a/accessibility/accerciser/Makefile +++ b/accessibility/accerciser/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/accerciser/Makefile,v 1.13 2008/03/10 21:21:07 mezz Exp $ +# $MCom: ports/accessibility/accerciser/Makefile,v 1.23 2008/09/23 05:14:40 marcus Exp $ # PORTNAME= accerciser -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4.0 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,10 +23,27 @@ USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes +USE_DISPLAY= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= accerciser.schemas MAN1= accerciser.1 +.if !defined(DISPLAY) +pre-configure: + @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ + ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ + ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ + fi + @${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid + @sleep 5 + +post-configure: + @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ + ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ + ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ + fi +.endif + .include <bsd.port.mk> diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo index ea9a3a35e230..f82295c923f3 100644 --- a/accessibility/accerciser/distinfo +++ b/accessibility/accerciser/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/accerciser-1.2.0.tar.bz2) = e4dd607aea8c305ee930c5b09e44681b -SHA256 (gnome2/accerciser-1.2.0.tar.bz2) = d3ddfb1429a2a14905dfb76620d273dde760d57cce0bcf19d859351501f94103 -SIZE (gnome2/accerciser-1.2.0.tar.bz2) = 1308737 +MD5 (gnome2/accerciser-1.4.0.tar.bz2) = c46b768906d6a02f83bf96e8843890c1 +SHA256 (gnome2/accerciser-1.4.0.tar.bz2) = ca714cf55dca66637a63725c019afde7082763d281721801a77e600bda5db6c6 +SIZE (gnome2/accerciser-1.4.0.tar.bz2) = 1338182 diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist index 1c004d3c09f4..f6a5aac4b85d 100644 --- a/accessibility/accerciser/pkg-plist +++ b/accessibility/accerciser/pkg-plist @@ -181,12 +181,6 @@ share/gnome/help/accerciser/fr/figures/api_browser.png share/gnome/help/accerciser/fr/figures/event_monitor.png share/gnome/help/accerciser/fr/figures/interface_viewer.png share/gnome/help/accerciser/fr/figures/script_recorder.png -share/gnome/help/accerciser/it/accerciser.xml -share/gnome/help/accerciser/it/figures/accerciser.png -share/gnome/help/accerciser/it/figures/api_browser.png -share/gnome/help/accerciser/it/figures/event_monitor.png -share/gnome/help/accerciser/it/figures/interface_viewer.png -share/gnome/help/accerciser/it/figures/script_recorder.png share/gnome/help/accerciser/oc/accerciser.xml share/gnome/help/accerciser/oc/figures/accerciser.png share/gnome/help/accerciser/oc/figures/api_browser.png @@ -226,10 +220,12 @@ share/locale/hi/LC_MESSAGES/accerciser.mo share/locale/hu/LC_MESSAGES/accerciser.mo share/locale/it/LC_MESSAGES/accerciser.mo share/locale/ja/LC_MESSAGES/accerciser.mo +share/locale/kn/LC_MESSAGES/accerciser.mo share/locale/lt/LC_MESSAGES/accerciser.mo share/locale/lv/LC_MESSAGES/accerciser.mo share/locale/mk/LC_MESSAGES/accerciser.mo share/locale/ml/LC_MESSAGES/accerciser.mo +share/locale/mr/LC_MESSAGES/accerciser.mo share/locale/nb/LC_MESSAGES/accerciser.mo share/locale/nl/LC_MESSAGES/accerciser.mo share/locale/oc/LC_MESSAGES/accerciser.mo @@ -249,12 +245,13 @@ share/locale/tr/LC_MESSAGES/accerciser.mo share/locale/uk/LC_MESSAGES/accerciser.mo share/locale/vi/LC_MESSAGES/accerciser.mo share/locale/zh_CN/LC_MESSAGES/accerciser.mo +share/locale/zh_HK/LC_MESSAGES/accerciser.mo +share/locale/zh_TW/LC_MESSAGES/accerciser.mo share/omf/accerciser/accerciser-C.omf share/omf/accerciser/accerciser-ca.omf share/omf/accerciser/accerciser-en_GB.omf share/omf/accerciser/accerciser-es.omf share/omf/accerciser/accerciser-fr.omf -share/omf/accerciser/accerciser-it.omf share/omf/accerciser/accerciser-oc.omf share/omf/accerciser/accerciser-sv.omf @dirrm share/omf/accerciser @@ -262,8 +259,6 @@ share/omf/accerciser/accerciser-sv.omf @dirrm share/gnome/help/accerciser/sv @dirrm share/gnome/help/accerciser/oc/figures @dirrm share/gnome/help/accerciser/oc -@dirrm share/gnome/help/accerciser/it/figures -@dirrm share/gnome/help/accerciser/it @dirrm share/gnome/help/accerciser/fr/figures @dirrm share/gnome/help/accerciser/fr @dirrm share/gnome/help/accerciser/es/figures @@ -285,12 +280,16 @@ share/omf/accerciser/accerciser-sv.omf @dirrm %%DATADIR%% @dirrm %%PYTHON_SITELIBDIR%%/accerciser/plugin @dirrm %%PYTHON_SITELIBDIR%%/accerciser +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index b20597e108eb..01b8e4bcab04 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/at-spi/Makefile,v 1.71 2008/03/10 13:55:24 ahze Exp $ +# $MCom: ports/accessibility/at-spi/Makefile,v 1.81 2009/01/09 21:48:35 kwm Exp $ # PORTNAME= at-spi -PORTVERSION= 1.22.1 -PORTREVISION?= 2 +PORTVERSION= 1.24.1 +PORTREVISION?= 0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -23,8 +23,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomehier intltool gail libbonobo \ - intlhack +USE_GNOME= gnomehack gnomehier intlhack gtk20 libbonobo USE_XORG= x11 xtst USE_PYTHON= yes USE_LDCONFIG= yes @@ -33,6 +32,8 @@ CONFIGURE_ARGS= --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= at-spi.schemas + post-extract: @${RM} -f ${WRKSRC}/registryd/Accessibility_Registry.server diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo index 39d4ab8683fe..fb4ceea272c2 100644 --- a/accessibility/at-spi/distinfo +++ b/accessibility/at-spi/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/at-spi-1.22.1.tar.bz2) = 2ee1b35ef25e753e6bac840a418608f5 -SHA256 (gnome2/at-spi-1.22.1.tar.bz2) = eaaedead8218197c8ccdc8b24d16f6f25ea82a7e0fd03e2eef29bd13619e0ecb -SIZE (gnome2/at-spi-1.22.1.tar.bz2) = 851691 +MD5 (gnome2/at-spi-1.24.1.tar.bz2) = 8e98aadfaca757799cb18ea92f40d21a +SHA256 (gnome2/at-spi-1.24.1.tar.bz2) = f21746c4b4694aec821f545634a3f3bc2a627120fbb9b3aea546f59368025709 +SIZE (gnome2/at-spi-1.24.1.tar.bz2) = 821177 diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist index d4418bb72cb4..066a62d26890 100644 --- a/accessibility/at-spi/pkg-plist +++ b/accessibility/at-spi/pkg-plist @@ -100,12 +100,14 @@ share/idl/at-spi-1.0/Accessibility_StreamableContent.idl share/idl/at-spi-1.0/Accessibility_Table.idl share/idl/at-spi-1.0/Accessibility_Text.idl share/idl/at-spi-1.0/Accessibility_Value.idl +share/locale/ang/LC_MESSAGES/at-spi.mo share/locale/ar/LC_MESSAGES/at-spi.mo share/locale/az/LC_MESSAGES/at-spi.mo share/locale/be/LC_MESSAGES/at-spi.mo share/locale/be@latin/LC_MESSAGES/at-spi.mo share/locale/bg/LC_MESSAGES/at-spi.mo share/locale/bn/LC_MESSAGES/at-spi.mo +share/locale/bn_IN/LC_MESSAGES/at-spi.mo share/locale/bs/LC_MESSAGES/at-spi.mo share/locale/ca/LC_MESSAGES/at-spi.mo share/locale/cs/LC_MESSAGES/at-spi.mo @@ -123,6 +125,7 @@ share/locale/eu/LC_MESSAGES/at-spi.mo share/locale/fa/LC_MESSAGES/at-spi.mo share/locale/fi/LC_MESSAGES/at-spi.mo share/locale/fr/LC_MESSAGES/at-spi.mo +share/locale/ga/LC_MESSAGES/at-spi.mo share/locale/gl/LC_MESSAGES/at-spi.mo share/locale/gu/LC_MESSAGES/at-spi.mo share/locale/he/LC_MESSAGES/at-spi.mo @@ -135,11 +138,15 @@ share/locale/it/LC_MESSAGES/at-spi.mo share/locale/ja/LC_MESSAGES/at-spi.mo share/locale/ka/LC_MESSAGES/at-spi.mo share/locale/ko/LC_MESSAGES/at-spi.mo +share/locale/ku/LC_MESSAGES/at-spi.mo share/locale/lt/LC_MESSAGES/at-spi.mo +share/locale/mk/LC_MESSAGES/at-spi.mo +share/locale/ml/LC_MESSAGES/at-spi.mo share/locale/mn/LC_MESSAGES/at-spi.mo share/locale/mr/LC_MESSAGES/at-spi.mo share/locale/ms/LC_MESSAGES/at-spi.mo share/locale/nb/LC_MESSAGES/at-spi.mo +share/locale/nds_DE/LC_MESSAGES/at-spi.mo share/locale/ne/LC_MESSAGES/at-spi.mo share/locale/nl/LC_MESSAGES/at-spi.mo share/locale/nn/LC_MESSAGES/at-spi.mo @@ -147,6 +154,7 @@ share/locale/oc/LC_MESSAGES/at-spi.mo share/locale/or/LC_MESSAGES/at-spi.mo share/locale/pa/LC_MESSAGES/at-spi.mo share/locale/pl/LC_MESSAGES/at-spi.mo +share/locale/ps/LC_MESSAGES/at-spi.mo share/locale/pt/LC_MESSAGES/at-spi.mo share/locale/pt_BR/LC_MESSAGES/at-spi.mo share/locale/ro/LC_MESSAGES/at-spi.mo @@ -156,10 +164,13 @@ share/locale/sk/LC_MESSAGES/at-spi.mo share/locale/sl/LC_MESSAGES/at-spi.mo share/locale/sq/LC_MESSAGES/at-spi.mo share/locale/sr/LC_MESSAGES/at-spi.mo -share/locale/sr@Latn/LC_MESSAGES/at-spi.mo share/locale/sr@ije/LC_MESSAGES/at-spi.mo +share/locale/sr@latin/LC_MESSAGES/at-spi.mo share/locale/sv/LC_MESSAGES/at-spi.mo +share/locale/ta/LC_MESSAGES/at-spi.mo +share/locale/te/LC_MESSAGES/at-spi.mo share/locale/th/LC_MESSAGES/at-spi.mo +share/locale/tr/LC_MESSAGES/at-spi.mo share/locale/ug/LC_MESSAGES/at-spi.mo share/locale/uk/LC_MESSAGES/at-spi.mo share/locale/vi/LC_MESSAGES/at-spi.mo @@ -181,15 +192,29 @@ share/locale/zh_TW/LC_MESSAGES/at-spi.mo @dirrmtry share/locale/xh @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/nds_DE/LC_MESSAGES +@dirrmtry share/locale/nds_DE @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@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/ang/LC_MESSAGES +@dirrmtry share/locale/ang diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index a9af83ff3677..9843cf6f3f4f 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/atk/Makefile,v 1.90 2008/03/10 13:51:38 ahze Exp $ +# $MCom: ports/accessibility/atk/Makefile,v 1.93 2008/09/22 10:50:30 kwm Exp $ # PORTNAME= atk -PORTVERSION= 1.22.0 -PORTREVISION?= 1 +PORTVERSION= 1.24.0 +PORTREVISION?= 0 CATEGORIES= accessibility devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index 9f2a06386096..1b00330377c9 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/atk-1.22.0.tar.bz2) = 06a2b39a22d5ca35c47435da6b9643ac -SHA256 (gnome2/atk-1.22.0.tar.bz2) = 677d66e9a0fc919042c28d40bf9356f45953d218fe613a84137e9f3d8c225de9 -SIZE (gnome2/atk-1.22.0.tar.bz2) = 709221 +MD5 (gnome2/atk-1.24.0.tar.bz2) = fb0ee9c7f18b15b490a0168b13740a4d +SHA256 (gnome2/atk-1.24.0.tar.bz2) = 03a0b66efb6d69754ca18c133ca4d489dd8675bf366c03f58cc7b39f55a45d56 +SIZE (gnome2/atk-1.24.0.tar.bz2) = 701798 diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index 1c7afa927b66..7aa630dfbb46 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -91,6 +91,7 @@ share/locale/pa/LC_MESSAGES/atk10.mo share/locale/pl/LC_MESSAGES/atk10.mo share/locale/pt/LC_MESSAGES/atk10.mo share/locale/pt_BR/LC_MESSAGES/atk10.mo +share/locale/ps/LC_MESSAGES/atk10.mo share/locale/ro/LC_MESSAGES/atk10.mo share/locale/ru/LC_MESSAGES/atk10.mo share/locale/rw/LC_MESSAGES/atk10.mo @@ -99,7 +100,7 @@ share/locale/sk/LC_MESSAGES/atk10.mo share/locale/sl/LC_MESSAGES/atk10.mo share/locale/sq/LC_MESSAGES/atk10.mo share/locale/sr/LC_MESSAGES/atk10.mo -share/locale/sr@Latn/LC_MESSAGES/atk10.mo +share/locale/sr@latin/LC_MESSAGES/atk10.mo share/locale/sr@ije/LC_MESSAGES/atk10.mo share/locale/sv/LC_MESSAGES/atk10.mo share/locale/ta/LC_MESSAGES/atk10.mo @@ -131,12 +132,16 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo @dirrmtry share/locale/tt @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile index bbc8a5739963..e13632222c7c 100644 --- a/accessibility/dasher/Makefile +++ b/accessibility/dasher/Makefile @@ -3,11 +3,11 @@ # Whom: lewiz <purple@lewiz.net> # # $FreeBSD$ -# $MCom: ports/accessibility/dasher/Makefile,v 1.61 2007/11/15 20:54:19 marcus Exp $ +# $MCom: ports/accessibility/dasher/Makefile,v 1.64 2008/06/06 21:38:44 marcus Exp $ # PORTNAME= dasher -PORTVERSION= 4.7.3 +PORTVERSION= 4.9.0 PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= accessibility editors x11 gnome diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo index b2dfd7964a1b..8a3188f20c6f 100644 --- a/accessibility/dasher/distinfo +++ b/accessibility/dasher/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/dasher-4.7.3.tar.bz2) = f97dfd3c54f6d6c5f2873d4f82cb33c4 -SHA256 (gnome2/dasher-4.7.3.tar.bz2) = 44a2fdd1dde5c4fc499090f61aa3ee8939c9df40d5a009ecac8441f633b85e9f -SIZE (gnome2/dasher-4.7.3.tar.bz2) = 6773132 +MD5 (gnome2/dasher-4.9.0.tar.bz2) = f6f024878f258a9506e62cf717446437 +SHA256 (gnome2/dasher-4.9.0.tar.bz2) = abb15328c95c786390fc9ea5f7470a247880f05b2aacdd3cd083067a0e374a3e +SIZE (gnome2/dasher-4.9.0.tar.bz2) = 6734895 diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist index ee2f2ae630d7..885ff8fd28da 100644 --- a/accessibility/dasher/pkg-plist +++ b/accessibility/dasher/pkg-plist @@ -154,7 +154,9 @@ share/applications/dasher.desktop %%DATADIR%%/dasher.fullscreen.glade %%DATADIR%%/dasher.gameWIP.glade %%DATADIR%%/dasher.traditional.glade +%%DATADIR%%/dasher.preferences.glade %%DATADIR%%/dashermaemo.glade +%%DATADIR%%/dashermaemo.preferences.glade %%DATADIR%%/dashermaemofullscreen.glade %%DATADIR%%/training_albanian_SQ.txt %%DATADIR%%/training_basque_EU.txt diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile index 98faf51dbaf1..89f9eaecbede 100644 --- a/accessibility/gnome-mag/Makefile +++ b/accessibility/gnome-mag/Makefile @@ -3,15 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.37 2007/09/17 16:05:19 ahze Exp $ +# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.44 2008/09/23 20:13:54 mezz Exp $ # PORTNAME= gnome-mag -PORTVERSION= 0.14.10 -PORTREVISION= 2 +PORTVERSION= 0.15.4 CATEGORIES= accessibility gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo index 4b5b1aa2692b..7d59c7138e7d 100644 --- a/accessibility/gnome-mag/distinfo +++ b/accessibility/gnome-mag/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-mag-0.14.10.tar.bz2) = e3e498c7df873ecc7acabd52a7b4ddc7 -SHA256 (gnome2/gnome-mag-0.14.10.tar.bz2) = d610d637bd6006f2831f751a25ed77c371fcfebbe06104968524d5b78f3a155c -SIZE (gnome2/gnome-mag-0.14.10.tar.bz2) = 505530 +MD5 (gnome2/gnome-mag-0.15.4.tar.bz2) = 77c099335ff2d913ac813e79f127acc0 +SHA256 (gnome2/gnome-mag-0.15.4.tar.bz2) = 1e06e413ceb387da6112e491d4f2ba5291f56e6fb208518fe6574031ea6a1366 +SIZE (gnome2/gnome-mag-0.15.4.tar.bz2) = 516755 diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist index 63d840a09aeb..2b37d9d4a32b 100644 --- a/accessibility/gnome-mag/pkg-plist +++ b/accessibility/gnome-mag/pkg-plist @@ -100,7 +100,7 @@ share/locale/sk/LC_MESSAGES/gnome-mag.mo share/locale/sl/LC_MESSAGES/gnome-mag.mo share/locale/sq/LC_MESSAGES/gnome-mag.mo share/locale/sr/LC_MESSAGES/gnome-mag.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-mag.mo +share/locale/sr@latin/LC_MESSAGES/gnome-mag.mo share/locale/sv/LC_MESSAGES/gnome-mag.mo share/locale/ta/LC_MESSAGES/gnome-mag.mo share/locale/te/LC_MESSAGES/gnome-mag.mo @@ -109,6 +109,8 @@ share/locale/tk/LC_MESSAGES/gnome-mag.mo share/locale/tr/LC_MESSAGES/gnome-mag.mo share/locale/ug/LC_MESSAGES/gnome-mag.mo share/locale/uk/LC_MESSAGES/gnome-mag.mo +share/locale/uz/LC_MESSAGES/gnome-mag.mo +share/locale/uz@cyrillic/LC_MESSAGES/gnome-mag.mo share/locale/vi/LC_MESSAGES/gnome-mag.mo share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo share/locale/zh_HK/LC_MESSAGES/gnome-mag.mo @@ -123,10 +125,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo @dirrm include/gnome-mag-1.0 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile index a740b6ba2fa8..e07a14f35075 100644 --- a/accessibility/gok/Makefile +++ b/accessibility/gok/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@freebsd.org> # # $FreeBSD$ -# $MCom: ports/accessibility/gok/Makefile,v 1.83 2007/10/15 13:40:59 ahze Exp $ +# $MCom: ports/accessibility/gok/Makefile,v 1.89 2008/09/23 14:59:23 kwm Exp $ # PORTNAME= gok -PORTVERSION= 1.3.7 -PORTREVISION= 2 +PORTVERSION= 2.24.0 PORTEPOCH= 1 CATEGORIES= accessibility sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo index 188bcf363494..543df1e91bf2 100644 --- a/accessibility/gok/distinfo +++ b/accessibility/gok/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gok-1.3.7.tar.bz2) = 14b2407604ceec0ffcbf4866fef35502 -SHA256 (gnome2/gok-1.3.7.tar.bz2) = 075442504ab2179484cfb02bc062ba5861efc5f34286702b17f488b80ea242d5 -SIZE (gnome2/gok-1.3.7.tar.bz2) = 1293913 +MD5 (gnome2/gok-2.24.0.tar.bz2) = 3fff3dee0d673eef32ab149d4a0a480e +SHA256 (gnome2/gok-2.24.0.tar.bz2) = a09d7cbb7843633c993460f4e6b22c7c54166d4257313cd8b79cb77dd2791359 +SIZE (gnome2/gok-2.24.0.tar.bz2) = 1304251 diff --git a/accessibility/gok/files/patch-gok_main.c b/accessibility/gok/files/patch-gok_main.c deleted file mode 100644 index dc2a6ba45e07..000000000000 --- a/accessibility/gok/files/patch-gok_main.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gok/main.c.orig 2007-10-13 16:43:20.000000000 -0400 -+++ gok/main.c 2007-10-13 16:47:05.000000000 -0400 -@@ -1229,6 +1229,7 @@ static gboolean gok_main_xevie_io (GIOCh - { - #ifdef HAVE_XEVIE - while (xevie_dpy && XPending (xevie_dpy)) { -+ XEvent xevie_event; - XMotionEvent *motion_event; - gboolean has_active_key = gok_scanner_key_is_active (); - /* Xevie has a motion event for us to check */ diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist index 0bbd7c51418e..247ac45a6728 100644 --- a/accessibility/gok/pkg-plist +++ b/accessibility/gok/pkg-plist @@ -63,6 +63,16 @@ share/applications/gok.desktop %%DOCSDIR%%/up.png share/gnome/help/gok/C/gok.xml share/gnome/help/gok/C/legal.xml +%%DATADIR%%/C/gok-controls.kbd +%%DATADIR%%/C/hide.kbd +%%DATADIR%%/C/launcher.kbd +%%DATADIR%%/C/main.kbd +%%DATADIR%%/C/mouse.kbd +%%DATADIR%%/C/move-resize.kbd +%%DATADIR%%/C/numberpad.kbd +%%DATADIR%%/C/quit.kbd +%%DATADIR%%/C/text-operations.kbd +%%DATADIR%%/C/valuator.kbd %%DATADIR%%/East.png %%DATADIR%%/Keyboard.kbd %%DATADIR%%/NE.png @@ -102,6 +112,16 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/ar/quit.kbd %%DATADIR%%/ar/text-operations.kbd %%DATADIR%%/ar/valuator.kbd +%%DATADIR%%/as/gok-controls.kbd +%%DATADIR%%/as/hide.kbd +%%DATADIR%%/as/launcher.kbd +%%DATADIR%%/as/main.kbd +%%DATADIR%%/as/mouse.kbd +%%DATADIR%%/as/move-resize.kbd +%%DATADIR%%/as/numberpad.kbd +%%DATADIR%%/as/quit.kbd +%%DATADIR%%/as/text-operations.kbd +%%DATADIR%%/as/valuator.kbd %%DATADIR%%/automatic-scanning.xam %%DATADIR%%/az/gok-controls.kbd %%DATADIR%%/az/hide.kbd @@ -329,7 +349,6 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/gl/text-operations.kbd %%DATADIR%%/gl/valuator.kbd %%DATADIR%%/glade/gok.glade2 -%%DATADIR%%/gok-controls.kbd %%DATADIR%%/gok.rc %%DATADIR%%/goklogo.png %%DATADIR%%/goksound1.wav @@ -344,6 +363,16 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/gu/quit.kbd %%DATADIR%%/gu/text-operations.kbd %%DATADIR%%/gu/valuator.kbd +%%DATADIR%%/he/gok-controls.kbd +%%DATADIR%%/he/hide.kbd +%%DATADIR%%/he/launcher.kbd +%%DATADIR%%/he/main.kbd +%%DATADIR%%/he/mouse.kbd +%%DATADIR%%/he/move-resize.kbd +%%DATADIR%%/he/numberpad.kbd +%%DATADIR%%/he/quit.kbd +%%DATADIR%%/he/text-operations.kbd +%%DATADIR%%/he/valuator.kbd %%DATADIR%%/hi/gok-controls.kbd %%DATADIR%%/hi/hide.kbd %%DATADIR%%/hi/launcher.kbd @@ -354,7 +383,6 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/hi/quit.kbd %%DATADIR%%/hi/text-operations.kbd %%DATADIR%%/hi/valuator.kbd -%%DATADIR%%/hide.kbd %%DATADIR%%/hr/gok-controls.kbd %%DATADIR%%/hr/hide.kbd %%DATADIR%%/hr/launcher.kbd @@ -416,6 +444,16 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/ka/quit.kbd %%DATADIR%%/ka/text-operations.kbd %%DATADIR%%/ka/valuator.kbd +%%DATADIR%%/kn/gok-controls.kbd +%%DATADIR%%/kn/hide.kbd +%%DATADIR%%/kn/launcher.kbd +%%DATADIR%%/kn/main.kbd +%%DATADIR%%/kn/mouse.kbd +%%DATADIR%%/kn/move-resize.kbd +%%DATADIR%%/kn/numberpad.kbd +%%DATADIR%%/kn/quit.kbd +%%DATADIR%%/kn/text-operations.kbd +%%DATADIR%%/kn/valuator.kbd %%DATADIR%%/ko/gok-controls.kbd %%DATADIR%%/ko/hide.kbd %%DATADIR%%/ko/launcher.kbd @@ -437,7 +475,6 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/ku/text-operations.kbd %%DATADIR%%/ku/valuator.kbd %%DATADIR%%/latched.png -%%DATADIR%%/launcher.kbd %%DATADIR%%/locked.png %%DATADIR%%/lt/gok-controls.kbd %%DATADIR%%/lt/hide.kbd @@ -459,7 +496,6 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/lv/quit.kbd %%DATADIR%%/lv/text-operations.kbd %%DATADIR%%/lv/valuator.kbd -%%DATADIR%%/main.kbd %%DATADIR%%/manage.kbd %%DATADIR%%/mk/gok-controls.kbd %%DATADIR%%/mk/hide.kbd @@ -491,8 +527,6 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/mn/quit.kbd %%DATADIR%%/mn/text-operations.kbd %%DATADIR%%/mn/valuator.kbd -%%DATADIR%%/mouse.kbd -%%DATADIR%%/move-resize.kbd %%DATADIR%%/mr/gok-controls.kbd %%DATADIR%%/mr/hide.kbd %%DATADIR%%/mr/launcher.kbd @@ -543,7 +577,16 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/nl/quit.kbd %%DATADIR%%/nl/text-operations.kbd %%DATADIR%%/nl/valuator.kbd -%%DATADIR%%/numberpad.kbd +%%DATADIR%%/nn/gok-controls.kbd +%%DATADIR%%/nn/hide.kbd +%%DATADIR%%/nn/launcher.kbd +%%DATADIR%%/nn/main.kbd +%%DATADIR%%/nn/mouse.kbd +%%DATADIR%%/nn/move-resize.kbd +%%DATADIR%%/nn/numberpad.kbd +%%DATADIR%%/nn/quit.kbd +%%DATADIR%%/nn/text-operations.kbd +%%DATADIR%%/nn/valuator.kbd %%DATADIR%%/oc/gok-controls.kbd %%DATADIR%%/oc/hide.kbd %%DATADIR%%/oc/launcher.kbd @@ -604,7 +647,6 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/pt_BR/quit.kbd %%DATADIR%%/pt_BR/text-operations.kbd %%DATADIR%%/pt_BR/valuator.kbd -%%DATADIR%%/quit.kbd %%DATADIR%%/qwerty.kbd %%DATADIR%%/ro/gok-controls.kbd %%DATADIR%%/ro/hide.kbd @@ -689,16 +731,16 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/sr/quit.kbd %%DATADIR%%/sr/text-operations.kbd %%DATADIR%%/sr/valuator.kbd -%%DATADIR%%/sr@Latn/gok-controls.kbd -%%DATADIR%%/sr@Latn/hide.kbd -%%DATADIR%%/sr@Latn/launcher.kbd -%%DATADIR%%/sr@Latn/main.kbd -%%DATADIR%%/sr@Latn/mouse.kbd -%%DATADIR%%/sr@Latn/move-resize.kbd -%%DATADIR%%/sr@Latn/numberpad.kbd -%%DATADIR%%/sr@Latn/quit.kbd -%%DATADIR%%/sr@Latn/text-operations.kbd -%%DATADIR%%/sr@Latn/valuator.kbd +%%DATADIR%%/sr@latin/gok-controls.kbd +%%DATADIR%%/sr@latin/hide.kbd +%%DATADIR%%/sr@latin/launcher.kbd +%%DATADIR%%/sr@latin/main.kbd +%%DATADIR%%/sr@latin/mouse.kbd +%%DATADIR%%/sr@latin/move-resize.kbd +%%DATADIR%%/sr@latin/numberpad.kbd +%%DATADIR%%/sr@latin/quit.kbd +%%DATADIR%%/sr@latin/text-operations.kbd +%%DATADIR%%/sr@latin/valuator.kbd %%DATADIR%%/sv/gok-controls.kbd %%DATADIR%%/sv/hide.kbd %%DATADIR%%/sv/launcher.kbd @@ -729,7 +771,6 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/te/quit.kbd %%DATADIR%%/te/text-operations.kbd %%DATADIR%%/te/valuator.kbd -%%DATADIR%%/text-operations.kbd %%DATADIR%%/th/gok-controls.kbd %%DATADIR%%/th/hide.kbd %%DATADIR%%/th/launcher.kbd @@ -760,7 +801,6 @@ share/gnome/help/gok/C/legal.xml %%DATADIR%%/uk/quit.kbd %%DATADIR%%/uk/text-operations.kbd %%DATADIR%%/uk/valuator.kbd -%%DATADIR%%/valuator.kbd %%DATADIR%%/value-fast-less.png %%DATADIR%%/value-fast-more.png %%DATADIR%%/value-less.png @@ -811,6 +851,7 @@ share/icons/hicolor/48x48/apps/gok.png share/locale/am/LC_MESSAGES/gok.mo share/locale/ang/LC_MESSAGES/gok.mo share/locale/ar/LC_MESSAGES/gok.mo +share/locale/as/LC_MESSAGES/gok.mo share/locale/az/LC_MESSAGES/gok.mo share/locale/be/LC_MESSAGES/gok.mo share/locale/bg/LC_MESSAGES/gok.mo @@ -834,6 +875,7 @@ share/locale/fr/LC_MESSAGES/gok.mo share/locale/ga/LC_MESSAGES/gok.mo share/locale/gl/LC_MESSAGES/gok.mo share/locale/gu/LC_MESSAGES/gok.mo +share/locale/he/LC_MESSAGES/gok.mo share/locale/hi/LC_MESSAGES/gok.mo share/locale/hr/LC_MESSAGES/gok.mo share/locale/hu/LC_MESSAGES/gok.mo @@ -841,6 +883,7 @@ share/locale/id/LC_MESSAGES/gok.mo share/locale/it/LC_MESSAGES/gok.mo share/locale/ja/LC_MESSAGES/gok.mo share/locale/ka/LC_MESSAGES/gok.mo +share/locale/kn/LC_MESSAGES/gok.mo share/locale/ko/LC_MESSAGES/gok.mo share/locale/ku/LC_MESSAGES/gok.mo share/locale/lt/LC_MESSAGES/gok.mo @@ -853,6 +896,7 @@ share/locale/ms/LC_MESSAGES/gok.mo share/locale/nb/LC_MESSAGES/gok.mo share/locale/ne/LC_MESSAGES/gok.mo share/locale/nl/LC_MESSAGES/gok.mo +share/locale/nn/LC_MESSAGES/gok.mo share/locale/oc/LC_MESSAGES/gok.mo share/locale/or/LC_MESSAGES/gok.mo share/locale/pa/LC_MESSAGES/gok.mo @@ -867,7 +911,7 @@ share/locale/sk/LC_MESSAGES/gok.mo share/locale/sl/LC_MESSAGES/gok.mo share/locale/sq/LC_MESSAGES/gok.mo share/locale/sr/LC_MESSAGES/gok.mo -share/locale/sr@Latn/LC_MESSAGES/gok.mo +share/locale/sr@latin/LC_MESSAGES/gok.mo share/locale/sv/LC_MESSAGES/gok.mo share/locale/ta/LC_MESSAGES/gok.mo share/locale/te/LC_MESSAGES/gok.mo @@ -891,7 +935,7 @@ share/pixmaps/gok.png @dirrm %%DATADIR%%/te @dirrm %%DATADIR%%/ta @dirrm %%DATADIR%%/sv -@dirrm %%DATADIR%%/sr@Latn +@dirrm %%DATADIR%%/sr@latin @dirrm %%DATADIR%%/sr @dirrm %%DATADIR%%/sq @dirrm %%DATADIR%%/sl @@ -906,6 +950,7 @@ share/pixmaps/gok.png @dirrm %%DATADIR%%/pa @dirrm %%DATADIR%%/or @dirrm %%DATADIR%%/oc +@dirrm %%DATADIR%%/nn @dirrm %%DATADIR%%/nl @dirrm %%DATADIR%%/ne @dirrm %%DATADIR%%/nb @@ -918,6 +963,7 @@ share/pixmaps/gok.png @dirrm %%DATADIR%%/lt @dirrm %%DATADIR%%/ku @dirrm %%DATADIR%%/ko +@dirrm %%DATADIR%%/kn @dirrm %%DATADIR%%/ka @dirrm %%DATADIR%%/ja @dirrm %%DATADIR%%/it @@ -925,6 +971,7 @@ share/pixmaps/gok.png @dirrm %%DATADIR%%/hu @dirrm %%DATADIR%%/hr @dirrm %%DATADIR%%/hi +@dirrm %%DATADIR%%/he @dirrm %%DATADIR%%/gu @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%%/gl @@ -949,17 +996,22 @@ share/pixmaps/gok.png @dirrm %%DATADIR%%/bg @dirrm %%DATADIR%%/be @dirrm %%DATADIR%%/az +@dirrm %%DATADIR%%/as @dirrm %%DATADIR%%/ar @dirrm %%DATADIR%%/ang @dirrm %%DATADIR%%/am +@dirrm %%DATADIR%%/C @dirrm %%DATADIR%% @dirrm share/gnome/help/gok/C @dirrm share/gnome/help/gok @dirrm %%DOCSDIR%% +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -974,6 +1026,7 @@ share/pixmaps/gok.png @dirrmtry share/locale/dz @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/ang/LC_MESSAGES @dirrmtry share/locale/ang -@dirrmtry share/applications diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile index 446ddd77ad57..543e9ab67f50 100644 --- a/accessibility/mousetweaks/Makefile +++ b/accessibility/mousetweaks/Makefile @@ -3,11 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.7 2008/03/10 21:35:20 mezz Exp $ +# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.22 2008/11/25 01:01:35 marcus Exp $ # PORTNAME= mousetweaks -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 CATEGORIES= accessibility MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,6 +20,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack atspi USE_GMAKE= yes USE_GETTEXT= yes +INSTALLS_OMF= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo index cff261041358..e7197c16ca9a 100644 --- a/accessibility/mousetweaks/distinfo +++ b/accessibility/mousetweaks/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/mousetweaks-2.22.3.tar.bz2) = bf36afbea857e49d32e5aefc29f94440 -SHA256 (gnome2/mousetweaks-2.22.3.tar.bz2) = bbabe9ed843d62423764ebeec5ae9830f1151b96940446893914dbd1b4c7125d -SIZE (gnome2/mousetweaks-2.22.3.tar.bz2) = 779826 +MD5 (gnome2/mousetweaks-2.24.2.tar.bz2) = 1361c2171ca2025adf60c54ea211287c +SHA256 (gnome2/mousetweaks-2.24.2.tar.bz2) = fc0c272b506de4262d89d256a273cc3af35a5f0b9d56cc67c96e1bae0562f752 +SIZE (gnome2/mousetweaks-2.24.2.tar.bz2) = 677823 diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist index 1a4b6b1c46a7..4629af66dcf3 100644 --- a/accessibility/mousetweaks/pkg-plist +++ b/accessibility/mousetweaks/pkg-plist @@ -3,7 +3,6 @@ bin/mousetweaks bin/pointer-capture-applet libdata/bonobo/servers/DwellClick_Factory.server libdata/bonobo/servers/PointerCapture_Factory.server -share/gnome/help/mousetweaks/C/figures/mouse-a11y-add-applet-to-panel-window.png share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-checkbox.png share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-click-type-applet.png share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-click-type-window.png @@ -20,7 +19,6 @@ share/gnome/help/mousetweaks/C/figures/mouse-a11y-ssc-delay-slider.png share/gnome/help/mousetweaks/C/figures/mouse-a11y-tab.png share/gnome/help/mousetweaks/C/legal.xml share/gnome/help/mousetweaks/C/mousetweaks.xml -share/gnome/help/mousetweaks/el/figures/mouse-a11y-add-applet-to-panel-window.png share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-checkbox.png share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-click-type-applet.png share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-click-type-window.png @@ -35,9 +33,7 @@ share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-preferences.p share/gnome/help/mousetweaks/el/figures/mouse-a11y-ssc-checkbox.png share/gnome/help/mousetweaks/el/figures/mouse-a11y-ssc-delay-slider.png share/gnome/help/mousetweaks/el/figures/mouse-a11y-tab.png -share/gnome/help/mousetweaks/el/legal.xml share/gnome/help/mousetweaks/el/mousetweaks.xml -share/gnome/help/mousetweaks/es/figures/mouse-a11y-add-applet-to-panel-window.png share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-checkbox.png share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-click-type-applet.png share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-click-type-window.png @@ -52,9 +48,7 @@ share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-preferences.p share/gnome/help/mousetweaks/es/figures/mouse-a11y-ssc-checkbox.png share/gnome/help/mousetweaks/es/figures/mouse-a11y-ssc-delay-slider.png share/gnome/help/mousetweaks/es/figures/mouse-a11y-tab.png -share/gnome/help/mousetweaks/es/legal.xml share/gnome/help/mousetweaks/es/mousetweaks.xml -share/gnome/help/mousetweaks/oc/figures/mouse-a11y-add-applet-to-panel-window.png share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-checkbox.png share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-click-type-applet.png share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-click-type-window.png @@ -69,9 +63,7 @@ share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-preferences.p share/gnome/help/mousetweaks/oc/figures/mouse-a11y-ssc-checkbox.png share/gnome/help/mousetweaks/oc/figures/mouse-a11y-ssc-delay-slider.png share/gnome/help/mousetweaks/oc/figures/mouse-a11y-tab.png -share/gnome/help/mousetweaks/oc/legal.xml share/gnome/help/mousetweaks/oc/mousetweaks.xml -share/gnome/help/mousetweaks/sv/figures/mouse-a11y-add-applet-to-panel-window.png share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-checkbox.png share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-click-type-applet.png share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-click-type-window.png @@ -86,10 +78,10 @@ share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-preferences.p share/gnome/help/mousetweaks/sv/figures/mouse-a11y-ssc-checkbox.png share/gnome/help/mousetweaks/sv/figures/mouse-a11y-ssc-delay-slider.png share/gnome/help/mousetweaks/sv/figures/mouse-a11y-tab.png -share/gnome/help/mousetweaks/sv/legal.xml share/gnome/help/mousetweaks/sv/mousetweaks.xml share/locale/ar/LC_MESSAGES/mousetweaks.mo share/locale/bg/LC_MESSAGES/mousetweaks.mo +share/locale/bn_IN/LC_MESSAGES/mousetweaks.mo share/locale/ca/LC_MESSAGES/mousetweaks.mo share/locale/cs/LC_MESSAGES/mousetweaks.mo share/locale/da/LC_MESSAGES/mousetweaks.mo @@ -97,10 +89,13 @@ share/locale/de/LC_MESSAGES/mousetweaks.mo share/locale/el/LC_MESSAGES/mousetweaks.mo share/locale/en_GB/LC_MESSAGES/mousetweaks.mo share/locale/es/LC_MESSAGES/mousetweaks.mo +share/locale/et/LC_MESSAGES/mousetweaks.mo share/locale/eu/LC_MESSAGES/mousetweaks.mo share/locale/fi/LC_MESSAGES/mousetweaks.mo share/locale/fr/LC_MESSAGES/mousetweaks.mo share/locale/gl/LC_MESSAGES/mousetweaks.mo +share/locale/gu/LC_MESSAGES/mousetweaks.mo +share/locale/he/LC_MESSAGES/mousetweaks.mo share/locale/hi/LC_MESSAGES/mousetweaks.mo share/locale/hu/LC_MESSAGES/mousetweaks.mo share/locale/it/LC_MESSAGES/mousetweaks.mo @@ -114,12 +109,14 @@ share/locale/nb/LC_MESSAGES/mousetweaks.mo share/locale/nl/LC_MESSAGES/mousetweaks.mo share/locale/nn/LC_MESSAGES/mousetweaks.mo share/locale/oc/LC_MESSAGES/mousetweaks.mo +share/locale/or/LC_MESSAGES/mousetweaks.mo share/locale/pa/LC_MESSAGES/mousetweaks.mo share/locale/pl/LC_MESSAGES/mousetweaks.mo share/locale/pt/LC_MESSAGES/mousetweaks.mo share/locale/pt_BR/LC_MESSAGES/mousetweaks.mo share/locale/ru/LC_MESSAGES/mousetweaks.mo share/locale/sl/LC_MESSAGES/mousetweaks.mo +share/locale/sq/LC_MESSAGES/mousetweaks.mo share/locale/sv/LC_MESSAGES/mousetweaks.mo share/locale/ta/LC_MESSAGES/mousetweaks.mo share/locale/th/LC_MESSAGES/mousetweaks.mo @@ -132,12 +129,18 @@ share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo %%DATADIR%%/DwellClick.xml %%DATADIR%%/PointerCapture.xml %%DATADIR%%/ctw.glade +%%DATADIR%%/double-click.png +%%DATADIR%%/drag-click.png %%DATADIR%%/dwell-click-applet.glade -%%DATADIR%%/human-double.png -%%DATADIR%%/human-drag.png -%%DATADIR%%/human-right.png -%%DATADIR%%/human-single.png %%DATADIR%%/pointer-capture-applet.glade +%%DATADIR%%/right-click.png +%%DATADIR%%/single-click.png +share/omf/mousetweaks/mousetweaks-C.omf +share/omf/mousetweaks/mousetweaks-el.omf +share/omf/mousetweaks/mousetweaks-es.omf +share/omf/mousetweaks/mousetweaks-oc.omf +share/omf/mousetweaks/mousetweaks-sv.omf +@dirrm share/omf/mousetweaks @dirrm %%DATADIR%% @dirrm share/gnome/help/mousetweaks/sv/figures @dirrm share/gnome/help/mousetweaks/sv @@ -156,3 +159,5 @@ share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index 608fa0e0fcc7..36205dd2346b 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/orca/Makefile,v 1.42 2008/03/10 00:56:17 mezz Exp $ +# $MCom: ports/accessibility/orca/Makefile,v 1.58 2008/11/25 05:37:04 mezz Exp $ # PORTNAME= orca -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,7 +15,9 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Scriptable screen reader +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus LIB_DEPENDS= gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus LATEST_LINK= gnome-orca @@ -23,7 +25,8 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_PYTHON= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2 +USE_GNOME= gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2 \ + pygnomedesktop INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo index 9f07eaeecad8..15b796b0b5be 100644 --- a/accessibility/orca/distinfo +++ b/accessibility/orca/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/orca-2.22.3.tar.bz2) = cc0ca608caff98f265b4a040dbc3d170 -SHA256 (gnome2/orca-2.22.3.tar.bz2) = 71cddc670282264a872568677ea03b6d3b97bdd2c790206f911c4ce59dbb7277 -SIZE (gnome2/orca-2.22.3.tar.bz2) = 1801770 +MD5 (gnome2/orca-2.24.2.tar.bz2) = 2235902841d39b46168c30a160f7afe2 +SHA256 (gnome2/orca-2.24.2.tar.bz2) = 7eddb03f32a5668365446fe3d3e788928d82b98d6bf3ed7826e87247eed698c7 +SIZE (gnome2/orca-2.24.2.tar.bz2) = 2125637 diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in index ec31af2bc8c3..484b6de03461 100644 --- a/accessibility/orca/files/patch-src_orca_orca.in +++ b/accessibility/orca/files/patch-src_orca_orca.in @@ -1,5 +1,5 @@ ---- src/orca/orca.in.orig 2008-05-26 16:22:08.000000000 -0500 -+++ src/orca/orca.in 2008-05-26 16:25:53.000000000 -0500 +--- src/orca/orca.in.orig 2008-10-16 14:56:18.000000000 -0500 ++++ src/orca/orca.in 2008-10-16 15:04:04.000000000 -0500 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -13,44 +13,32 @@ -export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin" +export PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/local/bin" - # If you set RUNONCE to "true", then this will just run Orca once and quit. + # Save the arguments away. # -@@ -74,7 +74,7 @@ +@@ -83,7 +83,7 @@ cleanup() { USERID=`id | cut -f2 -d= | cut -f1 -d\(` -- PIDS=`ps -eo pid,ruid,args | grep $USERID | egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | grep -v grep | awk '{ print $1 }'` -+ PIDS=`ps -exo pid,ruid,args | grep $USERID | egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | grep -v grep | awk '{ print $1 }'` - +- PIDS=`ps -eo pid,ruid,args | grep $USERID | \ ++ PIDS=`ps -exo pid,ruid,args | grep $USERID | \ + egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | \ + grep -v grep | awk '{ print $1 }'` IFS=' - ' -@@ -145,7 +145,7 @@ - do - sleep 5 - USERID=`id | cut -f2 -d= | cut -f1 -d\(` -- PID=`ps -eo pid,ruid,args | grep $USERID | egrep "orca[.]orca" | grep -v grep | awk '{ print $1 }'` -+ PID=`ps -exo pid,ruid,args | grep $USERID | egrep "orca[.]orca" | grep -v grep | awk '{ print $1 }'` +@@ -137,7 +137,7 @@ + fi + fi - if [ "x$PID" = "x" ] - then -@@ -258,7 +258,7 @@ - then - main - else -- if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] -+ if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] - then - cleanup +-if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then ++if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] ; then + # If the user has done -q or --quit, that means to tell any + # existing orca process to quit. So, we just do a cleanup. + # +@@ -154,7 +154,7 @@ + if [ "x$ARGS" = "x" ] ; then + CLEANUP=1 else -@@ -270,9 +270,9 @@ - # erroneously types an illegal command line argument, the - # help text is emitted and the other orca is not killed. - # -- if [ `egrep -c "\-s|\-g|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ] -+ if [ `echo $ARGS | egrep -c "\-s|\-g|\-n|\-u|\-e|\-d"` -eq 0 ] - then -- if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ] -+ if [ `echo $ARGS | egrep -c "\-t"` -eq 0 ] - then - runOrca "NO_CLEANUP" - else +- CLEANUP=`egrep -c "\-s|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` ++ CLEANUP=`echo $ARGS | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"` + fi + + # Clean up before running orca to get anything that might diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist index 2525d4526715..3483c5493b5f 100644 --- a/accessibility/orca/pkg-plist +++ b/accessibility/orca/pkg-plist @@ -1,10 +1,4 @@ bin/orca -%%PYTHON_SITELIBDIR%%/orca/Gecko.py -%%PYTHON_SITELIBDIR%%/orca/Gecko.pyc -%%PYTHON_SITELIBDIR%%/orca/Gecko.pyo -%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.py -%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyc -%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyo %%PYTHON_SITELIBDIR%%/orca/__init__.py %%PYTHON_SITELIBDIR%%/orca/__init__.pyc %%PYTHON_SITELIBDIR%%/orca/__init__.pyo @@ -34,6 +28,9 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/chnames.py %%PYTHON_SITELIBDIR%%/orca/chnames.pyc %%PYTHON_SITELIBDIR%%/orca/chnames.pyo +%%PYTHON_SITELIBDIR%%/orca/dbusserver.py +%%PYTHON_SITELIBDIR%%/orca/dbusserver.pyc +%%PYTHON_SITELIBDIR%%/orca/dbusserver.pyo %%PYTHON_SITELIBDIR%%/orca/debug.py %%PYTHON_SITELIBDIR%%/orca/debug.pyc %%PYTHON_SITELIBDIR%%/orca/debug.pyo @@ -79,6 +76,9 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/mag.py %%PYTHON_SITELIBDIR%%/orca/mag.pyc %%PYTHON_SITELIBDIR%%/orca/mag.pyo +%%PYTHON_SITELIBDIR%%/orca/mouse_review.py +%%PYTHON_SITELIBDIR%%/orca/mouse_review.pyc +%%PYTHON_SITELIBDIR%%/orca/mouse_review.pyo %%PYTHON_SITELIBDIR%%/orca/orca.py %%PYTHON_SITELIBDIR%%/orca/orca.pyc %%PYTHON_SITELIBDIR%%/orca/orca.pyo @@ -109,6 +109,9 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/orca_state.py %%PYTHON_SITELIBDIR%%/orca/orca_state.pyc %%PYTHON_SITELIBDIR%%/orca/orca_state.pyo +%%PYTHON_SITELIBDIR%%/orca/outline.py +%%PYTHON_SITELIBDIR%%/orca/outline.pyc +%%PYTHON_SITELIBDIR%%/orca/outline.pyo %%PYTHON_SITELIBDIR%%/orca/outloud.py %%PYTHON_SITELIBDIR%%/orca/outloud.pyc %%PYTHON_SITELIBDIR%%/orca/outloud.pyo @@ -133,84 +136,219 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/script.py %%PYTHON_SITELIBDIR%%/orca/script.pyc %%PYTHON_SITELIBDIR%%/orca/script.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.py -%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.py -%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.py -%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.py -%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.py -%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-screensaver-dialog.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-screensaver-dialog.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-screensaver-dialog.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.py -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.py -%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.py -%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.py -%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.py -%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/planner.py -%%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyo -%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.py -%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.pyc -%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/braille_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/braille_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/braille_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.py +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyo %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/bookmarks.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/bookmarks.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/bookmarks.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyo +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.py +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.pyc +%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.pyo %%PYTHON_SITELIBDIR%%/orca/settings.py %%PYTHON_SITELIBDIR%%/orca/settings.pyc %%PYTHON_SITELIBDIR%%/orca/settings.pyo @@ -226,6 +364,15 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/speechserver.py %%PYTHON_SITELIBDIR%%/orca/speechserver.pyc %%PYTHON_SITELIBDIR%%/orca/speechserver.pyo +%%PYTHON_SITELIBDIR%%/orca/structural_navigation.py +%%PYTHON_SITELIBDIR%%/orca/structural_navigation.pyc +%%PYTHON_SITELIBDIR%%/orca/structural_navigation.pyo +%%PYTHON_SITELIBDIR%%/orca/text_attribute_names.py +%%PYTHON_SITELIBDIR%%/orca/text_attribute_names.pyc +%%PYTHON_SITELIBDIR%%/orca/text_attribute_names.pyo +%%PYTHON_SITELIBDIR%%/orca/tutorialgenerator.py +%%PYTHON_SITELIBDIR%%/orca/tutorialgenerator.pyc +%%PYTHON_SITELIBDIR%%/orca/tutorialgenerator.pyo %%PYTHON_SITELIBDIR%%/orca/where_am_I.py %%PYTHON_SITELIBDIR%%/orca/where_am_I.pyc %%PYTHON_SITELIBDIR%%/orca/where_am_I.pyo @@ -264,6 +411,7 @@ share/locale/kn/LC_MESSAGES/orca.mo share/locale/ko/LC_MESSAGES/orca.mo share/locale/lt/LC_MESSAGES/orca.mo share/locale/lv/LC_MESSAGES/orca.mo +share/locale/mai/LC_MESSAGES/orca.mo share/locale/mk/LC_MESSAGES/orca.mo share/locale/ml/LC_MESSAGES/orca.mo share/locale/mr/LC_MESSAGES/orca.mo @@ -283,7 +431,7 @@ share/locale/si/LC_MESSAGES/orca.mo share/locale/sl/LC_MESSAGES/orca.mo share/locale/sq/LC_MESSAGES/orca.mo share/locale/sr/LC_MESSAGES/orca.mo -share/locale/sr@Latn/LC_MESSAGES/orca.mo +share/locale/sr@latin/LC_MESSAGES/orca.mo share/locale/sv/LC_MESSAGES/orca.mo share/locale/ta/LC_MESSAGES/orca.mo share/locale/te/LC_MESSAGES/orca.mo @@ -301,12 +449,27 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% @dirrmtry share/applications +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird +@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts @dirrm %%PYTHON_SITELIBDIR%%/orca @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -315,6 +478,8 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo @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/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index f5036e40d592..4a14f3b64540 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -3,11 +3,11 @@ # Whom: Anders Nordby <anders@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/archivers/file-roller/Makefile,v 1.136 2008/03/11 18:31:35 mezz Exp $ +# $MCom: ports/archivers/file-roller/Makefile,v 1.150 2008/11/25 16:07:09 marcus Exp $ # PORTNAME= file-roller -PORTVERSION= 2.22.4 +PORTVERSION= 2.24.2 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= GNOME @@ -16,9 +16,6 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An archive manager for zip files, tar, etc -# XXX: We need the ports version of gtar since gtar-1.13.25 included with -# FreeBSD is not sufficient. If the base version of GNU tar is updated, then -# we can do away with this dependency. RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar USE_LDCONFIG= yes diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index b255e3420cf8..6cd446ff2f28 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/file-roller-2.22.4.tar.bz2) = 9cbd597f6e1299f49c7963a1eb2b7533 -SHA256 (gnome2/file-roller-2.22.4.tar.bz2) = fd2493f5c092f18775529ae90c8aaa1519a1f3d4c30869fc6ccb70f4ffcd4dc3 -SIZE (gnome2/file-roller-2.22.4.tar.bz2) = 1280300 +MD5 (gnome2/file-roller-2.24.2.tar.bz2) = 886c5201e8609aadd69798aa745ada4a +SHA256 (gnome2/file-roller-2.24.2.tar.bz2) = 338c326e9bd004cd8554c8838b6d5f486a544a65c2affde6609ca0ea6aa05d0a +SIZE (gnome2/file-roller-2.24.2.tar.bz2) = 1481894 diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 3c8295a177c8..6f34da63b62f 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -15,6 +15,7 @@ share/applications/file-roller.desktop %%DATADIR%%/glade/open-with.glade %%DATADIR%%/glade/password.glade %%DATADIR%%/glade/properties.glade +%%DATADIR%%/glade/new.glade %%DATADIR%%/glade/update.glade %%DATADIR%%/icons/hicolor/16x16/actions/add-files-to-archive.png %%DATADIR%%/icons/hicolor/16x16/actions/add-folder-to-archive.png @@ -22,7 +23,6 @@ share/applications/file-roller.desktop %%DATADIR%%/icons/hicolor/24x24/actions/add-files-to-archive.png %%DATADIR%%/icons/hicolor/24x24/actions/add-folder-to-archive.png %%DATADIR%%/icons/hicolor/24x24/actions/extract-archive.png -%%DATADIR%%/icons/hicolor/24x24/actions/preview-file.png share/gnome/help/file-roller/C/figures/file-roller_home.png share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png share/gnome/help/file-roller/C/figures/file-roller_main_window.png @@ -36,6 +36,12 @@ share/gnome/help/file-roller/bg/figures/file-roller_main_window.png share/gnome/help/file-roller/bg/figures/file-roller_rightarrow.png share/gnome/help/file-roller/bg/figures/file-roller_uparrow.png share/gnome/help/file-roller/bg/file-roller.xml +share/gnome/help/file-roller/ca/figures/file-roller_home.png +share/gnome/help/file-roller/ca/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/ca/figures/file-roller_main_window.png +share/gnome/help/file-roller/ca/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/ca/figures/file-roller_uparrow.png +share/gnome/help/file-roller/ca/file-roller.xml share/gnome/help/file-roller/de/figures/file-roller_home.png share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png share/gnome/help/file-roller/de/figures/file-roller_main_window.png @@ -48,6 +54,12 @@ share/gnome/help/file-roller/es/figures/file-roller_main_window.png share/gnome/help/file-roller/es/figures/file-roller_rightarrow.png share/gnome/help/file-roller/es/figures/file-roller_uparrow.png share/gnome/help/file-roller/es/file-roller.xml +share/gnome/help/file-roller/fi/figures/file-roller_home.png +share/gnome/help/file-roller/fi/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/fi/figures/file-roller_main_window.png +share/gnome/help/file-roller/fi/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/fi/figures/file-roller_uparrow.png +share/gnome/help/file-roller/fi/file-roller.xml share/gnome/help/file-roller/fr/figures/file-roller_home.png share/gnome/help/file-roller/fr/figures/file-roller_leftarrow.png share/gnome/help/file-roller/fr/figures/file-roller_main_window.png @@ -90,11 +102,18 @@ share/gnome/help/file-roller/uk/figures/file-roller_main_window.png share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png share/gnome/help/file-roller/uk/file-roller.xml +share/gnome/help/file-roller/vi/figures/file-roller_home.png +share/gnome/help/file-roller/vi/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/vi/figures/file-roller_main_window.png +share/gnome/help/file-roller/vi/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/vi/figures/file-roller_uparrow.png +share/gnome/help/file-roller/vi/file-roller.xml share/icons/hicolor/16x16/apps/file-roller.png share/icons/hicolor/22x22/apps/file-roller.png share/icons/hicolor/24x24/apps/file-roller.png share/icons/hicolor/32x32/apps/file-roller.png share/icons/hicolor/scalable/apps/file-roller.svg +share/locale/af/LC_MESSAGES/file-roller.mo share/locale/am/LC_MESSAGES/file-roller.mo share/locale/ar/LC_MESSAGES/file-roller.mo share/locale/as/LC_MESSAGES/file-roller.mo @@ -121,6 +140,7 @@ share/locale/eu/LC_MESSAGES/file-roller.mo share/locale/fa/LC_MESSAGES/file-roller.mo share/locale/fi/LC_MESSAGES/file-roller.mo share/locale/fr/LC_MESSAGES/file-roller.mo +share/locale/fur/LC_MESSAGES/file-roller.mo share/locale/ga/LC_MESSAGES/file-roller.mo share/locale/gl/LC_MESSAGES/file-roller.mo share/locale/gu/LC_MESSAGES/file-roller.mo @@ -153,6 +173,7 @@ share/locale/oc/LC_MESSAGES/file-roller.mo share/locale/or/LC_MESSAGES/file-roller.mo share/locale/pa/LC_MESSAGES/file-roller.mo share/locale/pl/LC_MESSAGES/file-roller.mo +share/locale/ps/LC_MESSAGES/file-roller.mo share/locale/pt/LC_MESSAGES/file-roller.mo share/locale/pt_BR/LC_MESSAGES/file-roller.mo share/locale/ro/LC_MESSAGES/file-roller.mo @@ -163,7 +184,7 @@ share/locale/sk/LC_MESSAGES/file-roller.mo share/locale/sl/LC_MESSAGES/file-roller.mo share/locale/sq/LC_MESSAGES/file-roller.mo share/locale/sr/LC_MESSAGES/file-roller.mo -share/locale/sr@Latn/LC_MESSAGES/file-roller.mo +share/locale/sr@latin/LC_MESSAGES/file-roller.mo share/locale/sr@ije/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo share/locale/ta/LC_MESSAGES/file-roller.mo @@ -180,9 +201,11 @@ share/locale/zh_CN/LC_MESSAGES/file-roller.mo share/locale/zh_HK/LC_MESSAGES/file-roller.mo share/locale/zh_TW/LC_MESSAGES/file-roller.mo share/omf/file-roller/file-roller-C.omf +share/omf/file-roller/file-roller-ca.omf share/omf/file-roller/file-roller-bg.omf share/omf/file-roller/file-roller-de.omf share/omf/file-roller/file-roller-es.omf +share/omf/file-roller/file-roller-fi.omf share/omf/file-roller/file-roller-fr.omf share/omf/file-roller/file-roller-it.omf share/omf/file-roller/file-roller-nl.omf @@ -190,7 +213,10 @@ share/omf/file-roller/file-roller-oc.omf share/omf/file-roller/file-roller-ru.omf share/omf/file-roller/file-roller-sv.omf share/omf/file-roller/file-roller-uk.omf +share/omf/file-roller/file-roller-vi.omf @dirrm share/omf/file-roller +@dirrm share/gnome/help/file-roller/vi/figures +@dirrm share/gnome/help/file-roller/vi @dirrm share/gnome/help/file-roller/uk/figures @dirrm share/gnome/help/file-roller/uk @dirrm share/gnome/help/file-roller/sv/figures @@ -205,10 +231,14 @@ share/omf/file-roller/file-roller-uk.omf @dirrm share/gnome/help/file-roller/it @dirrm share/gnome/help/file-roller/fr/figures @dirrm share/gnome/help/file-roller/fr +@dirrm share/gnome/help/file-roller/fi/figures +@dirrm share/gnome/help/file-roller/fi @dirrm share/gnome/help/file-roller/es/figures @dirrm share/gnome/help/file-roller/es @dirrm share/gnome/help/file-roller/de/figures @dirrm share/gnome/help/file-roller/de +@dirrm share/gnome/help/file-roller/ca/figures +@dirrm share/gnome/help/file-roller/ca @dirrm share/gnome/help/file-roller/bg/figures @dirrm share/gnome/help/file-roller/bg @dirrm share/gnome/help/file-roller/C/figures @@ -237,12 +267,16 @@ share/omf/file-roller/file-roller-uk.omf @dirrmtry share/locale/ur @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -253,6 +287,8 @@ share/omf/file-roller/file-roller-uk.omf @dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile index 2d60deb07de1..d9b070c86c0e 100644 --- a/astro/glunarclock/Makefile +++ b/astro/glunarclock/Makefile @@ -3,7 +3,8 @@ # Whom: Vincent Tantardini <vinc@freebsd-fr.org> # # $FreeBSD$ -# $MCom: ports/astro/glunarclock/Makefile,v 1.8 2008/03/20 18:57:15 mezz Exp $ +# $MCom: ports/astro/glunarclock/Makefile,v 1.10 2008/08/23 18:22:58 mezz Exp $ +# PORTNAME= glunarclock PORTVERSION= 0.32.4 @@ -17,7 +18,7 @@ COMMENT= GNOME applet that displays the current phase of the Moon LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier -USE_GNOME= gail gnomehack gnomepanel gnomeprefix gnometarget intlhack +USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/audio/Makefile b/audio/Makefile index d93960a2046b..39b3f6f926d8 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -193,6 +193,7 @@ SUBDIR += fmio SUBDIR += fmit SUBDIR += freealut + SUBDIR += freedesktop-sound-theme SUBDIR += freepats SUBDIR += funktrackergold SUBDIR += gai-album diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 8f0f1e4735b3..71c50a2fd1fd 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -3,10 +3,11 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/esound/Makefile,v 1.1 2008/11/20 19:38:24 marcus Exp $ # PORTNAME= esound -PORTVERSION= 0.2.40 +PORTVERSION= 0.2.41 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2 diff --git a/audio/esound/distinfo b/audio/esound/distinfo index 571cce564ad1..d33ab14b52c7 100644 --- a/audio/esound/distinfo +++ b/audio/esound/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/esound-0.2.40.tar.bz2) = e9009889ab81269f3021ebcad8addb96 -SHA256 (gnome/esound-0.2.40.tar.bz2) = 74b6d9f3dd68ee0b8d95d4d2c78cbd913807cb6c0739d05d8dd75a73fc84d4a7 -SIZE (gnome/esound-0.2.40.tar.bz2) = 423798 +MD5 (gnome/esound-0.2.41.tar.bz2) = 8d9aad3d94d15e0d59ba9dc0ea990c6c +SHA256 (gnome/esound-0.2.41.tar.bz2) = 5eb5dd29a64b3462a29a5b20652aba7aa926742cef43577bf0796b787ca34911 +SIZE (gnome/esound-0.2.41.tar.bz2) = 396474 diff --git a/audio/esound/files/patch-ad b/audio/esound/files/patch-ad index c2059f5d0703..68018a173ede 100644 --- a/audio/esound/files/patch-ad +++ b/audio/esound/files/patch-ad @@ -1,5 +1,5 @@ ---- esdlib.c.orig 2008-07-30 17:08:59.000000000 -0400 -+++ esdlib.c 2008-09-07 22:19:48.000000000 -0400 +--- esdlib.c.orig 2008-11-18 15:35:19.000000000 -0500 ++++ esdlib.c 2008-11-20 14:32:59.000000000 -0500 @@ -21,6 +21,8 @@ #include <errno.h> #include <sys/wait.h> @@ -9,17 +9,16 @@ #include <sys/un.h> -@@ -895,8 +897,7 @@ int esd_open_sound( const char *host ) - setsid(); - cmd = malloc(strlen(SERVERDIR"/esd -spawnfd 999999") + (esd_spawn_options?strlen(esd_spawn_options):0)); +@@ -928,7 +930,7 @@ int esd_open_sound( const char *rhost ) + putenv(preload2); + } + cmd = malloc(strlen(SERVERDIR"/esd -spawnfd 9999999999") + strlen(esd_spawn_options)); +- sprintf(cmd, "%s/esd %s -spawnfd %d", SERVERDIR, esd_spawn_options, esd_pipe[1]); ++ sprintf(cmd, "exec esd %s -spawnfd %d", esd_spawn_options?esd_spawn_options:"", esd_pipe[1]); -- sprintf(cmd, "%s/esd %s -spawnfd %d", SERVERDIR, esd_spawn_options?esd_spawn_options:"", esd_pipe[1]); -- -+ sprintf(cmd, "exec esd %s -spawnfd %d", esd_spawn_options?esd_spawn_options:"", esd_pipe[1]); - execl("/bin/sh", "/bin/sh", "-c", cmd, NULL); - perror("execl"); - _exit(1); -@@ -1709,3 +1710,34 @@ int esd_close( int esd ) + if(!fork()) { + /* child of child process. Minimal so startup overhead is +@@ -1747,3 +1749,34 @@ int esd_close( int esd ) return close( esd ); } diff --git a/audio/esound/files/patch-esddsp.c b/audio/esound/files/patch-esddsp.c index 3ea9a1c61369..3c24fc97e477 100644 --- a/audio/esound/files/patch-esddsp.c +++ b/audio/esound/files/patch-esddsp.c @@ -1,6 +1,14 @@ ---- esddsp.c.orig 2008-07-15 11:47:20.000000000 -0400 -+++ esddsp.c 2008-07-17 13:58:09.000000000 -0400 -@@ -220,16 +220,19 @@ open_wrapper (int (*func) (const char *, +--- esddsp.c.orig 2008-11-18 15:35:19.000000000 -0500 ++++ esddsp.c 2008-11-20 14:35:02.000000000 -0500 +@@ -70,6 +70,7 @@ + + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__bsdi__) + typedef unsigned long request_t; ++typedef off_t off64_t; + #else + typedef int request_t; + #endif +@@ -228,16 +229,19 @@ open_wrapper (int (*func) (const char *, const char *pathname, int flags, ...) { va_list args; @@ -25,7 +33,7 @@ if (!strcmp (pathname, "/dev/dsp")) { -@@ -260,7 +263,7 @@ open (const char *pathname, int flags, . +@@ -268,7 +272,7 @@ open (const char *pathname, int flags, . { static int (*func) (const char *, int, mode_t) = NULL; va_list args; @@ -34,7 +42,7 @@ DPRINTF ("open\n"); -@@ -275,9 +278,12 @@ open (const char *pathname, int flags, . +@@ -283,9 +287,12 @@ open (const char *pathname, int flags, . } } @@ -50,7 +58,7 @@ return open_wrapper(func, pathname, flags, mode); } -@@ -287,7 +293,7 @@ open64 (const char *pathname, int flags, +@@ -295,7 +302,7 @@ open64 (const char *pathname, int flags, { static int (*func) (const char *, int, mode_t) = NULL; va_list args; @@ -59,7 +67,7 @@ DPRINTF ("open64\n"); -@@ -302,9 +308,12 @@ open64 (const char *pathname, int flags, +@@ -310,9 +317,12 @@ open64 (const char *pathname, int flags, } } diff --git a/audio/freedesktop-sound-theme/Makefile b/audio/freedesktop-sound-theme/Makefile new file mode 100644 index 000000000000..35afe0e2a925 --- /dev/null +++ b/audio/freedesktop-sound-theme/Makefile @@ -0,0 +1,24 @@ +# New ports collection makefile for: freedesktop-sound-theme +# Date created: 15 August 2008 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/audio/freedesktop-sound-theme/Makefile,v 1.2 2008/12/21 20:39:32 marcus Exp $ +# + +PORTNAME= freedesktop-sound-theme +PORTVERSION= 0.2 +CATEGORIES= audio gnome +MASTER_SITES= http://people.freedesktop.org/~mccann/dist/ +DISTNAME= sound-theme-freedesktop-${PORTVERSION} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Sound theme based on the FreeDesktop specification + +USE_BZIP2= yes +USE_GNOME= gnomehier intlhack +USE_GETTEXT= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes + +.include <bsd.port.mk> diff --git a/audio/freedesktop-sound-theme/distinfo b/audio/freedesktop-sound-theme/distinfo new file mode 100644 index 000000000000..decd5b7ce5d6 --- /dev/null +++ b/audio/freedesktop-sound-theme/distinfo @@ -0,0 +1,3 @@ +MD5 (sound-theme-freedesktop-0.2.tar.bz2) = 45c8383071d5c6514aa1899e2d0fc675 +SHA256 (sound-theme-freedesktop-0.2.tar.bz2) = cc7b5320bef9088d77aa11e6041bf6019152dac51cc7beef7a256484faf5b683 +SIZE (sound-theme-freedesktop-0.2.tar.bz2) = 852304 diff --git a/audio/freedesktop-sound-theme/pkg-descr b/audio/freedesktop-sound-theme/pkg-descr new file mode 100644 index 000000000000..58ba667da676 --- /dev/null +++ b/audio/freedesktop-sound-theme/pkg-descr @@ -0,0 +1,3 @@ +This is a sound theme based on the FreeDesktop sound theme specification. + +WWW: http://freedesktop.org/wiki/Specifications/sound-theme-spec diff --git a/audio/freedesktop-sound-theme/pkg-plist b/audio/freedesktop-sound-theme/pkg-plist new file mode 100644 index 000000000000..43a95d6b96a2 --- /dev/null +++ b/audio/freedesktop-sound-theme/pkg-plist @@ -0,0 +1,43 @@ +share/sounds/freedesktop/index.theme +share/sounds/freedesktop/stereo/audio-channel-front-center.ogg +share/sounds/freedesktop/stereo/audio-channel-front-left.ogg +share/sounds/freedesktop/stereo/audio-channel-front-right.ogg +share/sounds/freedesktop/stereo/audio-channel-rear-center.ogg +share/sounds/freedesktop/stereo/audio-channel-rear-left.ogg +share/sounds/freedesktop/stereo/audio-channel-rear-right.ogg +share/sounds/freedesktop/stereo/audio-channel-side-left.ogg +share/sounds/freedesktop/stereo/audio-channel-side-right.ogg +share/sounds/freedesktop/stereo/audio-test-signal.ogg +share/sounds/freedesktop/stereo/battery-low.ogg +share/sounds/freedesktop/stereo/bell.ogg +share/sounds/freedesktop/stereo/button-pressed.ogg +share/sounds/freedesktop/stereo/button-toggle-off.ogg +share/sounds/freedesktop/stereo/button-toggle-on.ogg +share/sounds/freedesktop/stereo/complete-media-burn.ogg +share/sounds/freedesktop/stereo/desktop-login.ogg +share/sounds/freedesktop/stereo/desktop-logout.ogg +share/sounds/freedesktop/stereo/dialog-cancel.ogg +share/sounds/freedesktop/stereo/dialog-error.ogg +share/sounds/freedesktop/stereo/dialog-information.ogg +share/sounds/freedesktop/stereo/dialog-ok.ogg +share/sounds/freedesktop/stereo/dialog-question.ogg +share/sounds/freedesktop/stereo/dialog-warning.ogg +share/sounds/freedesktop/stereo/link-pressed.ogg +share/sounds/freedesktop/stereo/menu-click.ogg +share/sounds/freedesktop/stereo/message-new-email.ogg +share/sounds/freedesktop/stereo/message-new-instant.ogg +share/sounds/freedesktop/stereo/phone-incoming-call.ogg +share/sounds/freedesktop/stereo/phone-outgoing-busy.ogg +share/sounds/freedesktop/stereo/power-unplug.ogg +share/sounds/freedesktop/stereo/service-login.ogg +share/sounds/freedesktop/stereo/service-logout.ogg +share/sounds/freedesktop/stereo/suspend-error.ogg +share/sounds/freedesktop/stereo/trash-empty.ogg +share/sounds/freedesktop/stereo/window-close.ogg +share/sounds/freedesktop/stereo/window-maximized.ogg +share/sounds/freedesktop/stereo/window-minimized.ogg +share/sounds/freedesktop/stereo/window-move-start.ogg +share/sounds/freedesktop/stereo/window-move-stop.ogg +share/sounds/freedesktop/stereo/window-slide.ogg +@dirrm share/sounds/freedesktop/stereo +@dirrm share/sounds/freedesktop diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile index ea98db08e123..dff8af171cde 100644 --- a/audio/gnome-audio/Makefile +++ b/audio/gnome-audio/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/gnome-audio/Makefile,v 1.8 2008/03/21 12:32:12 ahze Exp $ +# $MCom: ports/audio/gnome-audio/Makefile,v 1.10 2008/05/07 18:52:29 mezz Exp $ # PORTNAME= gnome-audio @@ -16,7 +16,7 @@ COMMENT= Sound files for use with GNOME 2 USE_BZIP2= yes NO_BUILD= yes -USE_GNOME= gnomeprefix gnomehier +USE_GNOME= gnomehier MAKE_ENV= prefix=${PREFIX} post-patch: diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 2a6766433455..74e21e8ff561 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/gnome-media/Makefile,v 1.114 2008/03/11 02:39:19 mezz Exp $ +# $MCom: ports/audio/gnome-media/Makefile,v 1.123 2008/09/24 03:17:39 mezz Exp $ # PORTNAME= gnome-media -PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTVERSION= 2.24.0.1 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,15 +23,14 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ - gail nautiluscdburner +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop nautiluscdburner USE_GSTREAMER= cdparanoia esound gconf good CONFIGURE_ARGS= --enable-ipv6 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= CDDB-Slave2.schemas gnome-audio-profiles.schemas \ - gnome-cd.schemas gnome-sound-recorder.schemas \ +GCONF_SCHEMAS= gnome-audio-profiles.schemas \ + gnome-sound-recorder.schemas \ gnome-volume-control.schemas post-patch: diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index 6f477f10616b..14cdbe58006a 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-media-2.22.0.tar.bz2) = e3fabb87abd2731d7f345d724b40333a -SHA256 (gnome2/gnome-media-2.22.0.tar.bz2) = 9bafcc1d766ea3b0c30d79c33eb77ad8ceaad8631337f66f7797524e90281b4a -SIZE (gnome2/gnome-media-2.22.0.tar.bz2) = 2237463 +MD5 (gnome2/gnome-media-2.24.0.1.tar.bz2) = d0a9b0784872cecd09038aceea22e16f +SHA256 (gnome2/gnome-media-2.24.0.1.tar.bz2) = bfa79a9bea5ba6f73a6b0a232917bc7eefbed69819e42d0b09372b0c7ed3e853 +SIZE (gnome2/gnome-media-2.24.0.1.tar.bz2) = 2344888 diff --git a/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h b/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h deleted file mode 100644 index 1ec1fc50f5d5..000000000000 --- a/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cddb-slave2/gnet-private.h.orig Tue Aug 31 19:58:18 2004 -+++ cddb-slave2/gnet-private.h Tue Aug 31 20:02:23 2004 -@@ -68,7 +68,7 @@ - #include <resolv.h> - #include <netdb.h> - --#ifndef __socklen_t_defined -+#if !defined(__socklen_t_defined) && !defined(__FreeBSD__) - typedef guint32 socklen_t; - #endif - diff --git a/audio/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c deleted file mode 100644 index f316b7f01301..000000000000 --- a/audio/gnome-media/files/patch-cddb-slave2_tcp.c +++ /dev/null @@ -1,20 +0,0 @@ ---- cddb-slave2/tcp.c.orig Mon Sep 20 14:52:50 2004 -+++ cddb-slave2/tcp.c Sat Mar 12 03:30:52 2005 -@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd - continue; - - sa_in6->sin6_scope_id = ifindex; -- con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa)); -+ con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6)); - if (con == 0 || errno == EINPROGRESS) - break; - -@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd - memcpy(&sa, &addr->sa, sizeof(sa)); - sa_in = (struct sockaddr_in *) &sa; - sa_in->sin_family = AF_INET; -- con = connect(s->sockfd, &sa, sizeof(s->sa)); -+ con = connect(s->sockfd, &sa, sizeof(sa)); - } - - /* Connect (but non-blocking!) */ diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c deleted file mode 100644 index dee1aa98903d..000000000000 --- a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c +++ /dev/null @@ -1,30 +0,0 @@ ---- gnome-cd/gst-cdrom.c.orig Mon Jan 22 09:01:38 2007 -+++ gnome-cd/gst-cdrom.c Mon Feb 12 15:59:18 2007 -@@ -44,13 +44,17 @@ - #endif - - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) --# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY -+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL -+struct ioc_vol vol_value; -+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR &vol_value - # define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT - #elif defined(__NetBSD__) || defined(__OpenBSD__) - # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL -+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0 - # define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT - #else - # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDROM_GET_CAPABILITY -+# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0 - # define GST_CDROM_IOCTL_EJECT_REQUEST CDROMEJECT - #endif - -@@ -190,7 +194,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * - #ifdef __sun - res = TRUE; - #else -- if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, 0) >= 0) { -+ if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR) >= 0) { - res = TRUE; - } else { - GST_DEBUG ("ioctl() failed: %s", g_strerror (errno)); diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index 1174977da17d..9f18eb4a6317 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -1,20 +1,12 @@ -bin/cddb-slave2-properties bin/gnome-audio-profiles-properties -bin/gnome-cd bin/gnome-sound-recorder bin/gnome-volume-control bin/gstreamer-properties -bin/vumeter -include/cddb-slave2/cddb-slave-client.h include/gnome-media/profiles/audio-profile-choose.h include/gnome-media/profiles/audio-profile-edit.h include/gnome-media/profiles/audio-profile.h include/gnome-media/profiles/audio-profiles-edit.h include/gnome-media/profiles/gnome-media-profiles.h -lib/libcddb-slave2.a -lib/libcddb-slave2.la -lib/libcddb-slave2.so -lib/libcddb-slave2.so.0 lib/libglade/2.0/libgnome-media-profiles.a lib/libglade/2.0/libgnome-media-profiles.la lib/libglade/2.0/libgnome-media-profiles.so @@ -22,141 +14,21 @@ lib/libgnome-media-profiles.a lib/libgnome-media-profiles.la lib/libgnome-media-profiles.so lib/libgnome-media-profiles.so.0 -libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server libdata/pkgconfig/gnome-media-profiles.pc -libexec/CDDBSlave2 -libexec/cddb-track-editor -share/applications/cddb-slave.desktop -share/applications/gnome-cd.desktop share/applications/gnome-sound-recorder.desktop share/applications/gnome-volume-control.desktop share/applications/gstreamer-properties.desktop -share/applications/reclevel.desktop -share/applications/vumeter.desktop %%DATADIR%%/glade/gnome-audio-profiles.glade2 -%%DATADIR%%/pixmaps/3dsound.png %%DATADIR%%/pixmaps/chain-broken.png %%DATADIR%%/pixmaps/chain.png -%%DATADIR%%/pixmaps/headphones.png -%%DATADIR%%/pixmaps/mixer.png -%%DATADIR%%/pixmaps/noplay.png -%%DATADIR%%/pixmaps/norecord.png -%%DATADIR%%/pixmaps/phone.png -%%DATADIR%%/pixmaps/play.png -%%DATADIR%%/pixmaps/record.png -%%DATADIR%%/pixmaps/tone.png -%%DATADIR%%/pixmaps/video.png share/gnome-sound-recorder/ui/ui.xml -share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/C/figures/cdplayer_window.png -share/gnome/help/gnome-cd/C/figures/eject_button.png -share/gnome/help/gnome-cd/C/figures/forward_button.png -share/gnome/help/gnome-cd/C/figures/next_button.png -share/gnome/help/gnome-cd/C/figures/pause_button.png -share/gnome/help/gnome-cd/C/figures/play_button.png -share/gnome/help/gnome-cd/C/figures/preferences_button.png -share/gnome/help/gnome-cd/C/figures/previous_button.png -share/gnome/help/gnome-cd/C/figures/rewind_button.png -share/gnome/help/gnome-cd/C/figures/stop_button.png -share/gnome/help/gnome-cd/C/gnome-cd.xml -share/gnome/help/gnome-cd/C/legal.xml -share/gnome/help/gnome-cd/ca/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/ca/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/ca/figures/cdplayer_window.png -share/gnome/help/gnome-cd/ca/figures/eject_button.png -share/gnome/help/gnome-cd/ca/figures/forward_button.png -share/gnome/help/gnome-cd/ca/figures/next_button.png -share/gnome/help/gnome-cd/ca/figures/pause_button.png -share/gnome/help/gnome-cd/ca/figures/play_button.png -share/gnome/help/gnome-cd/ca/figures/preferences_button.png -share/gnome/help/gnome-cd/ca/figures/previous_button.png -share/gnome/help/gnome-cd/ca/figures/rewind_button.png -share/gnome/help/gnome-cd/ca/figures/stop_button.png -share/gnome/help/gnome-cd/ca/gnome-cd.xml -share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/es/figures/cdplayer_window.png -share/gnome/help/gnome-cd/es/figures/eject_button.png -share/gnome/help/gnome-cd/es/figures/forward_button.png -share/gnome/help/gnome-cd/es/figures/next_button.png -share/gnome/help/gnome-cd/es/figures/pause_button.png -share/gnome/help/gnome-cd/es/figures/play_button.png -share/gnome/help/gnome-cd/es/figures/preferences_button.png -share/gnome/help/gnome-cd/es/figures/previous_button.png -share/gnome/help/gnome-cd/es/figures/rewind_button.png -share/gnome/help/gnome-cd/es/figures/stop_button.png -share/gnome/help/gnome-cd/es/gnome-cd.xml -share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png -share/gnome/help/gnome-cd/fr/figures/eject_button.png -share/gnome/help/gnome-cd/fr/figures/forward_button.png -share/gnome/help/gnome-cd/fr/figures/next_button.png -share/gnome/help/gnome-cd/fr/figures/pause_button.png -share/gnome/help/gnome-cd/fr/figures/play_button.png -share/gnome/help/gnome-cd/fr/figures/preferences_button.png -share/gnome/help/gnome-cd/fr/figures/previous_button.png -share/gnome/help/gnome-cd/fr/figures/rewind_button.png -share/gnome/help/gnome-cd/fr/figures/stop_button.png -share/gnome/help/gnome-cd/fr/gnome-cd.xml -share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/it/figures/cdplayer_window.png -share/gnome/help/gnome-cd/it/figures/eject_button.png -share/gnome/help/gnome-cd/it/figures/forward_button.png -share/gnome/help/gnome-cd/it/figures/next_button.png -share/gnome/help/gnome-cd/it/figures/pause_button.png -share/gnome/help/gnome-cd/it/figures/play_button.png -share/gnome/help/gnome-cd/it/figures/preferences_button.png -share/gnome/help/gnome-cd/it/figures/previous_button.png -share/gnome/help/gnome-cd/it/figures/rewind_button.png -share/gnome/help/gnome-cd/it/figures/stop_button.png -share/gnome/help/gnome-cd/it/gnome-cd.xml -share/gnome/help/gnome-cd/oc/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/oc/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/oc/figures/cdplayer_window.png -share/gnome/help/gnome-cd/oc/figures/eject_button.png -share/gnome/help/gnome-cd/oc/figures/forward_button.png -share/gnome/help/gnome-cd/oc/figures/next_button.png -share/gnome/help/gnome-cd/oc/figures/pause_button.png -share/gnome/help/gnome-cd/oc/figures/play_button.png -share/gnome/help/gnome-cd/oc/figures/preferences_button.png -share/gnome/help/gnome-cd/oc/figures/previous_button.png -share/gnome/help/gnome-cd/oc/figures/rewind_button.png -share/gnome/help/gnome-cd/oc/figures/stop_button.png -share/gnome/help/gnome-cd/oc/gnome-cd.xml -share/gnome/help/gnome-cd/ru/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/ru/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/ru/figures/cdplayer_window.png -share/gnome/help/gnome-cd/ru/figures/eject_button.png -share/gnome/help/gnome-cd/ru/figures/forward_button.png -share/gnome/help/gnome-cd/ru/figures/next_button.png -share/gnome/help/gnome-cd/ru/figures/pause_button.png -share/gnome/help/gnome-cd/ru/figures/play_button.png -share/gnome/help/gnome-cd/ru/figures/preferences_button.png -share/gnome/help/gnome-cd/ru/figures/previous_button.png -share/gnome/help/gnome-cd/ru/figures/rewind_button.png -share/gnome/help/gnome-cd/ru/figures/stop_button.png -share/gnome/help/gnome-cd/ru/gnome-cd.xml -share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png -share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png -share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png -share/gnome/help/gnome-cd/sv/figures/eject_button.png -share/gnome/help/gnome-cd/sv/figures/forward_button.png -share/gnome/help/gnome-cd/sv/figures/next_button.png -share/gnome/help/gnome-cd/sv/figures/pause_button.png -share/gnome/help/gnome-cd/sv/figures/play_button.png -share/gnome/help/gnome-cd/sv/figures/preferences_button.png -share/gnome/help/gnome-cd/sv/figures/previous_button.png -share/gnome/help/gnome-cd/sv/figures/rewind_button.png -share/gnome/help/gnome-cd/sv/figures/stop_button.png -share/gnome/help/gnome-cd/sv/gnome-cd.xml share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/C/legal.xml share/gnome/help/gnome-sound-recorder/ca/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/ca/gnome-sound-recorder.xml +share/gnome/help/gnome-sound-recorder/de/figures/grecord_window.png +share/gnome/help/gnome-sound-recorder/de/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/es/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/es/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/fr/figures/grecord_window.png @@ -176,6 +48,8 @@ share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml share/gnome/help/gnome-volume-control/C/legal.xml share/gnome/help/gnome-volume-control/ca/figures/gnome-volume-control_window.png share/gnome/help/gnome-volume-control/ca/gnome-volume-control.xml +share/gnome/help/gnome-volume-control/de/figures/gnome-volume-control_window.png +share/gnome/help/gnome-volume-control/de/gnome-volume-control.xml share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png @@ -193,6 +67,8 @@ share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml share/gnome/help/gstreamer-properties/C/legal.xml share/gnome/help/gstreamer-properties/ca/figures/gstreamer_properties_window.png share/gnome/help/gstreamer-properties/ca/gstreamer-properties.xml +share/gnome/help/gstreamer-properties/de/figures/gstreamer_properties_window.png +share/gnome/help/gstreamer-properties/de/gstreamer-properties.xml share/gnome/help/gstreamer-properties/es/figures/gstreamer_properties_window.png share/gnome/help/gstreamer-properties/es/gstreamer-properties.xml share/gnome/help/gstreamer-properties/fr/figures/gstreamer_properties_window.png @@ -207,12 +83,18 @@ share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml share/gstreamer-properties/glade/gstreamer-properties.glade share/gstreamer-properties/icons/gstreamer-properties.png -share/icons/hicolor/48x48/apps/gnome-cd.png -share/icons/hicolor/48x48/apps/gnome-grecord.png -share/icons/hicolor/48x48/apps/gnome-reclevel.png -share/icons/hicolor/48x48/apps/gnome-vumeter.png +share/icons/hicolor/16x16/apps/gnome-sound-recorder.png +share/icons/hicolor/16x16/devices/gvc-3d-sound.png +share/icons/hicolor/16x16/devices/gvc-headphones.png +share/icons/hicolor/16x16/devices/gvc-line-in.png +share/icons/hicolor/16x16/devices/gvc-tone.png +share/icons/hicolor/16x16/status/audio-input-microphone-muted.png +share/icons/hicolor/22x22/apps/gnome-sound-recorder.png +share/icons/hicolor/24x24/apps/gnome-sound-recorder.png +share/icons/hicolor/32x32/apps/gnome-sound-recorder.png +share/icons/hicolor/48x48/apps/gnome-sound-recorder.png share/icons/hicolor/48x48/apps/gstreamer-properties.png -share/idl/GNOME_Media_CDDBSlave2.idl +share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg share/locale/am/LC_MESSAGES/gnome-media-2.0.mo share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo share/locale/as/LC_MESSAGES/gnome-media-2.0.mo @@ -250,6 +132,7 @@ share/locale/id/LC_MESSAGES/gnome-media-2.0.mo share/locale/it/LC_MESSAGES/gnome-media-2.0.mo share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo share/locale/ka/LC_MESSAGES/gnome-media-2.0.mo +share/locale/kn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo share/locale/ku/LC_MESSAGES/gnome-media-2.0.mo share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo @@ -278,9 +161,10 @@ share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo share/locale/sr/LC_MESSAGES/gnome-media-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-media-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-media-2.0.mo share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo share/locale/ta/LC_MESSAGES/gnome-media-2.0.mo +share/locale/te/LC_MESSAGES/gnome-media-2.0.mo share/locale/th/LC_MESSAGES/gnome-media-2.0.mo share/locale/tk/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo @@ -291,16 +175,9 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo -share/omf/gnome-cd/gnome-cd-C.omf -share/omf/gnome-cd/gnome-cd-ca.omf -share/omf/gnome-cd/gnome-cd-es.omf -share/omf/gnome-cd/gnome-cd-fr.omf -share/omf/gnome-cd/gnome-cd-it.omf -share/omf/gnome-cd/gnome-cd-oc.omf -share/omf/gnome-cd/gnome-cd-ru.omf -share/omf/gnome-cd/gnome-cd-sv.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf +share/omf/gnome-sound-recorder/gnome-sound-recorder-de.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf @@ -310,6 +187,7 @@ share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf share/omf/gnome-volume-control/gnome-volume-control-C.omf share/omf/gnome-volume-control/gnome-volume-control-ca.omf +share/omf/gnome-volume-control/gnome-volume-control-de.omf share/omf/gnome-volume-control/gnome-volume-control-es.omf share/omf/gnome-volume-control/gnome-volume-control-fr.omf share/omf/gnome-volume-control/gnome-volume-control-it.omf @@ -318,69 +196,19 @@ share/omf/gnome-volume-control/gnome-volume-control-ru.omf share/omf/gnome-volume-control/gnome-volume-control-sv.omf share/omf/gstreamer-properties/gstreamer-properties-C.omf share/omf/gstreamer-properties/gstreamer-properties-ca.omf +share/omf/gstreamer-properties/gstreamer-properties-de.omf share/omf/gstreamer-properties/gstreamer-properties-es.omf share/omf/gstreamer-properties/gstreamer-properties-fr.omf share/omf/gstreamer-properties/gstreamer-properties-it.omf share/omf/gstreamer-properties/gstreamer-properties-oc.omf share/omf/gstreamer-properties/gstreamer-properties-ru.omf share/omf/gstreamer-properties/gstreamer-properties-sv.omf -share/pixmaps/gnome-cd/disc.png -share/pixmaps/gnome-cd/once.png -share/pixmaps/gnome-cd/repeat.png -share/pixmaps/gnome-cd/themes/None/None.theme -share/pixmaps/gnome-cd/themes/None/bottom-left.png -share/pixmaps/gnome-cd/themes/None/bottom-right.png -share/pixmaps/gnome-cd/themes/None/bottom.png -share/pixmaps/gnome-cd/themes/None/middle-left.png -share/pixmaps/gnome-cd/themes/None/middle-right.png -share/pixmaps/gnome-cd/themes/None/middle.png -share/pixmaps/gnome-cd/themes/None/top-left.png -share/pixmaps/gnome-cd/themes/None/top-right.png -share/pixmaps/gnome-cd/themes/None/top.png -share/pixmaps/gnome-cd/themes/lcd/bottom-left.png -share/pixmaps/gnome-cd/themes/lcd/bottom-right.png -share/pixmaps/gnome-cd/themes/lcd/bottom.png -share/pixmaps/gnome-cd/themes/lcd/lcd.theme -share/pixmaps/gnome-cd/themes/lcd/middle-left.png -share/pixmaps/gnome-cd/themes/lcd/middle-right.png -share/pixmaps/gnome-cd/themes/lcd/middle.png -share/pixmaps/gnome-cd/themes/lcd/top-left.png -share/pixmaps/gnome-cd/themes/lcd/top-right.png -share/pixmaps/gnome-cd/themes/lcd/top.png -share/pixmaps/gnome-cd/themes/media/bottom-left.png -share/pixmaps/gnome-cd/themes/media/bottom-right.png -share/pixmaps/gnome-cd/themes/media/bottom.png -share/pixmaps/gnome-cd/themes/media/media.theme -share/pixmaps/gnome-cd/themes/media/middle-left.png -share/pixmaps/gnome-cd/themes/media/middle-right.png -share/pixmaps/gnome-cd/themes/media/middle.png -share/pixmaps/gnome-cd/themes/media/top-left.png -share/pixmaps/gnome-cd/themes/media/top-right.png -share/pixmaps/gnome-cd/themes/media/top.png -share/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png -share/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png -share/pixmaps/gnome-cd/themes/red-lcd/bottom.png -share/pixmaps/gnome-cd/themes/red-lcd/middle-left.png -share/pixmaps/gnome-cd/themes/red-lcd/middle-right.png -share/pixmaps/gnome-cd/themes/red-lcd/middle.png -share/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme -share/pixmaps/gnome-cd/themes/red-lcd/top-left.png -share/pixmaps/gnome-cd/themes/red-lcd/top-right.png -share/pixmaps/gnome-cd/themes/red-lcd/top.png -share/pixmaps/gnome-cd/track.png -@dirrm share/pixmaps/gnome-cd/themes/red-lcd -@dirrm share/pixmaps/gnome-cd/themes/media -@dirrm share/pixmaps/gnome-cd/themes/lcd -@dirrm share/pixmaps/gnome-cd/themes/None -@dirrm share/pixmaps/gnome-cd/themes -@dirrm share/pixmaps/gnome-cd -@dirrm share/gstreamer-properties/icons -@dirrm share/gstreamer-properties/glade -@dirrm share/gstreamer-properties @dirrm share/omf/gstreamer-properties @dirrm share/omf/gnome-volume-control @dirrm share/omf/gnome-sound-recorder -@dirrm share/omf/gnome-cd +@dirrm share/gstreamer-properties/icons +@dirrm share/gstreamer-properties/glade +@dirrm share/gstreamer-properties @dirrm share/gnome/help/gstreamer-properties/sv/figures @dirrm share/gnome/help/gstreamer-properties/sv @dirrm share/gnome/help/gstreamer-properties/ru/figures @@ -393,6 +221,8 @@ share/pixmaps/gnome-cd/track.png @dirrm share/gnome/help/gstreamer-properties/fr @dirrm share/gnome/help/gstreamer-properties/es/figures @dirrm share/gnome/help/gstreamer-properties/es +@dirrm share/gnome/help/gstreamer-properties/de/figures +@dirrm share/gnome/help/gstreamer-properties/de @dirrm share/gnome/help/gstreamer-properties/ca/figures @dirrm share/gnome/help/gstreamer-properties/ca @dirrm share/gnome/help/gstreamer-properties/C/figures @@ -410,6 +240,8 @@ share/pixmaps/gnome-cd/track.png @dirrm share/gnome/help/gnome-volume-control/fr @dirrm share/gnome/help/gnome-volume-control/es/figures @dirrm share/gnome/help/gnome-volume-control/es +@dirrm share/gnome/help/gnome-volume-control/de/figures +@dirrm share/gnome/help/gnome-volume-control/de @dirrm share/gnome/help/gnome-volume-control/ca/figures @dirrm share/gnome/help/gnome-volume-control/ca @dirrm share/gnome/help/gnome-volume-control/C/figures @@ -429,28 +261,13 @@ share/pixmaps/gnome-cd/track.png @dirrm share/gnome/help/gnome-sound-recorder/fr @dirrm share/gnome/help/gnome-sound-recorder/es/figures @dirrm share/gnome/help/gnome-sound-recorder/es +@dirrm share/gnome/help/gnome-sound-recorder/de/figures +@dirrm share/gnome/help/gnome-sound-recorder/de @dirrm share/gnome/help/gnome-sound-recorder/ca/figures @dirrm share/gnome/help/gnome-sound-recorder/ca @dirrm share/gnome/help/gnome-sound-recorder/C/figures @dirrm share/gnome/help/gnome-sound-recorder/C @dirrm share/gnome/help/gnome-sound-recorder -@dirrm share/gnome/help/gnome-cd/sv/figures -@dirrm share/gnome/help/gnome-cd/sv -@dirrm share/gnome/help/gnome-cd/ru/figures -@dirrm share/gnome/help/gnome-cd/ru -@dirrm share/gnome/help/gnome-cd/oc/figures -@dirrm share/gnome/help/gnome-cd/oc -@dirrm share/gnome/help/gnome-cd/it/figures -@dirrm share/gnome/help/gnome-cd/it -@dirrm share/gnome/help/gnome-cd/fr/figures -@dirrm share/gnome/help/gnome-cd/fr -@dirrm share/gnome/help/gnome-cd/es/figures -@dirrm share/gnome/help/gnome-cd/es -@dirrm share/gnome/help/gnome-cd/ca/figures -@dirrm share/gnome/help/gnome-cd/ca -@dirrm share/gnome/help/gnome-cd/C/figures -@dirrm share/gnome/help/gnome-cd/C -@dirrm share/gnome/help/gnome-cd @dirrm share/gnome-sound-recorder/ui @dirrm share/gnome-sound-recorder @dirrm %%DATADIR%%/pixmaps @@ -459,11 +276,14 @@ share/pixmaps/gnome-cd/track.png @dirrmtry share/applications @dirrm include/gnome-media/profiles @dirrm include/gnome-media -@dirrm include/cddb-slave2 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index fe5a39ef37e6..9d9dc6b923f4 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libcanberra -PORTVERSION= 0.6 -PORTREVISION= 5 +PORTVERSION= 0.10 +PORTREVISION= 2 CATEGORIES= audio devel -MASTER_SITES= http://0pointer.de/public/ +MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the Freedesktop sound theme spec @@ -17,30 +17,38 @@ COMMENT= Implementation of the Freedesktop sound theme spec LIB_DEPENDS= vorbisfile.5:${PORTSDIR}/audio/libvorbis USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack +USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 libltdl:15 +CONFIGURE_ARGS= --disable-lynx CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -OPTIONS= PULSE "Enable Pulse Audio support" off +GCONF_SCHEMAS= libcanberra.schemas -.include <bsd.port.pre.mk> +OPTIONS= PULSE "Enable Pulse Audio support" off \ + GSTREAMER "Enable GStreamer audio support" off -.if ${OSVERSION} >= 800059 -BROKEN= does not build -.endif +.include <bsd.port.pre.mk> .if !defined(WITHOUT_PULSE) LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -PLIST_SUB+= PULSE="" OSS="@comment " -CONFIGURE_ARGS+=--disable-oss +PLIST_SUB+= PULSE="" .else CONFIGURE_ARGS+=--disable-pulse -PLIST_SUB+= PULSE="@comment " OSS="" +PLIST_SUB+= PULSE="@comment " +.endif + +.if !defined(WITHOUT_GSTREAMER) +USE_GSTREAMER= yes +PLIST_SUB+= GSTREAMER="" +.else +CONFIGURE_ARGS+=--disable-gstreamer +PLIST_SUB+= GSTREAMER="@comment " .endif post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} + @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo index f22448d9d6a5..7adb467b8697 100644 --- a/audio/libcanberra/distinfo +++ b/audio/libcanberra/distinfo @@ -1,3 +1,3 @@ -MD5 (libcanberra-0.6.tar.gz) = bec9dc81796babef76f2d687024daffb -SHA256 (libcanberra-0.6.tar.gz) = d9d047e94b8f6e0e036119c68e4485a85459a77383a27ed02bff9327171c88b7 -SIZE (libcanberra-0.6.tar.gz) = 794371 +MD5 (libcanberra-0.10.tar.gz) = 2623370bfcecaeecaeb85e5ec445f340 +SHA256 (libcanberra-0.10.tar.gz) = b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272 +SIZE (libcanberra-0.10.tar.gz) = 826222 diff --git a/audio/libcanberra/files/patch-Makefile.in b/audio/libcanberra/files/patch-Makefile.in index 860803c710d8..bd5972c313b2 100644 --- a/audio/libcanberra/files/patch-Makefile.in +++ b/audio/libcanberra/files/patch-Makefile.in @@ -1,11 +1,28 @@ ---- Makefile.in.orig 2008-08-10 15:20:38.000000000 -0400 -+++ Makefile.in 2008-08-10 15:20:44.000000000 -0400 -@@ -248,7 +248,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ +--- Makefile.in.orig 2008-12-20 13:42:12.000000000 -0500 ++++ Makefile.in 2008-12-20 20:43:22.000000000 -0500 +@@ -271,7 +271,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - EXTRA_DIST = bootstrap.sh autogen.sh LGPL README --SUBDIRS = src doc libltdl -+SUBDIRS = src doc - MAINTAINERCLEANFILES = - noinst_DATA = + dist_doc_DATA = README + EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas +-SUBDIRS = src gtkdoc libltdl doc ++SUBDIRS = src gtkdoc doc + MAINTAINERCLEANFILES = README + noinst_DATA = README pkgconfigdir = $(prefix)/libdata/pkgconfig +@@ -794,11 +794,11 @@ uninstall-am: uninstall-dist_docDATA uni + + + @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: +-@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \ +-@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \ +-@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ +-@GCONF_SCHEMAS_INSTALL_TRUE@ done \ +-@GCONF_SCHEMAS_INSTALL_TRUE@ fi ++@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \ ++@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \ ++@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \ ++@GCONF_SCHEMAS_INSTALL_TRUE@ done ; \ ++@GCONF_SCHEMAS_INSTALL_TRUE@ fi + @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: + + README: diff --git a/audio/libcanberra/files/patch-config.h.in b/audio/libcanberra/files/patch-config.h.in deleted file mode 100644 index d1d6b10e84c4..000000000000 --- a/audio/libcanberra/files/patch-config.h.in +++ /dev/null @@ -1,42 +0,0 @@ ---- config.h.in.orig 2008-08-09 15:51:54.000000000 -0400 -+++ config.h.in 2008-08-09 15:51:57.000000000 -0400 -@@ -30,6 +30,9 @@ - /* Define to 1 if you have the `lstat' function. */ - #undef HAVE_LSTAT - -+/* Define to 1 if you have the <machine/soundcard.h> header file. */ -+#undef HAVE_MACHINE_SOUNDCARD_H -+ - /* Define to 1 if you have the <memory.h> header file. */ - #undef HAVE_MEMORY_H - -@@ -39,6 +42,9 @@ - /* Have NULL output? */ - #undef HAVE_NULL - -+/* Have OSS? */ -+#undef HAVE_OSS -+ - /* Define to 1 if you have the `posix_memalign' function. */ - #undef HAVE_POSIX_MEMALIGN - -@@ -57,6 +63,9 @@ - /* Define to 1 if you have the `sleep' function. */ - #undef HAVE_SLEEP - -+/* Define to 1 if you have the <soundcard.h> header file. */ -+#undef HAVE_SOUNDCARD_H -+ - /* Define to 1 if the system has the type `ssize_t'. */ - #undef HAVE_SSIZE_T - -@@ -93,6 +102,9 @@ - /* Define to 1 if you have the <sys/socket.h> header file. */ - #undef HAVE_SYS_SOCKET_H - -+/* Define to 1 if you have the <sys/soundcard.h> header file. */ -+#undef HAVE_SYS_SOUNDCARD_H -+ - /* Define to 1 if you have the <sys/stat.h> header file. */ - #undef HAVE_SYS_STAT_H - diff --git a/audio/libcanberra/files/patch-configure b/audio/libcanberra/files/patch-configure index b6d61bca2e26..7d643125157c 100644 --- a/audio/libcanberra/files/patch-configure +++ b/audio/libcanberra/files/patch-configure @@ -1,60 +1,23 @@ ---- configure.orig 2008-08-10 15:18:38.000000000 -0400 -+++ configure 2008-08-10 15:19:32.000000000 -0400 +--- configure.orig 2008-12-19 19:07:23.000000000 -0500 ++++ configure 2008-12-19 19:08:01.000000000 -0500 @@ -791,7 +791,6 @@ ac_includes_default="\ # include <unistd.h> #endif" -enable_option_checking=no - ac_subst_vars='SHELL - PATH_SEPARATOR - PACKAGE_NAME -@@ -909,7 +908,6 @@ ac_ct_F77 - LIBTOOL - LTDLINCL - LIBLTDL --subdirs - OS_IS_WIN32_TRUE + ac_subst_vars='LTLIBOBJS + LIBOBJS + GTK_DOC_USE_LIBTOOL_FALSE +@@ -878,7 +877,6 @@ USE_VERSION_SCRIPT_FALSE + USE_VERSION_SCRIPT_TRUE OS_IS_WIN32_FALSE - acx_pthread_config -@@ -935,15 +933,19 @@ VORBIS_LIBS - HAVE_DSO - HAVE_PULSE - HAVE_ALSA -+HAVE_OSS - HAVE_NULL - BUILTIN_DSO - BUILTIN_PULSE - BUILTIN_ALSA -+BUILTIN_OSS - BUILTIN_NULL - HAVE_PULSE_TRUE - HAVE_PULSE_FALSE - HAVE_ALSA_TRUE - HAVE_ALSA_FALSE -+HAVE_OSS_TRUE -+HAVE_OSS_FALSE - HAVE_NULL_TRUE - HAVE_NULL_FALSE - BUILTIN_DSO_TRUE -@@ -952,6 +954,8 @@ BUILTIN_PULSE_TRUE - BUILTIN_PULSE_FALSE - BUILTIN_ALSA_TRUE - BUILTIN_ALSA_FALSE -+BUILTIN_OSS_TRUE -+BUILTIN_OSS_FALSE - BUILTIN_NULL_TRUE - BUILTIN_NULL_FALSE - HTML_DIR -@@ -978,6 +982,7 @@ enable_largefile - enable_rpath - with_libiconv_prefix - enable_alsa -+enable_oss - enable_pulse - enable_null - enable_gtk -@@ -1009,7 +1014,7 @@ GTK_CFLAGS - GTK_LIBS + OS_IS_WIN32_TRUE +-subdirs + LIBLTDL + LTDLINCL + LIBTOOL +@@ -1054,7 +1052,7 @@ TDB_CFLAGS + TDB_LIBS VORBIS_CFLAGS VORBIS_LIBS' -ac_subdirs_all='libltdl' @@ -62,811 +25,3 @@ # Initialize some variables set by options. ac_init_help= -@@ -1650,6 +1655,7 @@ Optional Features: - --disable-largefile omit support for large files - --disable-rpath do not hardcode runtime library paths - --disable-alsa Disable optional ALSA support -+ --disable-oss Disable optional OSS support - --disable-pulse Disable optional PulseAudio support - --disable-null Disable optional null output - --disable-gtk Disable optional GTK+ support -@@ -6080,7 +6086,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6083 "configure"' > conftest.$ac_ext -+ echo '#line 6089 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -8509,11 +8515,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:8512: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8518: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8516: \$? = $ac_status" >&5 -+ echo "$as_me:8522: \$? = $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. -@@ -8799,11 +8805,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:8802: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8808: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8806: \$? = $ac_status" >&5 -+ echo "$as_me:8812: \$? = $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. -@@ -8903,11 +8909,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:8906: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8912: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8910: \$? = $ac_status" >&5 -+ echo "$as_me:8916: \$? = $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 -@@ -11305,7 +11311,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11308 "configure" -+#line 11314 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11405,7 +11411,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11408 "configure" -+#line 11414 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -13814,11 +13820,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:13817: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13823: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:13821: \$? = $ac_status" >&5 -+ echo "$as_me:13827: \$? = $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. -@@ -13918,11 +13924,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:13921: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13927: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:13925: \$? = $ac_status" >&5 -+ echo "$as_me:13931: \$? = $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 -@@ -15503,11 +15509,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:15506: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15512: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15510: \$? = $ac_status" >&5 -+ echo "$as_me:15516: \$? = $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. -@@ -15607,11 +15613,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:15610: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15616: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15614: \$? = $ac_status" >&5 -+ echo "$as_me:15620: \$? = $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 -@@ -17824,11 +17830,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:17827: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17833: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17831: \$? = $ac_status" >&5 -+ echo "$as_me:17837: \$? = $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. -@@ -18114,11 +18120,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:18117: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18123: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18121: \$? = $ac_status" >&5 -+ echo "$as_me:18127: \$? = $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. -@@ -18218,11 +18224,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:18221: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18227: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18225: \$? = $ac_status" >&5 -+ echo "$as_me:18231: \$? = $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 -@@ -20908,10 +20914,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo - - - -- --subdirs="$subdirs libltdl" -- -- - #### Determine build environment #### - - os_is_win32=0 -@@ -21692,6 +21694,46 @@ if test "${ac_cv_c_bigendian+set}" = set - $as_echo_n "(cached) " >&6 - else - ac_cv_c_bigendian=unknown -+ # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__) -+ neither is defined; -+ #endif -+ typedef int dummy; -+ -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&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_objext; then -+ ac_cv_c_bigendian=universal -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -@@ -25735,6 +25777,197 @@ fi - - - -+### OSS support (optional) ### -+# Check whether --enable-oss was given. -+if test "${enable_oss+set}" = set; then -+ enableval=$enable_oss; -+ case "${enableval}" in -+ yes) alsa=yes ;; -+ no) alsa=no ;; -+ *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-oss" >&5 -+$as_echo "$as_me: error: bad value ${enableval} for --disable-oss" >&2;} -+ { (exit 1); exit 1; }; } ;; -+ esac -+ -+else -+ oss=auto -+fi -+ -+ -+if test "x${oss}" != xno ; then -+ -+ -+ -+for ac_header in soundcard.h sys/soundcard.h machine/soundcard.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&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_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------- ## -+## Report this to mzyvopnaoreen (at) 0pointer (dot) de ## -+## --------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ if test "${ac_cv_header_sys_soundcard_h}" = "yes" || \ -+ test "${ac_cv_header_soundcard_h}" = "yes" || \ -+ test "${ac_cv_header_machine_soundcard_h}" = "yes"; then -+ HAVE_OSS=1 -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_OSS 1 -+_ACEOF -+ -+ else -+ HAVE_OSS=0 -+ if test "x$oss" = xyes ; then -+ { { $as_echo "$as_me:$LINENO: error: *** OSS not found ***" >&5 -+$as_echo "$as_me: error: *** OSS not found ***" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ fi -+else -+ HAVE_OSS=0 -+fi -+ - ### PulseAudio (optional) #### - - # Check whether --enable-pulse was given. -@@ -26143,6 +26376,7 @@ HAVE_DSO=0 - BUILTIN_DSO=0 - BUILTIN_PULSE=0 - BUILTIN_ALSA=0 -+BUILTIN_OSS=0 - BUILTIN_NULL=0 - - case "x$with_builtin" in -@@ -26155,6 +26389,7 @@ $as_echo "$as_me: error: *** PulseAudio - - BUILTIN_PULSE=1 - HAVE_ALSA=0 -+ HAVE_OSS=0 - HAVE_NULL=0 - ;; - -@@ -26166,10 +26401,24 @@ $as_echo "$as_me: error: *** ALSA select - fi - - BUILTIN_ALSA=1 -+ HAVE_OSS=0 - HAVE_PULSE=0 - HAVE_NULL=0 - ;; - -+ xoss) -+ if test "x$HAV_OSS" != x1 ; then -+ { { $as_echo "$as_me:$LINENO: error: *** OSS selected for builtin driver, but not enabled. ***" >&5 -+$as_echo "$as_me: error: *** OSS selected for builtin driver, but not enabled. ***" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ BUILTIN_OSS=1 -+ HAVE_ALSA=0 -+ HAVE_PULSE=0 -+ HAVE_NULL=0 -+ ;; -+ - xnull) - if test "x$HAVE_NULL" != x1 ; then - { { $as_echo "$as_me:$LINENO: error: *** Null output selected for builtin driver, but not enabled. ***" >&5 -@@ -26180,6 +26429,7 @@ $as_echo "$as_me: error: *** Null output - BUILTIN_NULL=1 - HAVE_PULSE=0 - HAVE_ALSA=0 -+ HAVE_OSS=0 - ;; - - xdso) -@@ -26198,7 +26448,7 @@ $as_echo "$as_me: error: *** Unknown dri - { (exit 1); exit 1; }; } - esac - --if test "x$HAVE_PULSE" != x1 -a "x$HAVE_ALSA" != x1 -a "x$HAVE_NULL" != x1 ; then -+if test "x$HAVE_PULSE" != x1 -a "x$HAVE_ALSA" != x1 -a "x$HAVE_OSS" != x1 -a "x$HAVE_NULL" != x1 ; then - { { $as_echo "$as_me:$LINENO: error: *** No backend enabled. ***" >&5 - $as_echo "$as_me: error: *** No backend enabled. ***" >&2;} - { (exit 1); exit 1; }; } -@@ -26212,6 +26462,8 @@ fi - - - -+ -+ - if test "x$HAVE_PULSE" = x1; then - HAVE_PULSE_TRUE= - HAVE_PULSE_FALSE='#' -@@ -26228,6 +26480,14 @@ else - HAVE_ALSA_FALSE= - fi - -+ if test "x$HAVE_OSS" = x1; then -+ HAVE_OSS_TRUE= -+ HAVE_OSS_FALSE='#' -+else -+ HAVE_OSS_TRUE='#' -+ HAVE_OSS_FALSE= -+fi -+ - if test "x$HAVE_NULL" = x1; then - HAVE_NULL_TRUE= - HAVE_NULL_FALSE='#' -@@ -26260,6 +26520,14 @@ else - BUILTIN_ALSA_FALSE= - fi - -+ if test "x$BUILTIN_OSS" = x1; then -+ BUILTIN_OSS_TRUE= -+ BUILTIN_OSS_FALSE='#' -+else -+ BUILTIN_OSS_TRUE='#' -+ BUILTIN_OSS_FALSE= -+fi -+ - if test "x$BUILTIN_NULL" = x1; then - BUILTIN_NULL_TRUE= - BUILTIN_NULL_FALSE='#' -@@ -26539,6 +26807,13 @@ $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_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OSS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"HAVE_OSS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${HAVE_NULL_TRUE}" && test -z "${HAVE_NULL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NULL\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -26567,6 +26842,13 @@ $as_echo "$as_me: error: conditional \"B - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${BUILTIN_OSS_TRUE}" && test -z "${BUILTIN_OSS_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"BUILTIN_OSS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"BUILTIN_OSS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${BUILTIN_NULL_TRUE}" && test -z "${BUILTIN_NULL_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"BUILTIN_NULL\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -26926,9 +27208,9 @@ _ACEOF - - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - # Files that config.status was made for. --config_files="`echo $ac_config_files`" --config_headers="`echo $ac_config_headers`" --config_commands="`echo $ac_config_commands`" -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - - _ACEOF - -@@ -27379,9 +27661,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - } - split(mac1, mac2, "(") #) - macro = mac2[1] -- prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". -+ prefix = substr(line, 1, index(line, defundef) - 1) - print prefix "define", macro P[macro] D[macro] - next - } else { -@@ -27389,7 +27671,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { -- print "/*", prefix defundef, macro, "*/" -+ print "/*", line, "*/" - next - } - } -@@ -27906,193 +28188,6 @@ if test "$no_create" != yes; then - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } - fi -- --# --# CONFIG_SUBDIRS section. --# --if test "$no_recursion" != yes; then -- -- # Remove --cache-file, --srcdir, and --disable-option-checking arguments -- # so they do not pile up. -- ac_sub_configure_args= -- ac_prev= -- eval "set x $ac_configure_args" -- shift -- for ac_arg -- do -- if test -n "$ac_prev"; then -- ac_prev= -- continue -- fi -- case $ac_arg in -- -cache-file | --cache-file | --cache-fil | --cache-fi \ -- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -- ac_prev=cache_file ;; -- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ -- | --c=*) -- ;; -- --config-cache | -C) -- ;; -- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -- ac_prev=srcdir ;; -- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -- ;; -- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -- ac_prev=prefix ;; -- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -- ;; -- --disable-option-checking) -- ;; -- *) -- case $ac_arg in -- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;; -- esac -- done -- -- # Always prepend --prefix to ensure using the same prefix -- # in subdir configurations. -- ac_arg="--prefix=$prefix" -- case $ac_arg in -- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" -- -- # Pass --silent -- if test "$silent" = yes; then -- ac_sub_configure_args="--silent $ac_sub_configure_args" -- fi -- -- # Always prepend --disable-option-checking to silence warnings, since -- # different subdirs can have different --enable and --with options. -- ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" -- -- ac_popdir=`pwd` -- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue -- -- # Do not complain, so a configure script can configure whichever -- # parts of a large source tree are present. -- test -d "$srcdir/$ac_dir" || continue -- -- ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" -- $as_echo "$as_me:$LINENO: $ac_msg" >&5 -- $as_echo "$ac_msg" >&6 -- { as_dir="$ac_dir" -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -- esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -- { (exit 1); exit 1; }; }; } -- ac_builddir=. -- --case "$ac_dir" in --.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; --*) -- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -- # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -- case $ac_top_builddir_sub in -- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -- esac ;; --esac --ac_abs_top_builddir=$ac_pwd --ac_abs_builddir=$ac_pwd$ac_dir_suffix --# for backward compatibility: --ac_top_builddir=$ac_top_build_prefix -- --case $srcdir in -- .) # We are building in place. -- ac_srcdir=. -- ac_top_srcdir=$ac_top_builddir_sub -- ac_abs_top_srcdir=$ac_pwd ;; -- [\\/]* | ?:[\\/]* ) # Absolute name. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir -- ac_abs_top_srcdir=$srcdir ;; -- *) # Relative name. -- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_build_prefix$srcdir -- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; --esac --ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -- -- -- cd "$ac_dir" -- -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f "$ac_srcdir/configure.gnu"; then -- ac_sub_configure=$ac_srcdir/configure.gnu -- elif test -f "$ac_srcdir/configure"; then -- ac_sub_configure=$ac_srcdir/configure -- elif test -f "$ac_srcdir/configure.in"; then -- # This should be Cygnus configure. -- ac_sub_configure=$ac_aux_dir/configure -- else -- { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 --$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} -- ac_sub_configure= -- fi -- -- # The recursion is here. -- if test -n "$ac_sub_configure"; then -- # Make the cache file name correct relative to the subdirectory. -- case $cache_file in -- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; -- *) # Relative name. -- ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; -- esac -- -- { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 --$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} -- # The eval makes quoting arguments work. -- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ -- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || -- { { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 --$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- cd "$ac_popdir" -- done --fi - if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} -@@ -28123,6 +28218,15 @@ if test "x$BUILTIN_ALSA" = "x1" ; then - ENABLE_BUILTIN_ALSA=yes - fi - -+ENABLE_OSS=no -+if test "x$HAVE_OSS" = "x1" ; then -+ ENABLE_OSS=yes -+fi -+ENABLE_BUILTIN_OSS=no -+if test "x$BUILTIN_OSS" = "x1" ; then -+ ENABLE_BUILTIN_OSS=yes -+fi -+ - ENABLE_NULL=no - if test "x$HAVE_NULL" = "x1" ; then - ENABLE_NULL=yes -@@ -28152,6 +28256,8 @@ echo " - Builtin PulseAudio: ${ENABLE_BUILTIN_PULSE} - Enable ALSA: ${ENABLE_ALSA} - Builtin ALSA: ${ENABLE_BUILTIN_ALSA} -+ Enable OSS: ${ENABLE_OSS} -+ Builtin OSS: ${ENABLE_BUILTIN_OSS} - Enable Null Output: ${ENABLE_NULL} - Builtin Null Output: ${ENABLE_BUILTIN_NULL} - Enable GTK+: ${ENABLE_GTK} diff --git a/audio/libcanberra/files/patch-configure.ac b/audio/libcanberra/files/patch-configure.ac deleted file mode 100644 index 324d80d3b668..000000000000 --- a/audio/libcanberra/files/patch-configure.ac +++ /dev/null @@ -1,140 +0,0 @@ ---- configure.ac.orig 2008-08-09 15:27:28.000000000 -0400 -+++ configure.ac 2008-08-09 15:27:59.000000000 -0400 -@@ -219,6 +219,35 @@ fi - AC_SUBST(ALSA_CFLAGS) - AC_SUBST(ALSA_LIBS) - -+### OSS support (optional) ### -+AC_ARG_ENABLE([oss], -+ AC_HELP_STRING([--disable-oss], [Disable optional OSS support]), -+ [ -+ case "${enableval}" in -+ yes) alsa=yes ;; -+ no) alsa=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-oss) ;; -+ esac -+ ], -+ [oss=auto]) -+ -+if test "x${oss}" != xno ; then -+ AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h) -+ if test "${ac_cv_header_sys_soundcard_h}" = "yes" || \ -+ test "${ac_cv_header_soundcard_h}" = "yes" || \ -+ test "${ac_cv_header_machine_soundcard_h}" = "yes"; then -+ HAVE_OSS=1 -+ AC_DEFINE([HAVE_OSS], 1, [Have OSS?]) -+ else -+ HAVE_OSS=0 -+ if test "x$oss" = xyes ; then -+ AC_MSG_ERROR([*** OSS not found ***]) -+ fi -+ fi -+else -+ HAVE_OSS=0 -+fi -+ - ### PulseAudio (optional) #### - - AC_ARG_ENABLE([pulse], -@@ -333,6 +362,7 @@ HAVE_DSO=0 - BUILTIN_DSO=0 - BUILTIN_PULSE=0 - BUILTIN_ALSA=0 -+BUILTIN_OSS=0 - BUILTIN_NULL=0 - - case "x$with_builtin" in -@@ -343,6 +373,7 @@ case "x$with_builtin" in - - BUILTIN_PULSE=1 - HAVE_ALSA=0 -+ HAVE_OSS=0 - HAVE_NULL=0 - ;; - -@@ -352,10 +383,22 @@ case "x$with_builtin" in - fi - - BUILTIN_ALSA=1 -+ HAVE_OSS=0 - HAVE_PULSE=0 - HAVE_NULL=0 - ;; - -+ xoss) -+ if test "x$HAV_OSS" != x1 ; then -+ AC_MSG_ERROR([*** OSS selected for builtin driver, but not enabled. ***]) -+ fi -+ -+ BUILTIN_OSS=1 -+ HAVE_ALSA=0 -+ HAVE_PULSE=0 -+ HAVE_NULL=0 -+ ;; -+ - xnull) - if test "x$HAVE_NULL" != x1 ; then - AC_MSG_ERROR([*** Null output selected for builtin driver, but not enabled. ***]) -@@ -364,6 +407,7 @@ case "x$with_builtin" in - BUILTIN_NULL=1 - HAVE_PULSE=0 - HAVE_ALSA=0 -+ HAVE_OSS=0 - ;; - - xdso) -@@ -376,24 +420,28 @@ case "x$with_builtin" in - AC_MSG_ERROR([*** Unknown driver $with_builtin selected for builtin ***]) - esac - --if test "x$HAVE_PULSE" != x1 -a "x$HAVE_ALSA" != x1 -a "x$HAVE_NULL" != x1 ; then -+if test "x$HAVE_PULSE" != x1 -a "x$HAVE_ALSA" != x1 -a "x$HAVE_OSS" != x1 -a "x$HAVE_NULL" != x1 ; then - AC_MSG_ERROR([*** No backend enabled. ***]) - fi - - AC_SUBST(HAVE_DSO) - AC_SUBST(HAVE_PULSE) - AC_SUBST(HAVE_ALSA) -+AC_SUBST(HAVE_OSS) - AC_SUBST(HAVE_NULL) - AC_SUBST(BUILTIN_DSO) - AC_SUBST(BUILTIN_PULSE) - AC_SUBST(BUILTIN_ALSA) -+AC_SUBST(BUILTIN_OSS) - AC_SUBST(BUILTIN_NULL) - AM_CONDITIONAL([HAVE_PULSE], [test "x$HAVE_PULSE" = x1]) - AM_CONDITIONAL([HAVE_ALSA], [test "x$HAVE_ALSA" = x1]) -+AM_CONDITIONAL([HAVE_OSS], [test "x$HAVE_OSS" = x1]) - AM_CONDITIONAL([HAVE_NULL], [test "x$HAVE_NULL" = x1]) - AM_CONDITIONAL([BUILTIN_DSO], [test "x$BUILTIN_DSO" = x1]) - AM_CONDITIONAL([BUILTIN_PULSE], [test "x$BUILTIN_PULSE" = x1]) - AM_CONDITIONAL([BUILTIN_ALSA], [test "x$BUILTIN_ALSA" = x1]) -+AM_CONDITIONAL([BUILTIN_OSS], [test "x$BUILTIN_OSS" = x1]) - AM_CONDITIONAL([BUILTIN_NULL], [test "x$BUILTIN_NULL" = x1]) - - GTK_DOC_CHECK(1.9) -@@ -435,6 +483,15 @@ if test "x$BUILTIN_ALSA" = "x1" ; then - ENABLE_BUILTIN_ALSA=yes - fi - -+ENABLE_OSS=no -+if test "x$HAVE_OSS" = "x1" ; then -+ ENABLE_OSS=yes -+fi -+ENABLE_BUILTIN_OSS=no -+if test "x$BUILTIN_OSS" = "x1" ; then -+ ENABLE_BUILTIN_OSS=yes -+fi -+ - ENABLE_NULL=no - if test "x$HAVE_NULL" = "x1" ; then - ENABLE_NULL=yes -@@ -464,6 +521,8 @@ echo " - Builtin PulseAudio: ${ENABLE_BUILTIN_PULSE} - Enable ALSA: ${ENABLE_ALSA} - Builtin ALSA: ${ENABLE_BUILTIN_ALSA} -+ Enable OSS: ${ENABLE_OSS} -+ Builtin OSS: ${ENABLE_BUILTIN_OSS} - Enable Null Output: ${ENABLE_NULL} - Builtin Null Output: ${ENABLE_BUILTIN_NULL} - Enable GTK+: ${ENABLE_GTK} diff --git a/audio/libcanberra/files/patch-src_Makefile.am b/audio/libcanberra/files/patch-src_Makefile.am deleted file mode 100644 index 444a825f4794..000000000000 --- a/audio/libcanberra/files/patch-src_Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ ---- src/Makefile.am.orig 2008-08-09 15:27:42.000000000 -0400 -+++ src/Makefile.am 2008-08-09 15:27:55.000000000 -0400 -@@ -164,6 +164,34 @@ libcanberra_alsa_la_LDFLAGS = \ - endif - endif - -+if HAVE_OSS -+if BUILTIN_OSS -+ -+libcanberra_la_SOURCES += \ -+ oss.c -+ -+else -+ -+plugin_LTLIBRARIES += \ -+ libcanberra-oss.la -+ -+libcanberra_oss_la_SOURCES = \ -+ oss.c -+libcanberra_oss_la_CFLAGS = \ -+ -Ddriver_open=oss_driver_open \ -+ -Ddriver_destroy=oss_driver_destroy \ -+ -Ddriver_change_device=oss_driver_change_device \ -+ -Ddriver_change_props=oss_driver_change_props \ -+ -Ddriver_play=oss_driver_play \ -+ -Ddriver_cancel=oss_driver_cancel \ -+ -Ddriver_cache=oss_driver_cache -+libcanberra_oss_la_LIBADD = \ -+ libcanberra.la -+libcanberra_oss_la_LDFLAGS = \ -+ -avoid-version -module -export-dynamic -+endif -+endif -+ - if HAVE_NULL - if BUILTIN_NULL - diff --git a/audio/libcanberra/files/patch-src_Makefile.in b/audio/libcanberra/files/patch-src_Makefile.in deleted file mode 100644 index 8223a42a4929..000000000000 --- a/audio/libcanberra/files/patch-src_Makefile.in +++ /dev/null @@ -1,225 +0,0 @@ ---- src/Makefile.in.orig 2008-08-09 15:27:46.000000000 -0400 -+++ src/Makefile.in 2008-08-09 15:28:08.000000000 -0400 -@@ -92,20 +92,26 @@ noinst_PROGRAMS = test-canberra$(EXEEXT) - @BUILTIN_ALSA_FALSE@@HAVE_ALSA_TRUE@am__append_12 = \ - @BUILTIN_ALSA_FALSE@@HAVE_ALSA_TRUE@ libcanberra-alsa.la - --@BUILTIN_NULL_TRUE@@HAVE_NULL_TRUE@am__append_13 = \ -+@BUILTIN_OSS_TRUE@@HAVE_OSS_TRUE@am__append_13 = \ -+@BUILTIN_OSS_TRUE@@HAVE_OSS_TRUE@ oss.c -+ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@am__append_14 = \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ libcanberra-oss.la -+ -+@BUILTIN_NULL_TRUE@@HAVE_NULL_TRUE@am__append_15 = \ - @BUILTIN_NULL_TRUE@@HAVE_NULL_TRUE@ null.c - --@BUILTIN_NULL_FALSE@@HAVE_NULL_TRUE@am__append_14 = \ -+@BUILTIN_NULL_FALSE@@HAVE_NULL_TRUE@am__append_16 = \ - @BUILTIN_NULL_FALSE@@HAVE_NULL_TRUE@ libcanberra-null.la - --@HAVE_GTK_TRUE@am__append_15 = \ -+@HAVE_GTK_TRUE@am__append_17 = \ - @HAVE_GTK_TRUE@ libcanberra-gtk.la - --@HAVE_GTK_TRUE@am__append_16 = \ -+@HAVE_GTK_TRUE@am__append_18 = \ - @HAVE_GTK_TRUE@ canberra-gtk.h - - @HAVE_GTK_TRUE@bin_PROGRAMS = canberra-gtk-play$(EXEEXT) --@HAVE_GTK_TRUE@am__append_17 = \ -+@HAVE_GTK_TRUE@am__append_19 = \ - @HAVE_GTK_TRUE@ libcanberra-login-sound.desktop.in \ - @HAVE_GTK_TRUE@ libcanberra-logout-sound.sh.in - -@@ -193,6 +199,18 @@ libcanberra_null_la_LINK = $(LIBTOOL) -- - $(libcanberra_null_la_LDFLAGS) $(LDFLAGS) -o $@ - @BUILTIN_NULL_FALSE@@HAVE_NULL_TRUE@am_libcanberra_null_la_rpath = \ - @BUILTIN_NULL_FALSE@@HAVE_NULL_TRUE@ -rpath $(plugindir) -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_DEPENDENCIES = \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ libcanberra.la -+am__libcanberra_oss_la_SOURCES_DIST = oss.c -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@am_libcanberra_oss_la_OBJECTS = \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ libcanberra_oss_la-oss.lo -+libcanberra_oss_la_OBJECTS = $(am_libcanberra_oss_la_OBJECTS) -+libcanberra_oss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(libcanberra_oss_la_CFLAGS) $(CFLAGS) \ -+ $(libcanberra_oss_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@am_libcanberra_oss_la_rpath = \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -rpath $(plugindir) - @BUILTIN_PULSE_FALSE@@HAVE_PULSE_TRUE@libcanberra_pulse_la_DEPENDENCIES = \ - @BUILTIN_PULSE_FALSE@@HAVE_PULSE_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILTIN_PULSE_FALSE@@HAVE_PULSE_TRUE@ libcanberra.la -@@ -218,14 +236,17 @@ am__libcanberra_la_SOURCES_DIST = canber - read-sound-file.c read-sound-file.h read-vorbis.c \ - read-vorbis.h read-wav.c read-wav.h sound-theme-spec.c \ - sound-theme-spec.h llist.h macro.h macro.c malloc.c malloc.h \ -- dso.c driver-order.c driver-order.h pulse.c alsa.c null.c -+ dso.c driver-order.c driver-order.h pulse.c alsa.c oss.c \ -+ null.c - @BUILTIN_DSO_TRUE@am__objects_1 = libcanberra_la-dso.lo \ - @BUILTIN_DSO_TRUE@ libcanberra_la-driver-order.lo - @BUILTIN_PULSE_TRUE@@HAVE_PULSE_TRUE@am__objects_2 = \ - @BUILTIN_PULSE_TRUE@@HAVE_PULSE_TRUE@ libcanberra_la-pulse.lo - @BUILTIN_ALSA_TRUE@@HAVE_ALSA_TRUE@am__objects_3 = \ - @BUILTIN_ALSA_TRUE@@HAVE_ALSA_TRUE@ libcanberra_la-alsa.lo --@BUILTIN_NULL_TRUE@@HAVE_NULL_TRUE@am__objects_4 = \ -+@BUILTIN_OSS_TRUE@@HAVE_OSS_TRUE@am__objects_4 = \ -+@BUILTIN_OSS_TRUE@@HAVE_OSS_TRUE@ libcanberra_la-oss.lo -+@BUILTIN_NULL_TRUE@@HAVE_NULL_TRUE@am__objects_5 = \ - @BUILTIN_NULL_TRUE@@HAVE_NULL_TRUE@ libcanberra_la-null.lo - am_libcanberra_la_OBJECTS = libcanberra_la-common.lo \ - libcanberra_la-mutex-posix.lo libcanberra_la-proplist.lo \ -@@ -233,7 +254,7 @@ am_libcanberra_la_OBJECTS = libcanberra_ - libcanberra_la-read-vorbis.lo libcanberra_la-read-wav.lo \ - libcanberra_la-sound-theme-spec.lo libcanberra_la-macro.lo \ - libcanberra_la-malloc.lo $(am__objects_1) $(am__objects_2) \ -- $(am__objects_3) $(am__objects_4) -+ $(am__objects_3) $(am__objects_4) $(am__objects_5) - libcanberra_la_OBJECTS = $(am_libcanberra_la_OBJECTS) - libcanberra_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcanberra_la_CFLAGS) \ -@@ -271,14 +292,15 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF - SOURCES = $(libcanberra_alsa_la_SOURCES) \ - $(libcanberra_gtk_module_la_SOURCES) \ - $(libcanberra_gtk_la_SOURCES) $(libcanberra_multi_la_SOURCES) \ -- $(libcanberra_null_la_SOURCES) $(libcanberra_pulse_la_SOURCES) \ -- $(libcanberra_la_SOURCES) $(canberra_gtk_play_SOURCES) \ -- $(test_canberra_SOURCES) -+ $(libcanberra_null_la_SOURCES) $(libcanberra_oss_la_SOURCES) \ -+ $(libcanberra_pulse_la_SOURCES) $(libcanberra_la_SOURCES) \ -+ $(canberra_gtk_play_SOURCES) $(test_canberra_SOURCES) - DIST_SOURCES = $(am__libcanberra_alsa_la_SOURCES_DIST) \ - $(am__libcanberra_gtk_module_la_SOURCES_DIST) \ - $(am__libcanberra_gtk_la_SOURCES_DIST) \ - $(am__libcanberra_multi_la_SOURCES_DIST) \ - $(am__libcanberra_null_la_SOURCES_DIST) \ -+ $(am__libcanberra_oss_la_SOURCES_DIST) \ - $(am__libcanberra_pulse_la_SOURCES_DIST) \ - $(am__libcanberra_la_SOURCES_DIST) \ - $(am__canberra_gtk_play_SOURCES_DIST) $(test_canberra_SOURCES) -@@ -303,6 +325,7 @@ AWK = @AWK@ - BUILTIN_ALSA = @BUILTIN_ALSA@ - BUILTIN_DSO = @BUILTIN_DSO@ - BUILTIN_NULL = @BUILTIN_NULL@ -+BUILTIN_OSS = @BUILTIN_OSS@ - BUILTIN_PULSE = @BUILTIN_PULSE@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ -@@ -335,6 +358,7 @@ HAVE_ALSA = @HAVE_ALSA@ - HAVE_DSO = @HAVE_DSO@ - HAVE_GTK = @HAVE_GTK@ - HAVE_NULL = @HAVE_NULL@ -+HAVE_OSS = @HAVE_OSS@ - HAVE_PULSE = @HAVE_PULSE@ - HTML_DIR = @HTML_DIR@ - INSTALL = @INSTALL@ -@@ -443,15 +467,16 @@ gnomeautostartdir = $(datadir)/gnome/aut - AM_CFLAGS = $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"$(plugindir)\" - AM_CXXFLAGS = $(PTHREAD_CFLAGS) - AM_LDADD = $(PTHREAD_LIBS) --EXTRA_DIST = map-file $(am__append_17) --lib_LTLIBRARIES = libcanberra.la $(am__append_15) --include_HEADERS = canberra.h $(am__append_16) -+EXTRA_DIST = map-file $(am__append_19) -+lib_LTLIBRARIES = libcanberra.la $(am__append_17) -+include_HEADERS = canberra.h $(am__append_18) - libcanberra_la_SOURCES = canberra.h common.c common.h mutex-posix.c \ - mutex.h proplist.c proplist.h driver.h read-sound-file.c \ - read-sound-file.h read-vorbis.c read-vorbis.h read-wav.c \ - read-wav.h sound-theme-spec.c sound-theme-spec.h llist.h \ - macro.h macro.c malloc.c malloc.h $(am__append_1) \ -- $(am__append_5) $(am__append_9) $(am__append_13) -+ $(am__append_5) $(am__append_9) $(am__append_13) \ -+ $(am__append_15) - libcanberra_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS) $(am__append_2) \ - $(am__append_6) $(am__append_10) - libcanberra_la_LIBADD = $(VORBIS_LIBS) $(am__append_3) $(am__append_7) \ -@@ -462,7 +487,7 @@ libcanberra_la_LDFLAGS = \ - -Wl,-version-script=$(srcdir)/map-file - - plugin_LTLIBRARIES = $(am__append_4) $(am__append_8) $(am__append_12) \ -- $(am__append_14) -+ $(am__append_14) $(am__append_16) - @BUILTIN_DSO_TRUE@libcanberra_multi_la_SOURCES = \ - @BUILTIN_DSO_TRUE@ multi.c - -@@ -521,6 +546,24 @@ plugin_LTLIBRARIES = $(am__append_4) $(a - @BUILTIN_ALSA_FALSE@@HAVE_ALSA_TRUE@libcanberra_alsa_la_LDFLAGS = \ - @BUILTIN_ALSA_FALSE@@HAVE_ALSA_TRUE@ -avoid-version -module -export-dynamic - -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_SOURCES = \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ oss.c -+ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_CFLAGS = \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_open=oss_driver_open \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_destroy=oss_driver_destroy \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_change_device=oss_driver_change_device \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_change_props=oss_driver_change_props \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_play=oss_driver_play \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cancel=oss_driver_cancel \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cache=oss_driver_cache -+ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_LIBADD = \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ libcanberra.la -+ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_LDFLAGS = \ -+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -avoid-version -module -export-dynamic -+ - @BUILTIN_NULL_FALSE@@HAVE_NULL_TRUE@libcanberra_null_la_SOURCES = \ - @BUILTIN_NULL_FALSE@@HAVE_NULL_TRUE@ null.c - -@@ -722,6 +765,8 @@ libcanberra-multi.la: $(libcanberra_mult - $(libcanberra_multi_la_LINK) $(am_libcanberra_multi_la_rpath) $(libcanberra_multi_la_OBJECTS) $(libcanberra_multi_la_LIBADD) $(LIBS) - libcanberra-null.la: $(libcanberra_null_la_OBJECTS) $(libcanberra_null_la_DEPENDENCIES) - $(libcanberra_null_la_LINK) $(am_libcanberra_null_la_rpath) $(libcanberra_null_la_OBJECTS) $(libcanberra_null_la_LIBADD) $(LIBS) -+libcanberra-oss.la: $(libcanberra_oss_la_OBJECTS) $(libcanberra_oss_la_DEPENDENCIES) -+ $(libcanberra_oss_la_LINK) $(am_libcanberra_oss_la_rpath) $(libcanberra_oss_la_OBJECTS) $(libcanberra_oss_la_LIBADD) $(LIBS) - libcanberra-pulse.la: $(libcanberra_pulse_la_OBJECTS) $(libcanberra_pulse_la_DEPENDENCIES) - $(libcanberra_pulse_la_LINK) $(am_libcanberra_pulse_la_rpath) $(libcanberra_pulse_la_OBJECTS) $(libcanberra_pulse_la_LIBADD) $(LIBS) - libcanberra.la: $(libcanberra_la_OBJECTS) $(libcanberra_la_DEPENDENCIES) -@@ -805,6 +850,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_la-malloc.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_la-mutex-posix.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_la-null.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_la-oss.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_la-proplist.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_la-pulse.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_la-read-sound-file.Plo@am__quote@ -@@ -813,6 +859,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_la-sound-theme-spec.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_multi_la-multi.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_null_la-null.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_oss_la-oss.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcanberra_pulse_la-pulse.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-canberra.Po@am__quote@ - -@@ -872,6 +919,13 @@ libcanberra_null_la-null.lo: null.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcanberra_null_la_CFLAGS) $(CFLAGS) -c -o libcanberra_null_la-null.lo `test -f 'null.c' || echo '$(srcdir)/'`null.c - -+libcanberra_oss_la-oss.lo: oss.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcanberra_oss_la_CFLAGS) $(CFLAGS) -MT libcanberra_oss_la-oss.lo -MD -MP -MF $(DEPDIR)/libcanberra_oss_la-oss.Tpo -c -o libcanberra_oss_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcanberra_oss_la-oss.Tpo $(DEPDIR)/libcanberra_oss_la-oss.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='oss.c' object='libcanberra_oss_la-oss.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcanberra_oss_la_CFLAGS) $(CFLAGS) -c -o libcanberra_oss_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c -+ - libcanberra_pulse_la-pulse.lo: pulse.c - @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcanberra_pulse_la_CFLAGS) $(CFLAGS) -MT libcanberra_pulse_la-pulse.lo -MD -MP -MF $(DEPDIR)/libcanberra_pulse_la-pulse.Tpo -c -o libcanberra_pulse_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c - @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcanberra_pulse_la-pulse.Tpo $(DEPDIR)/libcanberra_pulse_la-pulse.Plo -@@ -970,6 +1024,13 @@ libcanberra_la-alsa.lo: alsa.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcanberra_la_CFLAGS) $(CFLAGS) -c -o libcanberra_la-alsa.lo `test -f 'alsa.c' || echo '$(srcdir)/'`alsa.c - -+libcanberra_la-oss.lo: oss.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcanberra_la_CFLAGS) $(CFLAGS) -MT libcanberra_la-oss.lo -MD -MP -MF $(DEPDIR)/libcanberra_la-oss.Tpo -c -o libcanberra_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcanberra_la-oss.Tpo $(DEPDIR)/libcanberra_la-oss.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='oss.c' object='libcanberra_la-oss.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcanberra_la_CFLAGS) $(CFLAGS) -c -o libcanberra_la-oss.lo `test -f 'oss.c' || echo '$(srcdir)/'`oss.c -+ - libcanberra_la-null.lo: null.c - @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcanberra_la_CFLAGS) $(CFLAGS) -MT libcanberra_la-null.lo -MD -MP -MF $(DEPDIR)/libcanberra_la-null.Tpo -c -o libcanberra_la-null.lo `test -f 'null.c' || echo '$(srcdir)/'`null.c - @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcanberra_la-null.Tpo $(DEPDIR)/libcanberra_la-null.Plo diff --git a/audio/libcanberra/files/patch-src_driver-order.c b/audio/libcanberra/files/patch-src_driver-order.c deleted file mode 100644 index 35a0f474a886..000000000000 --- a/audio/libcanberra/files/patch-src_driver-order.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/driver-order.c.orig 2008-08-09 16:04:21.964956000 -0400 -+++ src/driver-order.c 2008-08-09 16:04:21.964956000 -0400 -@@ -34,6 +34,9 @@ const char* const ca_driver_order[] = { - #ifdef HAVE_ALSA - "alsa", - #endif -+#ifdef HAVE_OSS -+ "oss", -+#endif - /* ... */ - NULL - }; diff --git a/audio/libcanberra/files/patch-src_malloc.h b/audio/libcanberra/files/patch-src_malloc.h deleted file mode 100644 index 58efa3096a04..000000000000 --- a/audio/libcanberra/files/patch-src_malloc.h +++ /dev/null @@ -1,35 +0,0 @@ ---- src/malloc.h.orig 2008-06-10 10:42:46.000000000 -0400 -+++ src/malloc.h 2008-08-05 23:34:40.000000000 -0400 -@@ -31,6 +31,32 @@ - #define ca_free free - #define ca_malloc0(size) calloc(1, (size)) - #define ca_strdup strdup -+#ifdef __FreeBSD__ -+static inline char *strndup (const char *s, size_t n) -+{ -+ size_t nAvail; -+ char *p; -+ -+ if (!s) { -+ return NULL; -+ } -+ -+ if (memchr (s, '\0', n) != NULL) { -+ nAvail = strlen (s); -+ if (nAvail > n) -+ nAvail = n; -+ } else { -+ nAvail = n; -+ } -+ p = ca_malloc (nAvail + 1); -+ if (p == NULL) -+ return NULL; -+ memcpy (p, s, nAvail); -+ p[nAvail] = '\0'; -+ -+ return p; -+} -+#endif - #define ca_strndup strndup - - void* ca_memdup(const void* p, size_t size); diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c index 8fee452883b7..ec8bdc3c4011 100644 --- a/audio/libcanberra/files/patch-src_oss.c +++ b/audio/libcanberra/files/patch-src_oss.c @@ -1,478 +1,28 @@ ---- src/oss.c.orig 2008-08-10 01:57:54.353155000 -0400 -+++ src/oss.c 2008-08-10 02:12:43.640204000 -0400 -@@ -0,0 +1,475 @@ -+/*** -+ This file is part of libcanberra. -+ -+ Copyright 2008 Joe Marcus Clarke -+ -+ libcanberra is free software; you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as -+ published by the Free Software Foundation, either version 2.1 of the -+ License, or (at your option) any later version. -+ -+ libcanberra is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with libcanberra. If not, If not, see -+ <http://www.gnu.org/licenses/>. -+***/ -+ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#include <sys/types.h> -+#include <sys/ioctl.h> -+#include <sys/uio.h> -+#include <unistd.h> -+ -+#ifdef HAVE_MACHINE_SOUNDCARD_H -+# include <machine/soundcard.h> -+#else -+# ifdef HAVE_SOUNDCARD_H -+# include <soundcard.h> -+# else -+# include <sys/soundcard.h> -+# endif -+#endif -+ -+#include <errno.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <poll.h> -+#include <pthread.h> -+#include <semaphore.h> -+ -+#include "canberra.h" -+#include "common.h" -+#include "driver.h" -+#include "llist.h" -+#include "read-sound-file.h" -+#include "sound-theme-spec.h" -+#include "malloc.h" -+ -+struct private; -+ -+struct outstanding { -+ CA_LLIST_FIELDS(struct outstanding); -+ ca_bool_t dead; -+ uint32_t id; -+ ca_finish_callback_t callback; -+ void *userdata; -+ ca_sound_file *file; -+ int pcm; -+ int pipe_fd[2]; -+ ca_context *context; -+}; -+ -+struct private { -+ ca_theme_data *theme; -+ ca_mutex *outstanding_mutex; -+ ca_bool_t signal_semaphore; -+ sem_t semaphore; -+ ca_bool_t semaphore_allocated; -+ CA_LLIST_HEAD(struct outstanding, outstanding); -+}; -+ -+#define PRIVATE(c) ((struct private *) ((c)->private)) -+ -+static void outstanding_free(struct outstanding *o) { -+ ca_assert(o); -+ -+ if (o->pipe_fd[1] >= 0) -+ close(o->pipe_fd[1]); -+ -+ if (o->pipe_fd[0] >= 0) -+ close(o->pipe_fd[0]); -+ -+ if (o->file) -+ ca_sound_file_close(o->file); -+ -+ if (o->pcm > -1) { -+ close(o->pcm); -+ o->pcm = -1; -+ } -+ -+ ca_free(o); -+} -+ -+int driver_open(ca_context *c) { -+ struct private *p; -+ -+ ca_return_val_if_fail(c, CA_ERROR_INVALID); -+ ca_return_val_if_fail(!c->driver || ca_streq(c->driver, "oss"), CA_ERROR_NODRIVER); -+ ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE); -+ -+ if (!(c->private = p = ca_new0(struct private, 1))) -+ return CA_ERROR_OOM; -+ -+ if (!(p->outstanding_mutex = ca_mutex_new())) { -+ driver_destroy(c); -+ return CA_ERROR_OOM; -+ } -+ -+ if (sem_init(&p->semaphore, 0, 0) < 0) { -+ driver_destroy(c); -+ return CA_ERROR_OOM; -+ } -+ -+ p->semaphore_allocated = TRUE; -+ -+ return CA_SUCCESS; -+} -+ -+int driver_destroy(ca_context *c) { -+ struct private *p; -+ struct outstanding *out; -+ -+ ca_return_val_if_fail(c, CA_ERROR_INVALID); -+ ca_return_val_if_fail(c->private, CA_ERROR_STATE); -+ -+ p = PRIVATE(c); -+ -+ if (p->outstanding_mutex) { -+ ca_mutex_lock(p->outstanding_mutex); -+ -+ /* Tell all player threads to terminate */ -+ for (out = p->outstanding; out; out = out->next) { -+ -+ if (out->dead) -+ continue; -+ -+ out->dead = TRUE; -+ -+ if (out->callback) -+ out->callback(c, out->id, CA_ERROR_DESTROYED, out->userdata); -+ -+ /* This will cause the thread to wakeup and terminate */ -+ if (out->pipe_fd[1] >= 0) { -+ close(out->pipe_fd[1]); -+ out->pipe_fd[1] = -1; -+ } -+ } -+ -+ if (p->semaphore_allocated) { -+ /* Now wait until all players are destroyed */ -+ p->signal_semaphore = TRUE; -+ while (p->outstanding) { -+ ca_mutex_unlock(p->outstanding_mutex); -+ sem_wait(&p->semaphore); -+ ca_mutex_lock(p->outstanding_mutex); -+ } -+ } -+ -+ ca_mutex_unlock(p->outstanding_mutex); -+ ca_mutex_free(p->outstanding_mutex); -+ } -+ -+ if (p->theme) -+ ca_theme_data_free(p->theme); -+ -+ if (p->semaphore_allocated) -+ sem_destroy(&p->semaphore); -+ -+ ca_free(p); -+ -+ c->private = NULL; -+ -+ return CA_SUCCESS; -+} -+ -+int driver_change_device(ca_context *c, char *device) { -+ ca_return_val_if_fail(c, CA_ERROR_INVALID); -+ ca_return_val_if_fail(c->private, CA_ERROR_STATE); -+ -+ return CA_SUCCESS; -+} -+ -+int driver_change_props(ca_context *c, ca_proplist *changed, ca_proplist *merged) { -+ ca_return_val_if_fail(c, CA_ERROR_INVALID); -+ ca_return_val_if_fail(changed, CA_ERROR_INVALID); -+ ca_return_val_if_fail(merged, CA_ERROR_INVALID); -+ -+ return CA_SUCCESS; -+} -+ -+int driver_cache(ca_context *c, ca_proplist *proplist) { -+ ca_return_val_if_fail(c, CA_ERROR_INVALID); -+ ca_return_val_if_fail(proplist, CA_ERROR_INVALID); -+ -+ return CA_ERROR_NOTSUPPORTED; -+} -+ -+static int translate_error(int error) { -+ -+ switch (error) { -+ case ENODEV: -+ case ENOENT: -+ return CA_ERROR_NOTFOUND; -+ case EACCES: -+ case EPERM: -+ return CA_ERROR_ACCESS; -+ case ENOMEM: -+ return CA_ERROR_OOM; -+ case EBUSY: -+ return CA_ERROR_NOTAVAILABLE; -+ default: -+ if (ca_debug()) -+ fprintf(stderr, "Got unhandled error from OSS: %s\n", strerror(error)); -+ return CA_ERROR_IO; -+ } -+} -+ -+static int open_oss(ca_context *c, struct outstanding *out) { -+ struct private *p; -+ int mode; -+ int val; -+ int ret; -+ -+ ca_return_val_if_fail(c, CA_ERROR_INVALID); -+ ca_return_val_if_fail(c->private, CA_ERROR_STATE); -+ ca_return_val_if_fail(out, CA_ERROR_INVALID); -+ -+ p = PRIVATE(c); -+ -+ if ((out->pcm = open(c->device ? c->device : "/dev/dsp", O_WRONLY | O_NONBLOCK, 0)) < 0) -+ goto finish; -+ -+ mode = fcntl(out->pcm, F_GETFL); -+ mode &= ~O_NONBLOCK; -+ fcntl(out->pcm, F_SETFL, mode); -+ -+ switch (ca_sound_file_get_sample_type(out->file)) { -+ case CA_SAMPLE_U8: -+ val = AFMT_U8; -+ break; -+ case CA_SAMPLE_S16NE: -+ val = AFMT_S16_NE; -+ break; -+ case CA_SAMPLE_S16RE: +--- src/oss.c.orig 2008-09-01 19:53:47.000000000 -0400 ++++ src/oss.c 2008-12-21 13:51:09.000000000 -0500 +@@ -235,7 +235,7 @@ static int open_oss(ca_context *c, struc + ca_return_val_if_fail(c, CA_ERROR_INVALID); + ca_return_val_if_fail(c->private, CA_ERROR_STATE); + ca_return_val_if_fail(out, CA_ERROR_INVALID); +- ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) > 2, CA_ERROR_NOTSUPPORTED); ++ ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED); + + p = PRIVATE(c); + +@@ -258,7 +258,7 @@ static int open_oss(ca_context *c, struc + val = AFMT_S16_NE; + break; + case CA_SAMPLE_S16RE: +-#if __BYTE_ORDER == __LITTLE_ENDIAN +#if _BYTE_ORDER == _LITTLE_ENDIAN -+ val = AFMT_S16_BE; -+#else -+ val = AFMT_S16_LE; -+#endif -+ break; -+ } -+ -+ if (ioctl(out->pcm, SNDCTL_DSP_SETFMT, &val) < 0) -+ goto finish; -+ -+ val = ca_sound_file_get_nchannels(out->file) > 1 ? 1 : 0; -+ if (ioctl(out->pcm, SNDCTL_DSP_STEREO, &val) < 0) -+ goto finish; -+ -+ val = ca_sound_file_get_rate(out->file); -+ if (ioctl(out->pcm, SNDCTL_DSP_SPEED, &val) < 0) -+ goto finish; -+ -+ return CA_SUCCESS; -+ -+finish: -+ -+ ret = errno; -+ close(out->pcm); + val = AFMT_S16_BE; + #else + val = AFMT_S16_LE; +@@ -423,6 +423,7 @@ int driver_play(ca_context *c, uint32_t + out->callback = cb; + out->userdata = userdata; + out->pipe_fd[0] = out->pipe_fd[1] = -1; + out->pcm = -1; -+ return translate_error(ret); -+} -+ -+#define BUFSIZE (4*1024) -+ -+static void* thread_func(void *userdata) { -+ struct outstanding *out = userdata; -+ int ret; -+ void *data, *d = NULL; -+ ssize_t bytes_written; -+ size_t fs, data_size; -+ size_t nbytes = 0; -+ struct pollfd *pfd = NULL; -+ nfds_t n_pfd; -+ struct private *p; -+ -+ p = PRIVATE(out->context); -+ -+ pthread_detach(pthread_self()); -+ -+ fs = ca_sound_file_frame_size(out->file); -+ data_size = (BUFSIZE/fs)*fs; -+ -+ if (!(data = ca_malloc(data_size))) { -+ ret = CA_ERROR_OOM; -+ goto finish; -+ } -+ -+ n_pfd = 2; -+ if (!(pfd = ca_new(struct pollfd, n_pfd))) { -+ ret = CA_ERROR_OOM; -+ goto finish; -+ } -+ -+ pfd[0].fd = out->pipe_fd[0]; -+ pfd[0].events = POLLIN; -+ pfd[0].revents = 0; -+ pfd[1].fd = out->pcm; -+ pfd[1].events = POLLOUT; -+ pfd[1].revents = 0; -+ -+ for (;;) { -+ if (out->dead) -+ break; -+ -+ if (poll(pfd, n_pfd, -1) < 0) { -+ ret = CA_ERROR_SYSTEM; -+ goto finish; -+ } -+ -+ /* We have been asked to shut down */ -+ if (pfd[0].revents) -+ break; -+ -+ if (nbytes <= 0) { -+ -+ nbytes = data_size; -+ -+ if ((ret = ca_sound_file_read_arbitrary(out->file, data, &nbytes)) < 0) -+ goto finish; -+ -+ d = data; -+ } -+ -+ if (nbytes <= 0) { -+ break; -+ } -+ -+ if ((bytes_written = write(out->pcm, d, nbytes)) <= 0) { -+ ret = errno; -+ goto finish; -+ -+ } -+ -+ nbytes -= bytes_written; -+ d = (uint8_t*) d + bytes_written; -+ } -+ -+ ret = CA_SUCCESS; -+ -+finish: -+ -+ ca_free(data); -+ ca_free(pfd); -+ -+ if (!out->dead) -+ if (out->callback) -+ out->callback(out->context, out->id, ret, out->userdata); -+ -+ ca_mutex_lock(p->outstanding_mutex); -+ -+ CA_LLIST_REMOVE(struct outstanding, p->outstanding, out); -+ -+ if (!p->outstanding && p->signal_semaphore) -+ sem_post(&p->semaphore); -+ -+ outstanding_free(out); -+ -+ ca_mutex_unlock(p->outstanding_mutex); -+ -+ return NULL; -+} -+ -+int driver_play(ca_context *c, uint32_t id, ca_proplist *proplist, ca_finish_callback_t cb, void *userdata) { -+ struct private *p; -+ struct outstanding *out = NULL; -+ int ret; -+ pthread_t thread; -+ -+ ca_return_val_if_fail(c, CA_ERROR_INVALID); -+ ca_return_val_if_fail(proplist, CA_ERROR_INVALID); -+ ca_return_val_if_fail(!userdata || cb, CA_ERROR_INVALID); -+ ca_return_val_if_fail(c->private, CA_ERROR_STATE); -+ -+ p = PRIVATE(c); -+ -+ if (!(out = ca_new0(struct outstanding, 1))) { -+ ret = CA_ERROR_OOM; -+ goto finish; -+ } -+ -+ out->context = c; -+ out->id = id; -+ out->callback = cb; -+ out->userdata = userdata; -+ out->pipe_fd[0] = out->pipe_fd[1] = -1; -+ -+ if (pipe(out->pipe_fd) < 0) { -+ ret = CA_ERROR_SYSTEM; -+ goto finish; -+ } -+ -+ if ((ret = ca_lookup_sound(&out->file, &p->theme, c->props, proplist)) < 0) -+ goto finish; -+ -+ if ((ret = open_oss(c, out)) < 0) -+ goto finish; -+ -+ /* OK, we're ready to go, so let's add this to our list */ -+ ca_mutex_lock(p->outstanding_mutex); -+ CA_LLIST_PREPEND(struct outstanding, p->outstanding, out); -+ ca_mutex_unlock(p->outstanding_mutex); -+ -+ if (pthread_create(&thread, NULL, thread_func, out) < 0) { -+ ret = CA_ERROR_OOM; -+ -+ ca_mutex_lock(p->outstanding_mutex); -+ CA_LLIST_REMOVE(struct outstanding, p->outstanding, out); -+ ca_mutex_unlock(p->outstanding_mutex); -+ -+ goto finish; -+ } -+ -+ ret = CA_SUCCESS; -+ -+finish: -+ -+ /* We keep the outstanding struct around if we need clean up later to */ -+ if (ret != CA_SUCCESS) -+ outstanding_free(out); -+ -+ return ret; -+} -+ -+int driver_cancel(ca_context *c, uint32_t id) { -+ struct private *p; -+ struct outstanding *out; -+ -+ ca_return_val_if_fail(c, CA_ERROR_INVALID); -+ ca_return_val_if_fail(c->private, CA_ERROR_STATE); -+ -+ p = PRIVATE(c); -+ -+ ca_mutex_lock(p->outstanding_mutex); -+ -+ for (out = p->outstanding; out; out = out->next) { -+ -+ if (out->id != id) -+ continue; -+ -+ if (out->dead) -+ continue; -+ -+ out->dead = TRUE; -+ -+ if (out->callback) -+ out->callback(c, out->id, CA_ERROR_CANCELED, out->userdata); -+ -+ /* This will cause the thread to wakeup and terminate */ -+ if (out->pipe_fd[1] >= 0) { -+ close(out->pipe_fd[1]); -+ out->pipe_fd[1] = -1; -+ } -+ } -+ -+ ca_mutex_unlock(p->outstanding_mutex); -+ -+ return CA_SUCCESS; -+} + + if (pipe(out->pipe_fd) < 0) { + ret = CA_ERROR_SYSTEM; diff --git a/audio/libcanberra/pkg-descr b/audio/libcanberra/pkg-descr index 7678d1df6686..bd46b142e00f 100644 --- a/audio/libcanberra/pkg-descr +++ b/audio/libcanberra/pkg-descr @@ -1,2 +1,4 @@ Libcanberra is an implementation of the Freedesktop Sound Theme specification. It allows developers to play sounds given a list of events. + +WWW: http://0pointer.de/lennart/projects/libcanberra/ diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist index 8a2a4703e878..816a75992ec4 100644 --- a/audio/libcanberra/pkg-plist +++ b/audio/libcanberra/pkg-plist @@ -12,20 +12,24 @@ lib/libcanberra.a lib/libcanberra.la lib/libcanberra.so lib/libcanberra.so.0 +%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.a +%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.la +%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.so lib/libcanberra/libcanberra-multi.a lib/libcanberra/libcanberra-multi.la lib/libcanberra/libcanberra-multi.so lib/libcanberra/libcanberra-null.a lib/libcanberra/libcanberra-null.la lib/libcanberra/libcanberra-null.so -%%OSS%%lib/libcanberra/libcanberra-oss.a -%%OSS%%lib/libcanberra/libcanberra-oss.la -%%OSS%%lib/libcanberra/libcanberra-oss.so +lib/libcanberra/libcanberra-oss.a +lib/libcanberra/libcanberra-oss.la +lib/libcanberra/libcanberra-oss.so %%PULSE%%lib/libcanberra/libcanberra-pulse.a %%PULSE%%lib/libcanberra/libcanberra-pulse.la %%PULSE%%lib/libcanberra/libcanberra-pulse.so libdata/pkgconfig/libcanberra-gtk.pc libdata/pkgconfig/libcanberra.pc +%%DOCSDIR%%/README %%DOCSDIR%%/ch01.html %%DOCSDIR%%/home.png %%DOCSDIR%%/index.html diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index 118be6773970..50cc486470de 100644 --- a/audio/rhythmbox-devel/Makefile +++ b/audio/rhythmbox-devel/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/audio/rhythmbox-devel/Makefile,v 1.2 2009/01/09 23:41:21 mezz Exp $ +# $MCom: ports/audio/rhythmbox-devel/Makefile,v 1.98 2008/08/24 22:26:21 marcus Exp $ # PORTNAME= rhythmbox @@ -19,7 +19,7 @@ COMMENT= Audio player for GNOME LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ id3tag.0:${PORTSDIR}/audio/libid3tag \ - totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser \ + totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sexy.2:${PORTSDIR}/x11-toolkits/libsexy \ soup-2.4.1:${PORTSDIR}/devel/libsoup \ diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index f1e4ef5dfc43..c3d9130320e4 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.88 2008/01/29 01:37:44 marcus Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.93 2009/01/10 01:59:21 mezz Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.10.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 @@ -19,7 +19,7 @@ COMMENT= Audio player for GNOME LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ id3tag.0:${PORTSDIR}/audio/libid3tag \ - totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser \ + totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sexy.2:${PORTSDIR}/x11-toolkits/libsexy \ soup-2.2.8:${PORTSDIR}/devel/libsoup22 \ diff --git a/audio/rhythmbox/files/patch-shell_Makefile.in b/audio/rhythmbox/files/patch-shell_Makefile.in new file mode 100644 index 000000000000..970fee8a0c47 --- /dev/null +++ b/audio/rhythmbox/files/patch-shell_Makefile.in @@ -0,0 +1,10 @@ +--- shell/Makefile.in.orig 2008-06-07 13:56:05.000000000 -0400 ++++ shell/Makefile.in 2008-06-07 13:56:26.000000000 -0400 +@@ -351,6 +351,7 @@ INCLUDES = \ + $(WARN_CFLAGS) \ + $(GDA_CFLAGS) \ + $(RHYTHMBOX_CFLAGS) \ ++ $(SOUP_CFLAGS) \ + $(TOTEM_PLPARSER_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBNAUTILUS_BURN_CFLAGS) \ diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index 91068b542b5e..7357c84bc04d 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/sound-juicer/Makefile,v 1.79 2008/03/10 20:39:31 mezz Exp $ +# $MCom: ports/audio/sound-juicer/Makefile,v 1.87 2008/09/21 06:37:08 kwm Exp $ # PORTNAME= sound-juicer -PORTVERSION= 2.22.0 -PORTREVISION= 4 +PORTVERSION= 2.24.0 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -40,6 +39,7 @@ GCONF_SCHEMAS= sound-juicer.schemas post-patch: @${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)tests\(.*\)|\1\2|' \ ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure post-install: @-update-desktop-database diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo index cd51269a0247..29caaed87dae 100644 --- a/audio/sound-juicer/distinfo +++ b/audio/sound-juicer/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/sound-juicer-2.22.0.tar.bz2) = 20f83a28915b7d7029198396258d1b4f -SHA256 (gnome2/sound-juicer-2.22.0.tar.bz2) = cabd3c44a3354edab4f9e112b1cc90c23ef05000bd643596a826ce5d0cfc2551 -SIZE (gnome2/sound-juicer-2.22.0.tar.bz2) = 1748273 +MD5 (gnome2/sound-juicer-2.24.0.tar.bz2) = 504979aadec8df1e59c1050bc968b2aa +SHA256 (gnome2/sound-juicer-2.24.0.tar.bz2) = 66a6573465c5458daf7802a0aea729af68a2b87a2833ad1798797b6d69e8af5f +SIZE (gnome2/sound-juicer-2.24.0.tar.bz2) = 1834986 diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist index d530d0daa54a..be4170553fed 100644 --- a/audio/sound-juicer/pkg-plist +++ b/audio/sound-juicer/pkg-plist @@ -1,66 +1,57 @@ bin/sound-juicer share/applications/sound-juicer.desktop -share/gnome/help/sound-juicer/C/fdl-appendix.xml share/gnome/help/sound-juicer/C/figures/prefs.png share/gnome/help/sound-juicer/C/figures/startup.png share/gnome/help/sound-juicer/C/legal.xml share/gnome/help/sound-juicer/C/sound-juicer.xml -share/gnome/help/sound-juicer/de/fdl-appendix.xml +share/gnome/help/sound-juicer/ca/figures/prefs.png +share/gnome/help/sound-juicer/ca/figures/startup.png +share/gnome/help/sound-juicer/ca/legal.xml +share/gnome/help/sound-juicer/ca/sound-juicer.xml share/gnome/help/sound-juicer/de/figures/prefs.png share/gnome/help/sound-juicer/de/figures/startup.png share/gnome/help/sound-juicer/de/legal.xml share/gnome/help/sound-juicer/de/sound-juicer.xml -share/gnome/help/sound-juicer/el/fdl-appendix.xml share/gnome/help/sound-juicer/el/figures/prefs.png share/gnome/help/sound-juicer/el/figures/startup.png share/gnome/help/sound-juicer/el/legal.xml share/gnome/help/sound-juicer/el/sound-juicer.xml -share/gnome/help/sound-juicer/en_GB/fdl-appendix.xml share/gnome/help/sound-juicer/en_GB/figures/prefs.png share/gnome/help/sound-juicer/en_GB/figures/startup.png share/gnome/help/sound-juicer/en_GB/legal.xml share/gnome/help/sound-juicer/en_GB/sound-juicer.xml -share/gnome/help/sound-juicer/es/fdl-appendix.xml share/gnome/help/sound-juicer/es/figures/prefs.png share/gnome/help/sound-juicer/es/figures/startup.png share/gnome/help/sound-juicer/es/legal.xml share/gnome/help/sound-juicer/es/sound-juicer.xml -share/gnome/help/sound-juicer/fr/fdl-appendix.xml share/gnome/help/sound-juicer/fr/figures/prefs.png share/gnome/help/sound-juicer/fr/figures/startup.png share/gnome/help/sound-juicer/fr/legal.xml share/gnome/help/sound-juicer/fr/sound-juicer.xml -share/gnome/help/sound-juicer/nl/fdl-appendix.xml share/gnome/help/sound-juicer/nl/figures/prefs.png share/gnome/help/sound-juicer/nl/figures/startup.png share/gnome/help/sound-juicer/nl/legal.xml share/gnome/help/sound-juicer/nl/sound-juicer.xml -share/gnome/help/sound-juicer/oc/fdl-appendix.xml share/gnome/help/sound-juicer/oc/figures/prefs.png share/gnome/help/sound-juicer/oc/figures/startup.png share/gnome/help/sound-juicer/oc/legal.xml share/gnome/help/sound-juicer/oc/sound-juicer.xml -share/gnome/help/sound-juicer/pl/fdl-appendix.xml share/gnome/help/sound-juicer/pl/figures/prefs.png share/gnome/help/sound-juicer/pl/figures/startup.png share/gnome/help/sound-juicer/pl/legal.xml share/gnome/help/sound-juicer/pl/sound-juicer.xml -share/gnome/help/sound-juicer/pt_BR/fdl-appendix.xml share/gnome/help/sound-juicer/pt_BR/figures/prefs.png share/gnome/help/sound-juicer/pt_BR/figures/startup.png share/gnome/help/sound-juicer/pt_BR/legal.xml share/gnome/help/sound-juicer/pt_BR/sound-juicer.xml -share/gnome/help/sound-juicer/ru/fdl-appendix.xml share/gnome/help/sound-juicer/ru/figures/prefs.png share/gnome/help/sound-juicer/ru/figures/startup.png share/gnome/help/sound-juicer/ru/legal.xml share/gnome/help/sound-juicer/ru/sound-juicer.xml -share/gnome/help/sound-juicer/sv/fdl-appendix.xml share/gnome/help/sound-juicer/sv/figures/prefs.png share/gnome/help/sound-juicer/sv/figures/startup.png share/gnome/help/sound-juicer/sv/legal.xml share/gnome/help/sound-juicer/sv/sound-juicer.xml -share/gnome/help/sound-juicer/uk/fdl-appendix.xml share/gnome/help/sound-juicer/uk/figures/prefs.png share/gnome/help/sound-juicer/uk/figures/startup.png share/gnome/help/sound-juicer/uk/legal.xml @@ -132,7 +123,7 @@ share/locale/sk/LC_MESSAGES/sound-juicer.mo share/locale/sl/LC_MESSAGES/sound-juicer.mo share/locale/sq/LC_MESSAGES/sound-juicer.mo share/locale/sr/LC_MESSAGES/sound-juicer.mo -share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo +share/locale/sr@latin/LC_MESSAGES/sound-juicer.mo share/locale/sv/LC_MESSAGES/sound-juicer.mo share/locale/ta/LC_MESSAGES/sound-juicer.mo share/locale/te/LC_MESSAGES/sound-juicer.mo @@ -146,6 +137,7 @@ share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo share/locale/zh_HK/LC_MESSAGES/sound-juicer.mo share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo share/omf/sound-juicer/sound-juicer-C.omf +share/omf/sound-juicer/sound-juicer-ca.omf share/omf/sound-juicer/sound-juicer-de.omf share/omf/sound-juicer/sound-juicer-el.omf share/omf/sound-juicer/sound-juicer-en_GB.omf @@ -185,6 +177,8 @@ share/omf/sound-juicer/sound-juicer-uk.omf @dirrm share/gnome/help/sound-juicer/el @dirrm share/gnome/help/sound-juicer/de/figures @dirrm share/gnome/help/sound-juicer/de +@dirrm share/gnome/help/sound-juicer/ca/figures +@dirrm share/gnome/help/sound-juicer/ca @dirrm share/gnome/help/sound-juicer/C/figures @dirrm share/gnome/help/sound-juicer/C @dirrm share/gnome/help/sound-juicer @@ -199,6 +193,8 @@ share/omf/sound-juicer/sound-juicer-uk.omf @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/databases/Makefile b/databases/Makefile index 00992381018c..49d175f55070 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -122,6 +122,11 @@ SUBDIR += libgda3-odbc SUBDIR += libgda3-postgresql SUBDIR += libgda3-reference + SUBDIR += libgda4 + SUBDIR += libgda4-mdb + SUBDIR += libgda4-mysql + SUBDIR += libgda4-postgresql + SUBDIR += libgda4-reference SUBDIR += libgdamm SUBDIR += libgnomedb SUBDIR += libgnomedb-reference diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index c70896b80b28..a85d44b9fb97 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.142 2008/03/10 20:33:29 mezz Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.164 2009/01/10 01:59:21 mezz Exp $ # PORTNAME= evolution-data-server -PORTVERSION= 2.22.3 -PORTREVISION= 2 +PORTVERSION= 2.24.2 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,14 +18,15 @@ COMMENT= The data backends for the Evolution integrated mail/PIM suite LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ nss3.1:${PORTSDIR}/security/nss \ tasn1.3:${PORTSDIR}/security/libtasn1 \ + sqlite3.8:${PORTSDIR}/databases/sqlite3 \ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui \ - ltverhack +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack \ + ltasneededhack USE_OPENLDAP= yes USE_AUTOTOOLS= libtool:15 USE_BDB= 41+ @@ -39,9 +39,9 @@ CONFIGURE_ARGS= --enable-static \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -PLIST_SUB= VERSION="2.22" EVO_VERSION="1.2" +PLIST_SUB= VERSION="2.24" EVO_VERSION="1.2" -OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off +#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off .include <bsd.port.pre.mk> @@ -55,12 +55,12 @@ CONFIGURE_ARGS+= --with-krb5=/usr KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif -.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING) -CONFIGURE_ARGS+= --enable-imap4=yes -PLIST_SUB+= IMAP4="" -.else +#.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING) +#CONFIGURE_ARGS+= --enable-imap4=yes +#PLIST_SUB+= IMAP4="" +#.else PLIST_SUB+= IMAP4="@comment " -.endif +#.endif EDS_BDB_MSG= "!!!WARNING!!!: Berkeley Database version is ${BDB_VER}. If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41." diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index 3a8b5e2af9a5..ffb8cf28418e 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-data-server-2.22.3.tar.bz2) = 7552919fa10a04a09130e29540482fdf -SHA256 (gnome2/evolution-data-server-2.22.3.tar.bz2) = 6e9fa1258c8b4d1fd75a1da78ee637ad5b8a82bc58c93324d73afecf8d73fe87 -SIZE (gnome2/evolution-data-server-2.22.3.tar.bz2) = 7621470 +MD5 (gnome2/evolution-data-server-2.24.2.tar.bz2) = ee08e677d30fadd58e53e6e064d4ae6e +SHA256 (gnome2/evolution-data-server-2.24.2.tar.bz2) = ac66e2f5341c488fa9e5e02c7e4eb7a7a1c01c093ad4a7a9b9e0e028f43f617a +SIZE (gnome2/evolution-data-server-2.24.2.tar.bz2) = 7886652 diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c deleted file mode 100644 index b7266a514fb5..000000000000 --- a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c +++ /dev/null @@ -1,13 +0,0 @@ ---- addressbook/backends/ldap/e-book-backend-ldap.c.orig 2007-12-14 15:23:50.000000000 +0100 -+++ addressbook/backends/ldap/e-book-backend-ldap.c 2007-12-21 11:29:01.000000000 +0100 -@@ -358,8 +358,8 @@ - - /* misc fields */ - STRING_PROP (E_CONTACT_HOMEPAGE_URL, "labeledURI"), -- /* map nickname to displayName */ -- STRING_PROP (E_CONTACT_NICKNAME, "displayName"), -+ /* map nickname to nickname */ -+ STRING_PROP (E_CONTACT_NICKNAME, "nickname"), - E_STRING_PROP (E_CONTACT_SPOUSE, "spouseName"), - E_STRING_PROP (E_CONTACT_NOTE, "note"), - E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c deleted file mode 100644 index e00b57db0780..000000000000 --- a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c +++ /dev/null @@ -1,10 +0,0 @@ ---- camel/providers/imap4/camel-imap4-specials.c.orig Thu May 17 18:11:10 2007 -+++ camel/providers/imap4/camel-imap4-specials.c Thu May 17 18:11:17 2007 -@@ -22,6 +22,7 @@ - #include <config.h> - #endif - -+#include <glib.h> - #include <string.h> - - #include "camel-imap4-specials.h" diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c deleted file mode 100644 index 55db1a65dcf0..000000000000 --- a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c +++ /dev/null @@ -1,19 +0,0 @@ ---- camel/providers/imap4/camel-imap4-summary.c.orig Mon May 7 01:01:31 2007 -+++ camel/providers/imap4/camel-imap4-summary.c Mon May 7 01:05:32 2007 -@@ -1148,6 +1148,7 @@ static CamelIMAP4Command * - imap4_summary_fetch_flags (CamelFolderSummary *summary) - { - CamelFolder *folder = summary->folder; -+ CamelIMAP4Summary *imap4_summary = (CamelIMAP4Summary *) summary; - struct imap4_fetch_all_t *fetch; - CamelMessageInfo *info[2]; - CamelIMAP4Engine *engine; -@@ -1479,7 +1480,7 @@ camel_imap4_summary_flush_updates (Camel - } - } else { - /* need to fetch new envelopes */ -- first = scount + 1; -+ seqid = scount + 1; - } - - if (seqid != 0 && seqid <= imap4_summary->exists) { diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in index f5b6fa2735d8..9cf7de30997e 100644 --- a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in +++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in @@ -1,6 +1,6 @@ ---- docs/reference/camel/Makefile.in.orig 2007-12-21 11:30:30.000000000 +0100 -+++ docs/reference/camel/Makefile.in 2007-12-21 11:55:58.000000000 +0100 -@@ -123,7 +123,7 @@ +--- docs/reference/camel/Makefile.in.orig 2008-09-08 23:00:49.000000000 +0200 ++++ docs/reference/camel/Makefile.in 2008-09-08 23:01:25.000000000 +0200 +@@ -129,7 +129,7 @@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HAVE_JW = @HAVE_JW@ @@ -9,10 +9,10 @@ ICONV_CFLAGS = @ICONV_CFLAGS@ ICONV_LIBS = @ICONV_LIBS@ IDL_INCLUDES = @IDL_INCLUDES@ -@@ -690,8 +690,8 @@ +@@ -704,8 +704,8 @@ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ +# which gtkdoc-rebase >/dev/null && \ diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c deleted file mode 100644 index 62532da02471..000000000000 --- a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libedataserverui/e-source-option-menu.c.orig Tue Nov 23 13:50:14 2004 -+++ libedataserverui/e-source-option-menu.c Tue Nov 23 13:50:33 2004 -@@ -24,6 +24,8 @@ - #include <config.h> - #endif - -+#include <sys/types.h> -+ - #include <gtk/gtkmenu.h> - #include <gtk/gtkmenuitem.h> - diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index d25e12757e86..bdd3a65ee501 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -1,4 +1,3 @@ -include/evolution-data-server-%%VERSION%%/camel/broken-date-parser.h include/evolution-data-server-%%VERSION%%/camel/camel-address.h include/evolution-data-server-%%VERSION%%/camel/camel-arg.h include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h @@ -7,6 +6,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h include/evolution-data-server-%%VERSION%%/camel/camel-cipher-context.h include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h +include/evolution-data-server-%%VERSION%%/camel/camel-db.h include/evolution-data-server-%%VERSION%%/camel/camel-debug.h include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h @@ -48,6 +48,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-html.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-index.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-linewrap.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-pgp.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-progress.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-save.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-tohtml.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-windows.h @@ -59,6 +60,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-mime-part-utils.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-part.h include/evolution-data-server-%%VERSION%%/camel/camel-mime-utils.h include/evolution-data-server-%%VERSION%%/camel/camel-movemail.h +include/evolution-data-server-%%VERSION%%/camel/camel-msgport.h include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h @@ -84,6 +86,8 @@ include/evolution-data-server-%%VERSION%%/camel/camel-sasl-plain.h include/evolution-data-server-%%VERSION%%/camel/camel-sasl-popb4smtp.h include/evolution-data-server-%%VERSION%%/camel/camel-sasl.h include/evolution-data-server-%%VERSION%%/camel/camel-search-private.h +include/evolution-data-server-%%VERSION%%/camel/camel-search-sql-sexp.h +include/evolution-data-server-%%VERSION%%/camel/camel-search-sql.h include/evolution-data-server-%%VERSION%%/camel/camel-seekable-stream.h include/evolution-data-server-%%VERSION%%/camel/camel-seekable-substream.h include/evolution-data-server-%%VERSION%%/camel/camel-service.h @@ -105,6 +109,7 @@ include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-ssl.h include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream.h include/evolution-data-server-%%VERSION%%/camel/camel-text-index.h include/evolution-data-server-%%VERSION%%/camel/camel-transport.h +include/evolution-data-server-%%VERSION%%/camel/camel-trie.h include/evolution-data-server-%%VERSION%%/camel/camel-types.h include/evolution-data-server-%%VERSION%%/camel/camel-uid-cache.h include/evolution-data-server-%%VERSION%%/camel/camel-url-scanner.h @@ -148,10 +153,10 @@ include/evolution-data-server-%%VERSION%%/exchange/exchange-hierarchy.h include/evolution-data-server-%%VERSION%%/exchange/exchange-oof.h include/evolution-data-server-%%VERSION%%/exchange/exchange-types.h include/evolution-data-server-%%VERSION%%/exchange/mapi.h -include/evolution-data-server-%%VERSION%%/google/gdata-google/gdata-google-service.h -include/evolution-data-server-%%VERSION%%/google/gdata/gdata-entry.h -include/evolution-data-server-%%VERSION%%/google/gdata/gdata-feed.h -include/evolution-data-server-%%VERSION%%/google/gdata/gdata-service-iface.h +include/evolution-data-server-%%VERSION%%/google/libgdata-google/gdata-google-service.h +include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-entry.h +include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-feed.h +include/evolution-data-server-%%VERSION%%/google/libgdata/gdata-service-iface.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h @@ -162,6 +167,10 @@ include/evolution-data-server-%%VERSION%%/groupwise/e-gw-recur-utils.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-sendoptions.h include/evolution-data-server-%%VERSION%%/groupwise/soup-soap-message.h include/evolution-data-server-%%VERSION%%/groupwise/soup-soap-response.h +include/evolution-data-server-%%VERSION%%/libebackend/e-data-server-module.h +include/evolution-data-server-%%VERSION%%/libebackend/e-db3-utils.h +include/evolution-data-server-%%VERSION%%/libebackend/e-dbhash.h +include/evolution-data-server-%%VERSION%%/libebackend/e-file-cache.h include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h include/evolution-data-server-%%VERSION%%/libebook/e-book-query.h include/evolution-data-server-%%VERSION%%/libebook/e-book-types.h @@ -194,6 +203,7 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-loader-factory.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h @@ -206,11 +216,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h -include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-module.h include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-util.h -include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h -include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h -include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h include/evolution-data-server-%%VERSION%%/libedataserver/e-flag.h include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h @@ -218,6 +224,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h include/evolution-data-server-%%VERSION%%/libedataserver/e-msgport.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-proxy.h include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h @@ -228,6 +235,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-utils.h +include/evolution-data-server-%%VERSION%%/libedataserver/eds-version.h include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h @@ -294,10 +302,6 @@ lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.a lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.la lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.urls -lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.a -lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.la -lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.so -lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelhula.urls lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.a lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.la lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.so @@ -329,6 +333,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.urls lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.a lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.la lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.a +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.la +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.so lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.a lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.la lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.so @@ -338,6 +345,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.so lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.a lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.la lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendwebdav.a +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendwebdav.la +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendwebdav.so lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.a lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.la lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.so @@ -362,11 +372,15 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so lib/libcamel-%%EVO_VERSION%%.a lib/libcamel-%%EVO_VERSION%%.la lib/libcamel-%%EVO_VERSION%%.so -lib/libcamel-%%EVO_VERSION%%.so.11 +lib/libcamel-%%EVO_VERSION%%.so.14 lib/libcamel-provider-%%EVO_VERSION%%.a lib/libcamel-provider-%%EVO_VERSION%%.la lib/libcamel-provider-%%EVO_VERSION%%.so -lib/libcamel-provider-%%EVO_VERSION%%.so.11 +lib/libcamel-provider-%%EVO_VERSION%%.so.14 +lib/libebackend-%%EVO_VERSION%%.a +lib/libebackend-%%EVO_VERSION%%.la +lib/libebackend-%%EVO_VERSION%%.so +lib/libebackend-%%EVO_VERSION%%.so.0 lib/libebook-%%EVO_VERSION%%.a lib/libebook-%%EVO_VERSION%%.la lib/libebook-%%EVO_VERSION%%.so @@ -386,7 +400,7 @@ lib/libedata-cal-%%EVO_VERSION%%.so.6 lib/libedataserver-%%EVO_VERSION%%.a lib/libedataserver-%%EVO_VERSION%%.la lib/libedataserver-%%EVO_VERSION%%.so -lib/libedataserver-%%EVO_VERSION%%.so.9 +lib/libedataserver-%%EVO_VERSION%%.so.11 lib/libedataserverui-%%EVO_VERSION%%.a lib/libedataserverui-%%EVO_VERSION%%.la lib/libedataserverui-%%EVO_VERSION%%.so @@ -411,6 +425,7 @@ libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server libdata/pkgconfig/camel-%%EVO_VERSION%%.pc libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc +libdata/pkgconfig/libebackend-%%EVO_VERSION%%.pc libdata/pkgconfig/libebook-%%EVO_VERSION%%.pc libdata/pkgconfig/libecal-%%EVO_VERSION%%.pc libdata/pkgconfig/libedata-book-%%EVO_VERSION%%.pc @@ -427,19 +442,33 @@ libexec/evolution-data-server-%%VERSION%% share/doc/camel/Addresses.html share/doc/camel/ClassTree.html share/doc/camel/Crypto.html +share/doc/camel/Deprecated.html share/doc/camel/Filters.html share/doc/camel/Folders.html share/doc/camel/Fundamentals.html share/doc/camel/MIME.html +share/doc/camel/SearchFolders.html share/doc/camel/Services.html +share/doc/camel/Storage.html +share/doc/camel/StreamFilters.html share/doc/camel/Streams.html +share/doc/camel/Utilities.html share/doc/camel/camel-CamelAddress.html +share/doc/camel/camel-CamelCertDB.html share/doc/camel/camel-CamelCipherContext.html +share/doc/camel/camel-CamelDB.html +share/doc/camel/camel-CamelDataCache.html share/doc/camel/camel-CamelDataWrapper.html +share/doc/camel/camel-CamelFilterDriver.html share/doc/camel/camel-CamelFolder.html +share/doc/camel/camel-CamelFolderSearch.html share/doc/camel/camel-CamelFolderSummary.html share/doc/camel/camel-CamelGpgContext.html +share/doc/camel/camel-CamelHttpStream.html +share/doc/camel/camel-CamelIndex.html share/doc/camel/camel-CamelInternetAddress.html +share/doc/camel/camel-CamelKeyFile.html +share/doc/camel/camel-CamelKeyTable.html share/doc/camel/camel-CamelMedium.html share/doc/camel/camel-CamelMimeFilter.html share/doc/camel/camel-CamelMimeFilterBasic.html @@ -449,9 +478,12 @@ share/doc/camel/camel-CamelMimeFilterCanon.html share/doc/camel/camel-CamelMimeFilterCharset.html share/doc/camel/camel-CamelMimeFilterEnriched.html share/doc/camel/camel-CamelMimeFilterFrom.html +share/doc/camel/camel-CamelMimeFilterGZip.html share/doc/camel/camel-CamelMimeFilterHTML.html share/doc/camel/camel-CamelMimeFilterIndex.html +share/doc/camel/camel-CamelMimeFilterLinewrap.html share/doc/camel/camel-CamelMimeFilterPgp.html +share/doc/camel/camel-CamelMimeFilterProgress.html share/doc/camel/camel-CamelMimeFilterSave.html share/doc/camel/camel-CamelMimeFilterToHTML.html share/doc/camel/camel-CamelMimeFilterWindows.html @@ -459,13 +491,17 @@ share/doc/camel/camel-CamelMimeFilterYenc.html share/doc/camel/camel-CamelMimeMessage.html share/doc/camel/camel-CamelMimeParser.html share/doc/camel/camel-CamelMimePart.html +share/doc/camel/camel-CamelMsgPort.html share/doc/camel/camel-CamelMultipart.html share/doc/camel/camel-CamelMultipartEncrypted.html share/doc/camel/camel-CamelMultipartSigned.html +share/doc/camel/camel-CamelNNTPAddress.html +share/doc/camel/camel-CamelNewsAddress.html share/doc/camel/camel-CamelObject.html share/doc/camel/camel-CamelOfflineFolder.html share/doc/camel/camel-CamelOfflineJournal.html share/doc/camel/camel-CamelOfflineStore.html +share/doc/camel/camel-CamelSMIMEContext.html share/doc/camel/camel-CamelSasl.html share/doc/camel/camel-CamelSaslAnonymous.html share/doc/camel/camel-CamelSaslCramMd5.html @@ -474,6 +510,7 @@ share/doc/camel/camel-CamelSaslGssapi.html share/doc/camel/camel-CamelSaslKerberos4.html share/doc/camel/camel-CamelSaslLogin.html share/doc/camel/camel-CamelSaslNTLM.html +share/doc/camel/camel-CamelSaslPOPB4SMTP.html share/doc/camel/camel-CamelSaslPlain.html share/doc/camel/camel-CamelSeekableStream.html share/doc/camel/camel-CamelSeekableSubstream.html @@ -487,17 +524,43 @@ share/doc/camel/camel-CamelStreamFilter.html share/doc/camel/camel-CamelStreamFs.html share/doc/camel/camel-CamelStreamMem.html share/doc/camel/camel-CamelStreamNull.html +share/doc/camel/camel-CamelStreamProcess.html share/doc/camel/camel-CamelStreamVFS.html share/doc/camel/camel-CamelTcpStream.html share/doc/camel/camel-CamelTcpStreamRaw.html share/doc/camel/camel-CamelTcpStreamSSL.html +share/doc/camel/camel-CamelTextIndexName.html share/doc/camel/camel-CamelTransport.html share/doc/camel/camel-CamelVTrashFolder.html share/doc/camel/camel-CamelVeeFolder.html +share/doc/camel/camel-CamelVeeStore.html +share/doc/camel/camel-CamelVeeSummary.html +share/doc/camel/camel-camel-arg.html +share/doc/camel/camel-camel-charset-map.html +share/doc/camel/camel-camel-debug.html share/doc/camel/camel-camel-exception.html +share/doc/camel/camel-camel-file-utils.html +share/doc/camel/camel-camel-filter-search.html +share/doc/camel/camel-camel-folder-thread.html +share/doc/camel/camel-camel-i18n.html +share/doc/camel/camel-camel-iconv.html +share/doc/camel/camel-camel-junk-plugin.html +share/doc/camel/camel-camel-list-utils.html +share/doc/camel/camel-camel-lock-client.html +share/doc/camel/camel-camel-lock.html +share/doc/camel/camel-camel-mime-utils.html +share/doc/camel/camel-camel-movemail.html +share/doc/camel/camel-camel-net-utils.html share/doc/camel/camel-camel-operation.html +share/doc/camel/camel-camel-process.html share/doc/camel/camel-camel-provider.html +share/doc/camel/camel-camel-search-sql.html +share/doc/camel/camel-camel-string-utils.html +share/doc/camel/camel-camel-trie.html +share/doc/camel/camel-camel-uid-cache.html +share/doc/camel/camel-camel-url-scanner.html share/doc/camel/camel-camel-url.html +share/doc/camel/camel-camel-utf8.html share/doc/camel/camel.devhelp share/doc/camel/camel.devhelp2 share/doc/camel/classes.html @@ -505,10 +568,25 @@ share/doc/camel/home.png share/doc/camel/index.html share/doc/camel/index.sgml share/doc/camel/ix01.html +share/doc/camel/ix02.html share/doc/camel/left.png share/doc/camel/right.png share/doc/camel/style.css share/doc/camel/up.png +share/doc/libebackend/EFileCache.html +share/doc/libebackend/ch01.html +share/doc/libebackend/home.png +share/doc/libebackend/index.html +share/doc/libebackend/index.sgml +share/doc/libebackend/left.png +share/doc/libebackend/libebackend-e-data-server-module.html +share/doc/libebackend/libebackend-e-db3-utils.html +share/doc/libebackend/libebackend-e-dbhash.html +share/doc/libebackend/libebackend.devhelp +share/doc/libebackend/libebackend.devhelp2 +share/doc/libebackend/right.png +share/doc/libebackend/style.css +share/doc/libebackend/up.png share/doc/libebook/EBook.html share/doc/libebook/EBookListener.html share/doc/libebook/EBookView.html @@ -542,6 +620,7 @@ share/doc/libecal/index.html share/doc/libecal/index.sgml share/doc/libecal/ix01.html share/doc/libecal/left.png +share/doc/libecal/libecal-e-cal-check-timezones.html share/doc/libecal/libecal-e-cal-recur.html share/doc/libecal/libecal-e-cal-time-util.html share/doc/libecal/libecal-e-cal-types.html @@ -596,7 +675,6 @@ share/doc/libedata-cal/up.png share/doc/libedataserver/EAccount.html share/doc/libedataserver/EAccountList.html share/doc/libedataserver/EComponentListener.html -share/doc/libedataserver/EFileCache.html share/doc/libedataserver/EIterator.html share/doc/libedataserver/EList.html share/doc/libedataserver/EListIterator.html @@ -610,11 +688,10 @@ share/doc/libedataserver/index.sgml share/doc/libedataserver/ix01.html share/doc/libedataserver/left.png share/doc/libedataserver/libedataserver-EFlag.html +share/doc/libedataserver/libedataserver-EProxy.html share/doc/libedataserver/libedataserver-ESExp.html +share/doc/libedataserver/libedataserver-Version-Information.html share/doc/libedataserver/libedataserver-e-categories.html -share/doc/libedataserver/libedataserver-e-data-server-module.html -share/doc/libedataserver/libedataserver-e-db3-utils.html -share/doc/libedataserver/libedataserver-e-dbhash.html share/doc/libedataserver/libedataserver-e-iconv.html share/doc/libedataserver/libedataserver-e-memory.html share/doc/libedataserver/libedataserver-e-msgport.html @@ -705,6 +782,7 @@ share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/kn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/la/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo @@ -730,7 +808,7 @@ share/locale/sk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/sl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/sr@latin/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ta/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/te/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo @@ -772,6 +850,7 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrm share/doc/libedata-book @dirrm share/doc/libecal @dirrm share/doc/libebook +@dirrm share/doc/libebackend @dirrm share/doc/camel @dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions @dirrm lib/evolution-data-server-%%EVO_VERSION%%/camel-providers @@ -783,9 +862,10 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrm include/evolution-data-server-%%VERSION%%/libedata-book @dirrm include/evolution-data-server-%%VERSION%%/libecal @dirrm include/evolution-data-server-%%VERSION%%/libebook +@dirrm include/evolution-data-server-%%VERSION%%/libebackend @dirrm include/evolution-data-server-%%VERSION%%/groupwise -@dirrm include/evolution-data-server-%%VERSION%%/google/gdata-google -@dirrm include/evolution-data-server-%%VERSION%%/google/gdata +@dirrm include/evolution-data-server-%%VERSION%%/google/libgdata-google +@dirrm include/evolution-data-server-%%VERSION%%/google/libgdata @dirrm include/evolution-data-server-%%VERSION%%/google @dirrm include/evolution-data-server-%%VERSION%%/exchange @dirrm include/evolution-data-server-%%VERSION%%/camel @@ -796,6 +876,8 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -804,6 +886,8 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/la/LC_MESSAGES +@dirrmtry share/locale/la @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/databases/libgda4-mdb/Makefile b/databases/libgda4-mdb/Makefile new file mode 100644 index 000000000000..8528c8ba1ee0 --- /dev/null +++ b/databases/libgda4-mdb/Makefile @@ -0,0 +1,23 @@ +# New ports collection makefile for: libgda2 +# Date created: 02 June 2002 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/databases/libgda4-mdb/Makefile,v 1.1 2008/08/18 23:53:35 kwm Exp $ +# + +PORTREVISION?= 0 +CATEGORIES= databases gnome +PKGNAMESUFFIX?= -mdb + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Provides mdb backend for the libgda4 library + +MASTERDIR= ${.CURDIR}/../libgda4 +BUILD_WRKSRC= ${WRKSRC}/providers/mdb/ +INSTALL_WRKSRC= ${BUILD_WRKSRC} +PLIST= ${.CURDIR}/pkg-plist + +LIBGDA4_SLAVE= mdb + +.include "${MASTERDIR}/Makefile" diff --git a/databases/libgda4-mdb/pkg-plist b/databases/libgda4-mdb/pkg-plist new file mode 100644 index 000000000000..30b1df5d9f44 --- /dev/null +++ b/databases/libgda4-mdb/pkg-plist @@ -0,0 +1,5 @@ +lib/libgda-%%VERSION%%/providers/libgda-mdb.a +lib/libgda-%%VERSION%%/providers/libgda-mdb.la +lib/libgda-%%VERSION%%/providers/libgda-mdb.so +libdata/pkgconfig/libgda-mdb-%%VERSION%%.pc +share/libgda-%%VERSION%%/mdb_specs_dsn.xml diff --git a/databases/libgda4-mysql/Makefile b/databases/libgda4-mysql/Makefile new file mode 100644 index 000000000000..b9b6b0b8c4ef --- /dev/null +++ b/databases/libgda4-mysql/Makefile @@ -0,0 +1,23 @@ +# New ports collection makefile for: libgda2 +# Date created: 02 June 2002 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/databases/libgda4-mysql/Makefile,v 1.1 2008/08/18 23:53:35 kwm Exp $ +# + +PORTREVISION?= 0 +CATEGORIES= databases gnome +PKGNAMESUFFIX?= -mysql + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Provides mysql backend for the libgda3 library + +MASTERDIR= ${.CURDIR}/../libgda4 +BUILD_WRKSRC= ${WRKSRC}/providers/mysql/ +INSTALL_WRKSRC= ${BUILD_WRKSRC} +PLIST= ${.CURDIR}/pkg-plist + +LIBGDA4_SLAVE= mysql + +.include "${MASTERDIR}/Makefile" diff --git a/databases/libgda4-mysql/pkg-plist b/databases/libgda4-mysql/pkg-plist new file mode 100644 index 000000000000..5aff78cd8a02 --- /dev/null +++ b/databases/libgda4-mysql/pkg-plist @@ -0,0 +1,16 @@ +lib/libgda-%%VERSION%%/providers/libgda-mysql.a +lib/libgda-%%VERSION%%/providers/libgda-mysql.la +lib/libgda-%%VERSION%%/providers/libgda-mysql.so +libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc +share/libgda-%%VERSION%%/mysql_specs_add_column.xml +share/libgda-%%VERSION%%/mysql_specs_create_db.xml +share/libgda-%%VERSION%%/mysql_specs_create_index.xml +share/libgda-%%VERSION%%/mysql_specs_create_table.xml +share/libgda-%%VERSION%%/mysql_specs_create_view.xml +share/libgda-%%VERSION%%/mysql_specs_drop_column.xml +share/libgda-%%VERSION%%/mysql_specs_drop_db.xml +share/libgda-%%VERSION%%/mysql_specs_drop_index.xml +share/libgda-%%VERSION%%/mysql_specs_drop_table.xml +share/libgda-%%VERSION%%/mysql_specs_drop_view.xml +share/libgda-%%VERSION%%/mysql_specs_dsn.xml +share/libgda-%%VERSION%%/mysql_specs_rename_table.xml diff --git a/databases/libgda4-postgresql/Makefile b/databases/libgda4-postgresql/Makefile new file mode 100644 index 000000000000..4c0b210af211 --- /dev/null +++ b/databases/libgda4-postgresql/Makefile @@ -0,0 +1,23 @@ +# New ports collection makefile for: libgda2 +# Date created: 02 June 2002 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.1 2008/08/18 23:53:36 kwm Exp $ +# + +PORTREVISION?= 0 +CATEGORIES= databases gnome +PKGNAMESUFFIX?= -postgresql + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Provides postgresql access for the libgda4 library + +MASTERDIR= ${.CURDIR}/../libgda4 +BUILD_WRKSRC= ${WRKSRC}/providers/postgres/ +INSTALL_WRKSRC= ${BUILD_WRKSRC} +PLIST= ${.CURDIR}/pkg-plist + +LIBGDA4_SLAVE= postgresql + +.include "${MASTERDIR}/Makefile" diff --git a/databases/libgda4-postgresql/pkg-plist b/databases/libgda4-postgresql/pkg-plist new file mode 100644 index 000000000000..e2de17eb1d39 --- /dev/null +++ b/databases/libgda4-postgresql/pkg-plist @@ -0,0 +1,16 @@ +lib/libgda-%%VERSION%%/providers/libgda-postgres.a +lib/libgda-%%VERSION%%/providers/libgda-postgres.la +lib/libgda-%%VERSION%%/providers/libgda-postgres.so +libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc +share/libgda-%%VERSION%%/postgres_specs_add_column.xml +share/libgda-%%VERSION%%/postgres_specs_create_db.xml +share/libgda-%%VERSION%%/postgres_specs_create_index.xml +share/libgda-%%VERSION%%/postgres_specs_create_table.xml +share/libgda-%%VERSION%%/postgres_specs_create_view.xml +share/libgda-%%VERSION%%/postgres_specs_drop_column.xml +share/libgda-%%VERSION%%/postgres_specs_drop_db.xml +share/libgda-%%VERSION%%/postgres_specs_drop_index.xml +share/libgda-%%VERSION%%/postgres_specs_drop_table.xml +share/libgda-%%VERSION%%/postgres_specs_drop_view.xml +share/libgda-%%VERSION%%/postgres_specs_dsn.xml +share/libgda-%%VERSION%%/postgres_specs_rename_table.xml diff --git a/databases/libgda4-reference/Makefile b/databases/libgda4-reference/Makefile new file mode 100644 index 000000000000..bf3894e64cd9 --- /dev/null +++ b/databases/libgda4-reference/Makefile @@ -0,0 +1,12 @@ +# New ports collection makefile for: libgda3-reference +# Date created: 09 May 2006 +# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org> +# +# $FreeBSD$ +# $MCOM$ + +PORTREVISION= 0 + +REFERENCE_SRC= ${WRKSRC}/doc/C + +.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk" diff --git a/databases/libgda4-reference/pkg-descr b/databases/libgda4-reference/pkg-descr new file mode 100644 index 000000000000..6fcfe64af165 --- /dev/null +++ b/databases/libgda4-reference/pkg-descr @@ -0,0 +1,3 @@ +This port contains the programming reference for databases/libgda4. + +WWW: http://www.gnome-db.org/ diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile new file mode 100644 index 000000000000..487461303ed6 --- /dev/null +++ b/databases/libgda4/Makefile @@ -0,0 +1,130 @@ +# New ports collection makefile for: libgda2 +# Date created: 02 June 2002 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/databases/libgda4/Makefile,v 1.3 2008/10/09 22:27:17 kwm Exp $ +# + +PORTNAME= libgda4 +PORTVERSION?= 3.99.5 +PORTREVISION?= 0 +CATEGORIES= databases gnome +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/4$//}/${PORTVERSION:R} +DISTNAME= libgda-${PORTVERSION} +DIST_SUBDIR= gnome2 + +MAINTAINER?= gnome@FreeBSD.org +COMMENT?= Provides uniform access to different kinds of data sources + +USE_BZIP2= yes +LIBGDA4_SLAVE?= no + +.if !defined(REFERENCE_PORT) + +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt + +USE_AUTOTOOLS= libtool:15 +USE_GETTEXT= yes +USE_XLIB= yes +USE_GMAKE= yes +USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --without-sybase +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lintl" + +.include <bsd.port.pre.mk> + +#VERSION= ${PORTVERSION:R} +VERSION= 4.0 +PLIST_SUB= VERSION=${VERSION} + +.if ${LIBGDA4_SLAVE}=="no" +#MAN1= gda-config-tool-3.0.1 +#MAN5= gda-config-3.0.5 +.else +USE_GNOME+= libgda4 +.endif + +.if ${LIBGDA4_SLAVE}=="bdb" +USE_BDB= yes +CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-bdb +.endif + +.if ${LIBGDA4_SLAVE}=="mysql" +USE_MYSQL= yes +CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-mysql +.endif + +.if ${LIBGDA4_SLAVE}=="postgresql" +USE_PGSQL= yes +CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-postgres +.endif + +.if ${LIBGDA4_SLAVE}=="ldap" +USE_OPENLDAP= yes +CONFIGURE_ARGS+= --with-ldap=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-ldap +.endif + +.if ${LIBGDA4_SLAVE}=="firebird" +LIB_DEPENDS+= gds.2:${PORTSDIR}/databases/firebird2-client +CONFIGURE_ARGS+= --with-firebird=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-firebird +.endif + +.if ${LIBGDA4_SLAVE}=="freetds" +LIB_DEPENDS+= tds.5:${PORTSDIR}/databases/freetds +CONFIGURE_ARGS+= --with-tds=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-tds +.endif + +# MDB (MS Access) +.if ${LIBGDA4_SLAVE}=="mdb" +LIB_DEPENDS+= mdbsql.0:${PORTSDIR}/databases/mdbtools +CONFIGURE_ARGS+= --with-mdb=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-mdb +.endif + +.if ${LIBGDA4_SLAVE}=="odbc" +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +CONFIGURE_ARGS+= --with-odbc=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-odbc +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|include/db.h|${BDB_VER}/include/db.h|g' \ + -e 's|ldb47|ldb${BDB_VER}|g' \ + -e 's|ldb|ldb${BDB_VER}|g' \ + ${WRKSRC}/configure +.if ${LIBGDA4_SLAVE}!="no" +#. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres +. for d in bdb mdb mysql sqlite postgres + @${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \ + ${WRKSRC}/providers/${d}/Makefile.in +. endfor +.endif + +.if ${LIBGDA4_SLAVE}=="no" +post-install: + ${INSTALL_DATA} ${WRKSRC}/data/config \ + ${PREFIX}/etc/libgda-${VERSION}/config.default +.endif + +.include <bsd.port.post.mk> +.endif diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo new file mode 100644 index 000000000000..fa02f04031f1 --- /dev/null +++ b/databases/libgda4/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/libgda-3.99.5.tar.bz2) = e87a3584b77ba41532c93a43f115a7a7 +SHA256 (gnome2/libgda-3.99.5.tar.bz2) = 35f265638e3febea2dced537ba625242743dbaeaa83497860573104d61e0681e +SIZE (gnome2/libgda-3.99.5.tar.bz2) = 7686016 diff --git a/databases/libgda4/pkg-descr b/databases/libgda4/pkg-descr new file mode 100644 index 000000000000..12eb57b5ed9b --- /dev/null +++ b/databases/libgda4/pkg-descr @@ -0,0 +1,19 @@ +GNU Data Access (GDA) is an attempt to provide uniform access to +different kinds of data sources (databases, information servers, +mail spools, etc). + +It is a complete architecture that provides all you need to access +your data, defined by a set of CORBA interfaces as generic as possible +(but very powerful at the same time) so that any kind of data source +can be accessed through them. + +libgda is an interface to the GDA architecture, providing a nice +wrapper around the CORBA interfaces, for both the client and the server +parts. It also provides a bunch of tools to help you both in the +development and management of your data sources, all done through +the GDA model's set of CORBA interfaces. + +libgda was part of the GNOME-DB project, but has been separated from it +to allow non-GNOME applications to be developed based on it. + +WWW: http://www.gnome-db.org/ diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist new file mode 100644 index 000000000000..bf22751673fa --- /dev/null +++ b/databases/libgda4/pkg-plist @@ -0,0 +1,206 @@ +bin/gda-list-config-%%VERSION%% +bin/gda-list-server-op-%%VERSION%% +bin/gda-sql-%%VERSION%% +bin/gda-test-connection-%%VERSION%% +bin/gda_trml2html/__init__.py +bin/gda_trml2html/trml2html.py +bin/gda_trml2html/utils.py +bin/gda_trml2pdf/__init__.py +bin/gda_trml2pdf/color.py +bin/gda_trml2pdf/trml2pdf.py +bin/gda_trml2pdf/utils.py +@unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi +etc/libgda-%%VERSION%%/config.default +@exec [ -f %B/config ] || cp %B/%f %B/config +etc/libgda-%%VERSION%%/sales_test.db +include/libgda-%%VERSION%%/libgda-report/gda-report-docbook-document.h +include/libgda-%%VERSION%%/libgda-report/gda-report-document.h +include/libgda-%%VERSION%%/libgda-report/gda-report-engine.h +include/libgda-%%VERSION%%/libgda-report/gda-report-rml-document.h +include/libgda-%%VERSION%%/libgda-report/libgda-report.h +include/libgda-%%VERSION%%/libgda-xslt/libgda-xslt.h +include/libgda-%%VERSION%%/libgda/gda-attributes-manager.h +include/libgda-%%VERSION%%/libgda/gda-batch.h +include/libgda-%%VERSION%%/libgda/gda-binreloc.h +include/libgda-%%VERSION%%/libgda/gda-blob-op.h +include/libgda-%%VERSION%%/libgda/gda-column.h +include/libgda-%%VERSION%%/libgda/gda-config.h +include/libgda-%%VERSION%%/libgda/gda-connection-event.h +include/libgda-%%VERSION%%/libgda/gda-connection-private.h +include/libgda-%%VERSION%%/libgda/gda-connection.h +include/libgda-%%VERSION%%/libgda/gda-data-access-wrapper.h +include/libgda-%%VERSION%%/libgda/gda-data-comparator.h +include/libgda-%%VERSION%%/libgda/gda-data-handler.h +include/libgda-%%VERSION%%/libgda/gda-data-model-array.h +include/libgda-%%VERSION%%/libgda/gda-data-model-dir.h +include/libgda-%%VERSION%%/libgda/gda-data-model-extra.h +include/libgda-%%VERSION%%/libgda/gda-data-model-import.h +include/libgda-%%VERSION%%/libgda/gda-data-model-iter.h +include/libgda-%%VERSION%%/libgda/gda-data-model-iter-extra.h +include/libgda-%%VERSION%%/libgda/gda-data-model-private.h +include/libgda-%%VERSION%%/libgda/gda-data-model.h +include/libgda-%%VERSION%%/libgda/gda-data-proxy.h +include/libgda-%%VERSION%%/libgda/gda-data-select.h +include/libgda-%%VERSION%%/libgda/gda-debug-macros.h +include/libgda-%%VERSION%%/libgda/gda-decl.h +include/libgda-%%VERSION%%/libgda/gda-easy.h +include/libgda-%%VERSION%%/libgda/gda-enum-types.h +include/libgda-%%VERSION%%/libgda/gda-enums.h +include/libgda-%%VERSION%%/libgda/gda-holder.h +include/libgda-%%VERSION%%/libgda/gda-lockable.h +include/libgda-%%VERSION%%/libgda/gda-log.h +include/libgda-%%VERSION%%/libgda/gda-marshal.h +include/libgda-%%VERSION%%/libgda/gda-meta-store.h +include/libgda-%%VERSION%%/libgda/gda-meta-struct.h +include/libgda-%%VERSION%%/libgda/gda-mutex.h +include/libgda-%%VERSION%%/libgda/gda-quark-list.h +include/libgda-%%VERSION%%/libgda/gda-row.h +include/libgda-%%VERSION%%/libgda/gda-server-operation.h +include/libgda-%%VERSION%%/libgda/gda-server-provider-extra.h +include/libgda-%%VERSION%%/libgda/gda-server-provider-private.h +include/libgda-%%VERSION%%/libgda/gda-server-provider.h +include/libgda-%%VERSION%%/libgda/gda-set.h +include/libgda-%%VERSION%%/libgda/gda-statement-extra.h +include/libgda-%%VERSION%%/libgda/gda-statement.h +include/libgda-%%VERSION%%/libgda/gda-threader.h +include/libgda-%%VERSION%%/libgda/gda-transaction-status-private.h +include/libgda-%%VERSION%%/libgda/gda-transaction-status.h +include/libgda-%%VERSION%%/libgda/gda-util.h +include/libgda-%%VERSION%%/libgda/gda-value.h +include/libgda-%%VERSION%%/libgda/gda-xa-transaction.h +include/libgda-%%VERSION%%/libgda/handlers/gda-handler-bin.h +include/libgda-%%VERSION%%/libgda/handlers/gda-handler-boolean.h +include/libgda-%%VERSION%%/libgda/handlers/gda-handler-numerical.h +include/libgda-%%VERSION%%/libgda/handlers/gda-handler-string.h +include/libgda-%%VERSION%%/libgda/handlers/gda-handler-time.h +include/libgda-%%VERSION%%/libgda/handlers/gda-handler-type.h +include/libgda-%%VERSION%%/libgda/libgda.h +include/libgda-%%VERSION%%/libgda/sqlite/gda-sqlite-provider.h +include/libgda-%%VERSION%%/providers-support/gda-data-select-priv.h +include/libgda-%%VERSION%%/providers-support/gda-pstmt.h +include/libgda-%%VERSION%%/sql-parser/gda-sql-parser.h +include/libgda-%%VERSION%%/sql-parser/gda-sql-parser-enum-types.h +include/libgda-%%VERSION%%/sql-parser/gda-sql-statement.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-compound.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-decl.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-delete.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-insert.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-parts.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-pspec.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-select.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-trans.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-unknown.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-update.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct-util.h +include/libgda-%%VERSION%%/sql-parser/gda-statement-struct.h +include/libgda-%%VERSION%%/virtual/gda-vconnection-data-model.h +include/libgda-%%VERSION%%/virtual/gda-vconnection-hub.h +include/libgda-%%VERSION%%/virtual/gda-virtual-connection.h +include/libgda-%%VERSION%%/virtual/gda-virtual-provider.h +include/libgda-%%VERSION%%/virtual/gda-vprovider-data-model.h +include/libgda-%%VERSION%%/virtual/gda-vprovider-hub.h +include/libgda-%%VERSION%%/virtual/libgda-virtual.h +lib/libgda-%%VERSION%%.a +lib/libgda-%%VERSION%%.la +lib/libgda-%%VERSION%%.so +lib/libgda-%%VERSION%%.so.4 +lib/libgda-%%VERSION%%/providers/libgda-sqlite.a +lib/libgda-%%VERSION%%/providers/libgda-sqlite.la +lib/libgda-%%VERSION%%/providers/libgda-sqlite.so +lib/libgda-report-%%VERSION%%.a +lib/libgda-report-%%VERSION%%.la +lib/libgda-report-%%VERSION%%.so +lib/libgda-report-%%VERSION%%.so.4 +lib/libgda-xslt-%%VERSION%%.a +lib/libgda-xslt-%%VERSION%%.la +lib/libgda-xslt-%%VERSION%%.so +lib/libgda-xslt-%%VERSION%%.so.4 +libdata/pkgconfig/libgda-%%VERSION%%.pc +libdata/pkgconfig/libgda-report-%%VERSION%%.pc +libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc +libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc +share/libgda-%%VERSION%%/dtd/libgda-array.dtd +share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd +share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd +share/libgda-%%VERSION%%/information_schema.xml +share/libgda-%%VERSION%%/sqlite_specs_add_column.xml +share/libgda-%%VERSION%%/sqlite_specs_create_db.xml +share/libgda-%%VERSION%%/sqlite_specs_create_index.xml +share/libgda-%%VERSION%%/sqlite_specs_create_table.xml +share/libgda-%%VERSION%%/sqlite_specs_create_view.xml +share/libgda-%%VERSION%%/sqlite_specs_drop_db.xml +share/libgda-%%VERSION%%/sqlite_specs_drop_index.xml +share/libgda-%%VERSION%%/sqlite_specs_drop_table.xml +share/libgda-%%VERSION%%/sqlite_specs_drop_view.xml +share/libgda-%%VERSION%%/sqlite_specs_dsn.xml +share/libgda-%%VERSION%%/sqlite_specs_rename_table.xml +share/locale/ar/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/dz/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/fa/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/mk/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/ml/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/ne/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/oc/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/pa/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/rw/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/sl/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/zh_HK/LC_MESSAGES/libgda-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo +@dirrm share/libgda-%%VERSION%%/dtd +@dirrm share/libgda-%%VERSION%%/ +@dirrm lib/libgda-%%VERSION%%/providers +@dirrm lib/libgda-%%VERSION%% +@dirrm include/libgda-%%VERSION%%/virtual +@dirrm include/libgda-%%VERSION%%/sql-parser/ +@dirrm include/libgda-%%VERSION%%/providers-support +@dirrm include/libgda-%%VERSION%%/libgda/sqlite/ +@dirrm include/libgda-%%VERSION%%/libgda/handlers +@dirrm include/libgda-%%VERSION%%/libgda-xslt/ +@dirrm include/libgda-%%VERSION%%/libgda-report +@dirrmtry etc/libgda-%%VERSION%% +@dirrm bin/gda_trml2pdf +@dirrm bin/gda_trml2html +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz diff --git a/deskutils/Makefile b/deskutils/Makefile index 3ac220afd329..be1edf54abfb 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -102,6 +102,7 @@ SUBDIR += gworkspace-gwmetadata SUBDIR += gxmessage SUBDIR += gxneur + SUBDIR += hamster-applet SUBDIR += helpviewer SUBDIR += horde-hermes SUBDIR += horde-kronolith diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile index bdb2acdeb158..0a593637f330 100644 --- a/deskutils/alacarte/Makefile +++ b/deskutils/alacarte/Makefile @@ -3,12 +3,12 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/deskutils/alacarte/Makefile,v 1.17 2007/05/19 21:36:01 marcus Exp $ +# $MCom: ports/deskutils/alacarte/Makefile,v 1.20 2008/09/29 15:18:59 marcus Exp $ # PORTNAME= alacarte -PORTVERSION= 0.11.5 -PORTREVISION= 2 +PORTVERSION= 0.11.6 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/deskutils/alacarte/distinfo b/deskutils/alacarte/distinfo index 426e879de24e..cbb70b2ad0ea 100644 --- a/deskutils/alacarte/distinfo +++ b/deskutils/alacarte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/alacarte-0.11.5.tar.bz2) = e4dc193d36c76b974e66e517e9c7ea33 -SHA256 (gnome2/alacarte-0.11.5.tar.bz2) = 1aa7fd9cb1947987c3d047a53fe7bdeeafb31d046a6fcda02cfc5ef95ed6f7fa -SIZE (gnome2/alacarte-0.11.5.tar.bz2) = 204512 +MD5 (gnome2/alacarte-0.11.6.tar.bz2) = de6535f728a8000795753623c46e8378 +SHA256 (gnome2/alacarte-0.11.6.tar.bz2) = 7ca56a9f9fc1e57354d4170349d23e4db57d351b17b91f5629e0709284b49aa3 +SIZE (gnome2/alacarte-0.11.6.tar.bz2) = 177406 diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist index aa69579b7e2b..518312739012 100644 --- a/deskutils/alacarte/pkg-plist +++ b/deskutils/alacarte/pkg-plist @@ -15,10 +15,13 @@ bin/alacarte %%PYTHON_SITELIBDIR%%/Alacarte/util.pyc %%PYTHON_SITELIBDIR%%/Alacarte/util.pyo share/alacarte/alacarte.glade -share/alacarte/logo.svg share/applications/alacarte.desktop +share/icons/hicolor/16x16/apps/alacarte.png share/icons/hicolor/22x22/apps/alacarte.png -share/icons/hicolor/scalable/apps/alacarte.svg +share/icons/hicolor/24x24/apps/alacarte.png +share/icons/hicolor/256x256/apps/alacarte.png +share/icons/hicolor/32x32/apps/alacarte.png +share/icons/hicolor/48x48/apps/alacarte.png share/locale/ar/LC_MESSAGES/alacarte.mo share/locale/as/LC_MESSAGES/alacarte.mo share/locale/be/LC_MESSAGES/alacarte.mo @@ -41,10 +44,13 @@ share/locale/eu/LC_MESSAGES/alacarte.mo share/locale/fa/LC_MESSAGES/alacarte.mo share/locale/fi/LC_MESSAGES/alacarte.mo share/locale/fr/LC_MESSAGES/alacarte.mo +share/locale/fur/LC_MESSAGES/alacarte.mo share/locale/ga/LC_MESSAGES/alacarte.mo share/locale/gl/LC_MESSAGES/alacarte.mo share/locale/gu/LC_MESSAGES/alacarte.mo +share/locale/he/LC_MESSAGES/alacarte.mo share/locale/hi/LC_MESSAGES/alacarte.mo +share/locale/hr/LC_MESSAGES/alacarte.mo share/locale/hu/LC_MESSAGES/alacarte.mo share/locale/id/LC_MESSAGES/alacarte.mo share/locale/io/LC_MESSAGES/alacarte.mo @@ -68,15 +74,17 @@ share/locale/oc/LC_MESSAGES/alacarte.mo share/locale/or/LC_MESSAGES/alacarte.mo share/locale/pa/LC_MESSAGES/alacarte.mo share/locale/pl/LC_MESSAGES/alacarte.mo +share/locale/ps/LC_MESSAGES/alacarte.mo share/locale/pt/LC_MESSAGES/alacarte.mo share/locale/pt_BR/LC_MESSAGES/alacarte.mo share/locale/ro/LC_MESSAGES/alacarte.mo share/locale/ru/LC_MESSAGES/alacarte.mo share/locale/si/LC_MESSAGES/alacarte.mo +share/locale/sk/LC_MESSAGES/alacarte.mo share/locale/sl/LC_MESSAGES/alacarte.mo share/locale/sq/LC_MESSAGES/alacarte.mo share/locale/sr/LC_MESSAGES/alacarte.mo -share/locale/sr@Latn/LC_MESSAGES/alacarte.mo +share/locale/sr@latin/LC_MESSAGES/alacarte.mo share/locale/sv/LC_MESSAGES/alacarte.mo share/locale/ta/LC_MESSAGES/alacarte.mo share/locale/te/LC_MESSAGES/alacarte.mo @@ -88,16 +96,23 @@ share/locale/vi/LC_MESSAGES/alacarte.mo share/locale/zh_CN/LC_MESSAGES/alacarte.mo share/locale/zh_HK/LC_MESSAGES/alacarte.mo share/locale/zh_TW/LC_MESSAGES/alacarte.mo +@dirrmtry share/icons/hicolor/256x256/apps +@dirrmtry share/icons/hicolor/256x256 @dirrm share/alacarte @dirrm %%PYTHON_SITELIBDIR%%/Alacarte +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES @dirrmtry share/locale/uz@cyrillic @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/si/LC_MESSAGES @dirrmtry share/locale/si +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -108,6 +123,8 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo @dirrmtry share/locale/ku @dirrmtry share/locale/io/LC_MESSAGES @dirrmtry share/locale/io +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @@ -116,4 +133,3 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index e7d3b434f2ca..5deda8ea4a44 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.80 2008/03/11 14:26:12 ahze Exp $ +# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.94 2008/11/23 02:11:32 marcus Exp $ # PORTNAME= deskbar-applet -PORTVERSION= 2.22.3.1 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -29,6 +28,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes INSTALLS_OMF= yes +USE_DISPLAY= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -46,34 +46,10 @@ CONFIGURE_ARGS+=--disable-evolution PLIST_SUB+= EVO="@comment " .endif -.if !defined(DISPLAY) -BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ - ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} -.if !defined(PACKAGE_BUILDING) -CONFIGURE_ENV+= DISPLAY="localhost:1001" -.endif -.endif - post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/deskbar/handlers/mozilla.py \ ${WRKSRC}/deskbar/core/Utils.py -.if !defined(DISPLAY) -pre-configure: - @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ - ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ - ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ - fi - @${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid - @sleep 5 - -post-configure: - @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ - ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ - ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ - fi -.endif - .include <bsd.port.post.mk> diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo index e723458fb21e..d9cde8a9aa1e 100644 --- a/deskutils/deskbar-applet/distinfo +++ b/deskutils/deskbar-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/deskbar-applet-2.22.3.1.tar.bz2) = cd42e457d975f89719f2067b0f91e2dc -SHA256 (gnome2/deskbar-applet-2.22.3.1.tar.bz2) = c2c629a3ee8f6b530d4e07a0e39ec3dcc07988579f12289131ba1c3f8ead0f0c -SIZE (gnome2/deskbar-applet-2.22.3.1.tar.bz2) = 818973 +MD5 (gnome2/deskbar-applet-2.24.2.tar.bz2) = 51ca716ca66bc26750b62f698b0e5a48 +SHA256 (gnome2/deskbar-applet-2.24.2.tar.bz2) = 0ebb2dcaeb67997bfa37b93fa412545622bdcf6b36213a32272f6be02c0f14db +SIZE (gnome2/deskbar-applet-2.24.2.tar.bz2) = 931165 diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist index db4fab496462..872b990194a7 100644 --- a/deskutils/deskbar-applet/pkg-plist +++ b/deskutils/deskbar-applet/pkg-plist @@ -5,6 +5,9 @@ lib/deskbar-applet/modules-2.20-compatible/beagle-live.pyo lib/deskbar-applet/modules-2.20-compatible/beagle-static.py lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyc lib/deskbar-applet/modules-2.20-compatible/beagle-static.pyo +lib/deskbar-applet/modules-2.20-compatible/calculator.py +lib/deskbar-applet/modules-2.20-compatible/calculator.pyc +lib/deskbar-applet/modules-2.20-compatible/calculator.pyo lib/deskbar-applet/modules-2.20-compatible/desklicious.py lib/deskbar-applet/modules-2.20-compatible/desklicious.pyc lib/deskbar-applet/modules-2.20-compatible/desklicious.pyo @@ -20,6 +23,12 @@ lib/deskbar-applet/modules-2.20-compatible/files.pyo lib/deskbar-applet/modules-2.20-compatible/gdmactions.py lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyc lib/deskbar-applet/modules-2.20-compatible/gdmactions.pyo +lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.py +lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyc +lib/deskbar-applet/modules-2.20-compatible/googlecodesearch.pyo +lib/deskbar-applet/modules-2.20-compatible/googlesearch.py +lib/deskbar-applet/modules-2.20-compatible/googlesearch.pyc +lib/deskbar-applet/modules-2.20-compatible/googlesearch.pyo lib/deskbar-applet/modules-2.20-compatible/history.py lib/deskbar-applet/modules-2.20-compatible/history.pyc lib/deskbar-applet/modules-2.20-compatible/history.pyo @@ -41,9 +50,15 @@ lib/deskbar-applet/modules-2.20-compatible/templates.pyo lib/deskbar-applet/modules-2.20-compatible/tomboy.py lib/deskbar-applet/modules-2.20-compatible/tomboy.pyc lib/deskbar-applet/modules-2.20-compatible/tomboy.pyo +lib/deskbar-applet/modules-2.20-compatible/twitter.py +lib/deskbar-applet/modules-2.20-compatible/twitter.pyc +lib/deskbar-applet/modules-2.20-compatible/twitter.pyo lib/deskbar-applet/modules-2.20-compatible/web_address.py lib/deskbar-applet/modules-2.20-compatible/web_address.pyc lib/deskbar-applet/modules-2.20-compatible/web_address.pyo +lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.py +lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyc +lib/deskbar-applet/modules-2.20-compatible/wikipedia-suggest.pyo lib/deskbar-applet/modules-2.20-compatible/yahoo.py lib/deskbar-applet/modules-2.20-compatible/yahoo.pyc lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo @@ -89,6 +104,9 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo %%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.py %%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.pyc %%PYTHON_SITELIBDIR%%/deskbar/core/Watcher.pyo +%%PYTHON_SITELIBDIR%%/deskbar/core/Web.py +%%PYTHON_SITELIBDIR%%/deskbar/core/Web.pyc +%%PYTHON_SITELIBDIR%%/deskbar/core/Web.pyo %%PYTHON_SITELIBDIR%%/deskbar/core/__init__.py %%PYTHON_SITELIBDIR%%/deskbar/core/__init__.pyc %%PYTHON_SITELIBDIR%%/deskbar/core/__init__.pyo @@ -97,19 +115,14 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo %%PYTHON_SITELIBDIR%%/deskbar/core/_userdirs/__init__.pyo %%PYTHON_SITELIBDIR%%/deskbar/core/_userdirs/__userdirs.la %%PYTHON_SITELIBDIR%%/deskbar/core/_userdirs/__userdirs.so -%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.py -%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.pyc -%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/__init__.pyo -%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/_gnomedesktop.la -%%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop/_gnomedesktop.so %%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.py %%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.pyc %%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/__init__.pyo %%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/_keybinder.la %%PYTHON_SITELIBDIR%%/deskbar/core/keybinder/_keybinder.so -%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.py -%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.pyc -%%PYTHON_SITELIBDIR%%/deskbar/core/updater/NewStuffUpdater.pyo +%%PYTHON_SITELIBDIR%%/deskbar/core/updater/Capuchin.py +%%PYTHON_SITELIBDIR%%/deskbar/core/updater/Capuchin.pyc +%%PYTHON_SITELIBDIR%%/deskbar/core/updater/Capuchin.pyo %%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.py %%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.pyc %%PYTHON_SITELIBDIR%%/deskbar/core/updater/__init__.pyo @@ -194,6 +207,12 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/About.py %%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/About.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/AbstractCuemiacDeskbarIcon.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/AbstractCuemiacDeskbarIcon.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/AbstractCuemiacDeskbarIcon.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/AbstractCuemiacView.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/AbstractCuemiacView.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/AbstractCuemiacView.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacAlignedView.py %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacAlignedView.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacAlignedView.pyo @@ -203,9 +222,12 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.py %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.pyo -%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarTray.py -%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarTray.pyc -%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarTray.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarStatusIcon.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarStatusIcon.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarStatusIcon.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.py %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyo @@ -215,6 +237,15 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.py %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacAlignedWindow.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRenderer.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRenderer.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRenderer.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRendererAction.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRendererAction.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRendererAction.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRendererMatch.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRendererMatch.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacCellRendererMatch.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.py %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyo @@ -272,11 +303,13 @@ libdata/pkgconfig/deskbar-applet.pc %%DATADIR%%/art/deskbar-applet-panel-v.svg %%DATADIR%%/art/epiphany-history.png %%DATADIR%%/art/generic.png +%%DATADIR%%/art/google.png %%DATADIR%%/art/gpm-suspend-to-disk.png %%DATADIR%%/art/gpm-suspend-to-ram.png %%DATADIR%%/art/note-new.png %%DATADIR%%/art/note.png %%DATADIR%%/art/web-search.png +%%DATADIR%%/art/wikipedia.png %%DATADIR%%/art/yahoo.png %%DATADIR%%/mozilla-search.glade %%DATADIR%%/prefs-dialog.glade @@ -299,6 +332,9 @@ share/gnome/help/deskbar/es/legal.xml share/gnome/help/deskbar/fr/deskbar.xml share/gnome/help/deskbar/fr/figures/deskbar-applet.png share/gnome/help/deskbar/fr/legal.xml +share/gnome/help/deskbar/it/deskbar.xml +share/gnome/help/deskbar/it/figures/deskbar-applet.png +share/gnome/help/deskbar/it/legal.xml share/gnome/help/deskbar/oc/deskbar.xml share/gnome/help/deskbar/oc/figures/deskbar-applet.png share/gnome/help/deskbar/oc/legal.xml @@ -314,13 +350,18 @@ share/gnome/help/deskbar/sv/legal.xml share/gnome/help/deskbar/uk/deskbar.xml share/gnome/help/deskbar/uk/figures/deskbar-applet.png share/gnome/help/deskbar/uk/legal.xml +share/gnome/help/deskbar/zh_CN/deskbar.xml +share/gnome/help/deskbar/zh_CN/figures/deskbar-applet.png +share/gnome/help/deskbar/zh_CN/legal.xml share/icons/hicolor/16x16/apps/deskbar-applet.png share/icons/hicolor/22x22/apps/deskbar-applet.png share/icons/hicolor/32x32/apps/deskbar-applet.png share/icons/hicolor/48x48/apps/deskbar-applet.png share/icons/hicolor/scalable/apps/deskbar-applet.svg +share/locale/af/LC_MESSAGES/deskbar-applet.mo share/locale/ar/LC_MESSAGES/deskbar-applet.mo share/locale/as/LC_MESSAGES/deskbar-applet.mo +share/locale/ast/LC_MESSAGES/deskbar-applet.mo share/locale/be/LC_MESSAGES/deskbar-applet.mo share/locale/be@latin/LC_MESSAGES/deskbar-applet.mo share/locale/bg/LC_MESSAGES/deskbar-applet.mo @@ -345,6 +386,7 @@ share/locale/gl/LC_MESSAGES/deskbar-applet.mo share/locale/gu/LC_MESSAGES/deskbar-applet.mo share/locale/he/LC_MESSAGES/deskbar-applet.mo share/locale/hi/LC_MESSAGES/deskbar-applet.mo +share/locale/hr/LC_MESSAGES/deskbar-applet.mo share/locale/hu/LC_MESSAGES/deskbar-applet.mo share/locale/id/LC_MESSAGES/deskbar-applet.mo share/locale/it/LC_MESSAGES/deskbar-applet.mo @@ -368,6 +410,7 @@ share/locale/oc/LC_MESSAGES/deskbar-applet.mo share/locale/or/LC_MESSAGES/deskbar-applet.mo share/locale/pa/LC_MESSAGES/deskbar-applet.mo share/locale/pl/LC_MESSAGES/deskbar-applet.mo +share/locale/ps/LC_MESSAGES/deskbar-applet.mo share/locale/pt/LC_MESSAGES/deskbar-applet.mo share/locale/pt_BR/LC_MESSAGES/deskbar-applet.mo share/locale/ro/LC_MESSAGES/deskbar-applet.mo @@ -377,7 +420,7 @@ share/locale/sk/LC_MESSAGES/deskbar-applet.mo share/locale/sl/LC_MESSAGES/deskbar-applet.mo share/locale/sq/LC_MESSAGES/deskbar-applet.mo share/locale/sr/LC_MESSAGES/deskbar-applet.mo -share/locale/sr@Latn/LC_MESSAGES/deskbar-applet.mo +share/locale/sr@latin/LC_MESSAGES/deskbar-applet.mo share/locale/sv/LC_MESSAGES/deskbar-applet.mo share/locale/ta/LC_MESSAGES/deskbar-applet.mo share/locale/te/LC_MESSAGES/deskbar-applet.mo @@ -394,12 +437,16 @@ share/omf/deskbar/deskbar-el.omf share/omf/deskbar/deskbar-en_GB.omf share/omf/deskbar/deskbar-es.omf share/omf/deskbar/deskbar-fr.omf +share/omf/deskbar/deskbar-it.omf share/omf/deskbar/deskbar-oc.omf share/omf/deskbar/deskbar-pt_BR.omf share/omf/deskbar/deskbar-ru.omf share/omf/deskbar/deskbar-sv.omf share/omf/deskbar/deskbar-uk.omf +share/omf/deskbar/deskbar-zh_CN.omf @dirrm share/omf/deskbar +@dirrm share/gnome/help/deskbar/zh_CN/figures +@dirrm share/gnome/help/deskbar/zh_CN @dirrm share/gnome/help/deskbar/uk/figures @dirrm share/gnome/help/deskbar/uk @dirrm share/gnome/help/deskbar/sv/figures @@ -410,6 +457,8 @@ share/omf/deskbar/deskbar-uk.omf @dirrm share/gnome/help/deskbar/pt_BR @dirrm share/gnome/help/deskbar/oc/figures @dirrm share/gnome/help/deskbar/oc +@dirrm share/gnome/help/deskbar/it/figures +@dirrm share/gnome/help/deskbar/it @dirrm share/gnome/help/deskbar/fr/figures @dirrm share/gnome/help/deskbar/fr @dirrm share/gnome/help/deskbar/es/figures @@ -437,7 +486,6 @@ share/omf/deskbar/deskbar-uk.omf @dirrm %%PYTHON_SITELIBDIR%%/deskbar/handlers @dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/updater @dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/keybinder -@dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/gnomedesktop @dirrm %%PYTHON_SITELIBDIR%%/deskbar/core/_userdirs @dirrm %%PYTHON_SITELIBDIR%%/deskbar/core @dirrm %%PYTHON_SITELIBDIR%%/deskbar @@ -447,8 +495,12 @@ share/omf/deskbar/deskbar-uk.omf @dirrmtry share/locale/zh_HK @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/si/LC_MESSAGES @dirrmtry share/locale/si +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -463,5 +515,7 @@ share/omf/deskbar/deskbar-uk.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile index 25e903ffb3e6..e015fb0bfa01 100644 --- a/deskutils/evolution-jescs/Makefile +++ b/deskutils/evolution-jescs/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.29 2008/03/11 18:33:24 mezz Exp $ +# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.33 2008/09/27 01:52:59 mezz Exp $ # PORTNAME= evolution-jescs -PORTVERSION= 2.22.2 -PORTREVISION= 2 +PORTVERSION= 2.24.0 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,13 +21,14 @@ RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnometarget +USE_GNOME= gnomeprefix gnomehack intlhack +INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -EVO_VERSION= 2.22 -PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.22" +EVO_VERSION= 2.24 +PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.24" post-patch: @${REINPLACE_CMD} -e 's|libdir/bonobo/servers|prefix/libdata/bonobo/servers|g' \ diff --git a/deskutils/evolution-jescs/distinfo b/deskutils/evolution-jescs/distinfo index 6a2e65b62554..d5cb9a7507ca 100644 --- a/deskutils/evolution-jescs/distinfo +++ b/deskutils/evolution-jescs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-jescs-2.22.2.tar.bz2) = f11a85739539ded6ae70aeeb86fe6dd9 -SHA256 (gnome2/evolution-jescs-2.22.2.tar.bz2) = a39c516a2089af8d1ed2b50e9d94aae4eb541f79b7986f7f2b5ae775a6444757 -SIZE (gnome2/evolution-jescs-2.22.2.tar.bz2) = 531604 +MD5 (gnome2/evolution-jescs-2.24.0.tar.bz2) = ad7e6ec6c47aa7a3fba490f62d0355cf +SHA256 (gnome2/evolution-jescs-2.24.0.tar.bz2) = 6a796c57b053d7197e5c71f2f50faf02dbe13f676445995c9d0b1a90852475b5 +SIZE (gnome2/evolution-jescs-2.24.0.tar.bz2) = 523349 diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist index 2a5da4eea4c4..cad1ae2c81b1 100644 --- a/deskutils/evolution-jescs/pkg-plist +++ b/deskutils/evolution-jescs/pkg-plist @@ -3,12 +3,19 @@ lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.so lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.urls libdata/bonobo/servers/GNOME_Evolution_SunOne_Storage.server libexec/evolution/%%EVO_VERSION%%/evolution-jescs -share/evolution/%%EVO_VERSION%%/images/sun-connector.png -share/evolution/%%EVO_VERSION%%/images/sunone-invitations.png -share/evolution/%%EVO_VERSION%%/images/sunone-invitations-mini.png +share/evolution/%%EVO_VERSION%%/icons/hicolor/16x16/categories/sunone-invitations.png +share/evolution/%%EVO_VERSION%%/icons/hicolor/22x22/categories/sunone-invitations.png +share/evolution/%%EVO_VERSION%%/icons/hicolor/24x24/categories/sunone-invitations.png +share/evolution/%%EVO_VERSION%%/icons/hicolor/32x32/categories/sunone-invitations.png +share/evolution/%%EVO_VERSION%%/icons/hicolor/48x48/categories/sunone-invitations.png share/evolution-jescs/glade/sunone-add-permission-dialog.glade share/evolution-jescs/glade/sunone-permissions-dialog.glade share/evolution-jescs/glade/sunone-subscription-dialog.glade +share/icons/hicolor/16x16/apps/sun-connector.png +share/icons/hicolor/22x22/apps/sun-connector.png +share/icons/hicolor/24x24/apps/sun-connector.png +share/icons/hicolor/32x32/apps/sun-connector.png +share/icons/hicolor/48x48/apps/sun-connector.png share/locale/ar/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo @@ -40,6 +47,10 @@ share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo @dirrm share/evolution-jescs/glade @dirrm share/evolution-jescs +@dirrmtry share/evolution/%%EVO_VERSION%%/icons/hicolor/32x32/categories +@dirrmtry share/evolution/%%EVO_VERSION%%/icons/hicolor/24x24/categories +@dirrmtry share/evolution/%%EVO_VERSION%%/icons/hicolor/22x22/categories +@dirrmtry share/evolution/%%EVO_VERSION%%/icons/hicolor/16x16/categories @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile index ecf8d0413e0c..f6e2a44d8430 100644 --- a/deskutils/gnome-main-menu/Makefile +++ b/deskutils/gnome-main-menu/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome-main-menu -PORTVERSION= 0.9.10 -PORTREVISION= 3 +PORTVERSION= 0.9.11 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/deskutils/gnome-main-menu/distinfo b/deskutils/gnome-main-menu/distinfo index 99d7f4e24c14..9e4d2649806f 100644 --- a/deskutils/gnome-main-menu/distinfo +++ b/deskutils/gnome-main-menu/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-main-menu-0.9.10.tar.bz2) = 0998c96746ae95740da17bed5969d935 -SHA256 (gnome2/gnome-main-menu-0.9.10.tar.bz2) = 861af0beeb20298a66e67bf33de714a4c6af3dd118d480bc9d04b8086032d060 -SIZE (gnome2/gnome-main-menu-0.9.10.tar.bz2) = 593999 +MD5 (gnome2/gnome-main-menu-0.9.11.tar.bz2) = 51daad3f7eeb64d84ce07ada11dcb85f +SHA256 (gnome2/gnome-main-menu-0.9.11.tar.bz2) = 17489c3d0e1f64f8fc7c7b299e6bae8aba9195055ed5dde94b39dc62b6224e29 +SIZE (gnome2/gnome-main-menu-0.9.11.tar.bz2) = 556054 diff --git a/deskutils/gnome-main-menu/files/patch-configure b/deskutils/gnome-main-menu/files/patch-configure index 8f39d54bf332..9f32bd6394d0 100644 --- a/deskutils/gnome-main-menu/files/patch-configure +++ b/deskutils/gnome-main-menu/files/patch-configure @@ -1,38 +1,38 @@ ---- configure.orig 2008-07-06 22:38:32.000000000 -0400 -+++ configure 2008-07-06 22:39:21.000000000 -0400 -@@ -23537,12 +23537,12 @@ if test -n "$MAIN_MENU_CFLAGS"; then +--- configure.orig 2008-10-08 13:36:57.000000000 -0400 ++++ configure 2008-10-08 13:38:39.000000000 -0400 +@@ -23975,12 +23975,12 @@ if test -n "$MAIN_MENU_CFLAGS"; then pkg_cv_MAIN_MENU_CFLAGS="$MAIN_MENU_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo \"") >&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo \"") >&5 - ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo \"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo \"") >&5 + ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>/dev/null` + pkg_cv_MAIN_MENU_CFLAGS=`$PKG_CONFIG --cflags " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>/dev/null` else pkg_failed=yes fi -@@ -23553,12 +23553,12 @@ if test -n "$MAIN_MENU_LIBS"; then +@@ -23991,12 +23991,12 @@ if test -n "$MAIN_MENU_LIBS"; then pkg_cv_MAIN_MENU_LIBS="$MAIN_MENU_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo \"") >&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo \"") >&5 - ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo \"") >&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \$COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo \"") >&5 + ($PKG_CONFIG --exists --print-errors " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo " 2>/dev/null` + pkg_cv_MAIN_MENU_LIBS=`$PKG_CONFIG --libs " $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo " 2>/dev/null` else pkg_failed=yes fi -@@ -23576,14 +23576,14 @@ else +@@ -24014,14 +24014,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -45,41 +45,42 @@ # Put the nasty error message in config.log where it belongs echo "$MAIN_MENU_PKG_ERRORS" >&5 -- { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ) were not met: -+ { { echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ) were not met: +- { { $as_echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ) were not met: $MAIN_MENU_PKG_ERRORS -@@ -23594,7 +23594,7 @@ Alternatively, you may set the environme +@@ -24032,7 +24032,7 @@ Alternatively, you may set the environme and MAIN_MENU_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 --echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ) were not met: -+echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ) were not met: +-$as_echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ) were not met: ++$as_echo "$as_me: error: Package requirements ( $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 hal-storage cairo ) were not met: $MAIN_MENU_PKG_ERRORS -@@ -23637,7 +23637,7 @@ echo "${ECHO_T}yes" >&6; } +@@ -24075,7 +24075,7 @@ $as_echo "yes" >&6; } fi -for ac_header in iwlib.h +for ac_header in # do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -@@ -23850,14 +23850,6 @@ fi +@@ -24297,15 +24297,6 @@ fi done -if test "x$have_iwlib" != "xyes" ; then -- { { echo "$as_me:$LINENO: error: cannot find iwlib" >&5 --echo "$as_me: error: cannot find iwlib" >&2;} +- { { $as_echo "$as_me:$LINENO: error: cannot find iwlib" >&5 +-$as_echo "$as_me: error: cannot find iwlib" >&2;} - { (exit 1); exit 1; }; } -else - MAIN_MENU_LIBS="$MAIN_MENU_LIBS -liw" - -fi +- diff --git a/deskutils/gnome-main-menu/pkg-plist b/deskutils/gnome-main-menu/pkg-plist index a2633f1106ad..ef4a4a11249d 100644 --- a/deskutils/gnome-main-menu/pkg-plist +++ b/deskutils/gnome-main-menu/pkg-plist @@ -55,6 +55,7 @@ share/locale/en_IGID/LC_MESSAGES/gnome-main-menu.mo share/locale/en_US/LC_MESSAGES/gnome-main-menu.mo share/locale/es/LC_MESSAGES/gnome-main-menu.mo share/locale/et/LC_MESSAGES/gnome-main-menu.mo +share/locale/eu/LC_MESSAGES/gnome-main-menu.mo share/locale/fi/LC_MESSAGES/gnome-main-menu.mo share/locale/fr/LC_MESSAGES/gnome-main-menu.mo share/locale/gl/LC_MESSAGES/gnome-main-menu.mo @@ -96,6 +97,9 @@ share/locale/xh/LC_MESSAGES/gnome-main-menu.mo share/locale/zh_CN/LC_MESSAGES/gnome-main-menu.mo share/locale/zh_TW/LC_MESSAGES/gnome-main-menu.mo share/locale/zu/LC_MESSAGES/gnome-main-menu.mo +@dirrm %%DATADIR%% +@dirrm include/slab +@dirrmtry share/applications @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/xh/LC_MESSAGES @@ -114,8 +118,5 @@ share/locale/zu/LC_MESSAGES/gnome-main-menu.mo @dirrmtry share/locale/en_US @dirrmtry share/locale/en_IGID/LC_MESSAGES @dirrmtry share/locale/en_IGID -@dirrmtry share/locale/ar/LC_MESSAGES -@dirrmtry share/locale/ar -@dirrm %%DATADIR%% -@dirrm include/slab -@dirrmtry share/applications +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 5efd30d87982..775db55c2a9f 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -3,16 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.125 2007/09/18 14:57:01 ahze Exp $ +# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.130 2008/10/20 22:42:42 kwm Exp $ # PORTNAME= gnome-utils -PORTVERSION= 2.20.0.1 -PORTREVISION= 2 +PORTVERSION= 2.24.1 PORTEPOCH= 1 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index 22234d1e1533..a1a9ef57a8ac 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-utils-2.20.0.1.tar.bz2) = 2d4385df2fb566b437b283bd2ce70190 -SHA256 (gnome2/gnome-utils-2.20.0.1.tar.bz2) = af208196c59443938b093a811aca7ca975761b9d0af028f9c2e49e84ddea26b1 -SIZE (gnome2/gnome-utils-2.20.0.1.tar.bz2) = 4592719 +MD5 (gnome2/gnome-utils-2.24.1.tar.bz2) = 232937a4bf5c9ebb1bbc86793871d843 +SHA256 (gnome2/gnome-utils-2.24.1.tar.bz2) = 6b7e29feaa25d5e85fa55a00775e7b3296725ef98b455b8b1d810cf379cfdd00 +SIZE (gnome2/gnome-utils-2.24.1.tar.bz2) = 6410784 diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index 8f49667f7ae0..0f71ca4e1454 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -8,9 +8,9 @@ include/gdict-1.0/gdict/gdict-client-context.h include/gdict-1.0/gdict/gdict-context.h include/gdict-1.0/gdict/gdict-database-chooser.h include/gdict-1.0/gdict/gdict-defbox.h -include/gdict-1.0/gdict/gdict-entry.h include/gdict-1.0/gdict/gdict-enum-types.h include/gdict-1.0/gdict/gdict-source-loader.h +include/gdict-1.0/gdict/gdict-source-chooser.h include/gdict-1.0/gdict/gdict-source.h include/gdict-1.0/gdict/gdict-speller.h include/gdict-1.0/gdict/gdict-strategy-chooser.h @@ -20,7 +20,7 @@ include/gdict-1.0/gdict/gdict.h lib/libgdict-1.0.a lib/libgdict-1.0.la lib/libgdict-1.0.so -lib/libgdict-1.0.so.5 +lib/libgdict-1.0.so.6 libdata/bonobo/servers/GNOME_DictionaryApplet.server libdata/pkgconfig/gdict-1.0.pc libexec/gnome-dictionary-applet @@ -28,6 +28,7 @@ share/doc/gdict/GdictClientContext.html share/doc/gdict/GdictDatabaseChooser.html share/doc/gdict/GdictDefbox.html share/doc/gdict/GdictSource.html +share/doc/gdict/GdictSourceChooser.html share/doc/gdict/GdictSourceLoader.html share/doc/gdict/GdictSpeller.html share/doc/gdict/GdictStrategyChooser.html @@ -46,6 +47,10 @@ share/doc/gdict/gdictui.html share/doc/gdict/home.png share/doc/gdict/index.html share/doc/gdict/index.sgml +share/doc/gdict/ix01.html +share/doc/gdict/ix02.html +share/doc/gdict/ix03.html +share/doc/gdict/ix04.html share/doc/gdict/introduction.html share/doc/gdict/left.png share/doc/gdict/right.png @@ -65,7 +70,7 @@ share/gdict-1.0/sources/thai.desktop share/gnome-2.0/ui/GNOME_DictionaryApplet.xml share/gnome-dictionary/gnome-dictionary-preferences.glade share/gnome-dictionary/gnome-dictionary-ui.xml -share/gnome-screenshot/glade/gnome-screenshot.glade +share/gnome-screenshot/gnome-screenshot.ui share/gnome-system-log/gnome-system-log-actions.db share/gnome-system-log/gnome-system-log-descript.db share/gnome-system-log/gnome-system-log-regexp.db @@ -73,6 +78,8 @@ share/gnome/help/baobab/C/baobab.xml share/gnome/help/baobab/C/figures/baobab_fullscan.png share/gnome/help/baobab/C/figures/baobab_prefs.png share/gnome/help/baobab/C/figures/baobab_remote.png +share/gnome/help/baobab/C/figures/baobab_ringschart1.png +share/gnome/help/baobab/C/figures/baobab_ringschart2.png share/gnome/help/baobab/C/figures/baobab_treemaps.png share/gnome/help/baobab/C/figures/baobab_window.png share/gnome/help/baobab/C/legal.xml @@ -80,44 +87,114 @@ share/gnome/help/baobab/ca/baobab.xml share/gnome/help/baobab/ca/figures/baobab_fullscan.png share/gnome/help/baobab/ca/figures/baobab_prefs.png share/gnome/help/baobab/ca/figures/baobab_remote.png +share/gnome/help/baobab/ca/figures/baobab_ringschart1.png +share/gnome/help/baobab/ca/figures/baobab_ringschart2.png share/gnome/help/baobab/ca/figures/baobab_treemaps.png share/gnome/help/baobab/ca/figures/baobab_window.png +share/gnome/help/baobab/da/baobab.xml +share/gnome/help/baobab/da/figures/baobab_fullscan.png +share/gnome/help/baobab/da/figures/baobab_prefs.png +share/gnome/help/baobab/da/figures/baobab_remote.png +share/gnome/help/baobab/da/figures/baobab_ringschart1.png +share/gnome/help/baobab/da/figures/baobab_ringschart2.png +share/gnome/help/baobab/da/figures/baobab_treemaps.png +share/gnome/help/baobab/da/figures/baobab_window.png +share/gnome/help/baobab/de/baobab.xml +share/gnome/help/baobab/de/figures/baobab_fullscan.png +share/gnome/help/baobab/de/figures/baobab_prefs.png +share/gnome/help/baobab/de/figures/baobab_remote.png +share/gnome/help/baobab/de/figures/baobab_ringschart1.png +share/gnome/help/baobab/de/figures/baobab_ringschart2.png +share/gnome/help/baobab/de/figures/baobab_treemaps.png +share/gnome/help/baobab/de/figures/baobab_window.png share/gnome/help/baobab/en_GB/baobab.xml share/gnome/help/baobab/en_GB/figures/baobab_fullscan.png share/gnome/help/baobab/en_GB/figures/baobab_prefs.png share/gnome/help/baobab/en_GB/figures/baobab_remote.png +share/gnome/help/baobab/en_GB/figures/baobab_ringschart1.png +share/gnome/help/baobab/en_GB/figures/baobab_ringschart2.png share/gnome/help/baobab/en_GB/figures/baobab_treemaps.png share/gnome/help/baobab/en_GB/figures/baobab_window.png share/gnome/help/baobab/es/baobab.xml share/gnome/help/baobab/es/figures/baobab_fullscan.png share/gnome/help/baobab/es/figures/baobab_prefs.png share/gnome/help/baobab/es/figures/baobab_remote.png +share/gnome/help/baobab/es/figures/baobab_ringschart1.png +share/gnome/help/baobab/es/figures/baobab_ringschart2.png share/gnome/help/baobab/es/figures/baobab_treemaps.png share/gnome/help/baobab/es/figures/baobab_window.png +share/gnome/help/baobab/fi/baobab.xml +share/gnome/help/baobab/fi/figures/baobab_fullscan.png +share/gnome/help/baobab/fi/figures/baobab_prefs.png +share/gnome/help/baobab/fi/figures/baobab_remote.png +share/gnome/help/baobab/fi/figures/baobab_ringschart1.png +share/gnome/help/baobab/fi/figures/baobab_ringschart2.png +share/gnome/help/baobab/fi/figures/baobab_treemaps.png +share/gnome/help/baobab/fi/figures/baobab_window.png share/gnome/help/baobab/fr/baobab.xml share/gnome/help/baobab/fr/figures/baobab_fullscan.png share/gnome/help/baobab/fr/figures/baobab_prefs.png share/gnome/help/baobab/fr/figures/baobab_remote.png +share/gnome/help/baobab/fr/figures/baobab_ringschart1.png +share/gnome/help/baobab/fr/figures/baobab_ringschart2.png share/gnome/help/baobab/fr/figures/baobab_treemaps.png share/gnome/help/baobab/fr/figures/baobab_window.png +share/gnome/help/baobab/it/baobab.xml +share/gnome/help/baobab/it/figures/baobab_fullscan.png +share/gnome/help/baobab/it/figures/baobab_prefs.png +share/gnome/help/baobab/it/figures/baobab_remote.png +share/gnome/help/baobab/it/figures/baobab_ringschart1.png +share/gnome/help/baobab/it/figures/baobab_ringschart2.png +share/gnome/help/baobab/it/figures/baobab_treemaps.png +share/gnome/help/baobab/it/figures/baobab_window.png share/gnome/help/baobab/oc/baobab.xml share/gnome/help/baobab/oc/figures/baobab_fullscan.png share/gnome/help/baobab/oc/figures/baobab_prefs.png share/gnome/help/baobab/oc/figures/baobab_remote.png +share/gnome/help/baobab/oc/figures/baobab_ringschart1.png +share/gnome/help/baobab/oc/figures/baobab_ringschart2.png share/gnome/help/baobab/oc/figures/baobab_treemaps.png share/gnome/help/baobab/oc/figures/baobab_window.png +share/gnome/help/baobab/ru/baobab.xml +share/gnome/help/baobab/ru/figures/baobab_fullscan.png +share/gnome/help/baobab/ru/figures/baobab_prefs.png +share/gnome/help/baobab/ru/figures/baobab_remote.png +share/gnome/help/baobab/ru/figures/baobab_ringschart1.png +share/gnome/help/baobab/ru/figures/baobab_ringschart2.png +share/gnome/help/baobab/ru/figures/baobab_treemaps.png +share/gnome/help/baobab/ru/figures/baobab_window.png share/gnome/help/baobab/sv/baobab.xml share/gnome/help/baobab/sv/figures/baobab_fullscan.png share/gnome/help/baobab/sv/figures/baobab_prefs.png share/gnome/help/baobab/sv/figures/baobab_remote.png +share/gnome/help/baobab/sv/figures/baobab_ringschart1.png +share/gnome/help/baobab/sv/figures/baobab_ringschart2.png share/gnome/help/baobab/sv/figures/baobab_treemaps.png share/gnome/help/baobab/sv/figures/baobab_window.png share/gnome/help/baobab/uk/baobab.xml share/gnome/help/baobab/uk/figures/baobab_fullscan.png share/gnome/help/baobab/uk/figures/baobab_prefs.png share/gnome/help/baobab/uk/figures/baobab_remote.png +share/gnome/help/baobab/uk/figures/baobab_ringschart1.png +share/gnome/help/baobab/uk/figures/baobab_ringschart2.png share/gnome/help/baobab/uk/figures/baobab_treemaps.png share/gnome/help/baobab/uk/figures/baobab_window.png +share/gnome/help/baobab/zh_HK/baobab.xml +share/gnome/help/baobab/zh_HK/figures/baobab_fullscan.png +share/gnome/help/baobab/zh_HK/figures/baobab_prefs.png +share/gnome/help/baobab/zh_HK/figures/baobab_remote.png +share/gnome/help/baobab/zh_HK/figures/baobab_ringschart1.png +share/gnome/help/baobab/zh_HK/figures/baobab_ringschart2.png +share/gnome/help/baobab/zh_HK/figures/baobab_treemaps.png +share/gnome/help/baobab/zh_HK/figures/baobab_window.png +share/gnome/help/baobab/zh_TW/baobab.xml +share/gnome/help/baobab/zh_TW/figures/baobab_fullscan.png +share/gnome/help/baobab/zh_TW/figures/baobab_prefs.png +share/gnome/help/baobab/zh_TW/figures/baobab_remote.png +share/gnome/help/baobab/zh_TW/figures/baobab_ringschart1.png +share/gnome/help/baobab/zh_TW/figures/baobab_ringschart2.png +share/gnome/help/baobab/zh_TW/figures/baobab_treemaps.png +share/gnome/help/baobab/zh_TW/figures/baobab_window.png share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-add-source.png share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet-window.png share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-applet.png @@ -137,6 +214,15 @@ share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-lookup.png share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-print.png share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-source.png share/gnome/help/gnome-dictionary/ca/gnome-dictionary.xml +share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-add-source.png +share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet-window.png +share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-applet.png +share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-application.png +share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-find.png +share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-lookup.png +share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-preferences-print.png +share/gnome/help/gnome-dictionary/de/figures/gnome-dictionary-preferences-source.png +share/gnome/help/gnome-dictionary/de/gnome-dictionary.xml share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-add-source.png share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-applet-window.png share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-applet.png @@ -164,6 +250,15 @@ share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-lookup.png share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-print.png share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-preferences-source.png share/gnome/help/gnome-dictionary/es/gnome-dictionary.xml +share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-add-source.png +share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-applet-window.png +share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-applet.png +share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-application.png +share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-find.png +share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-lookup.png +share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-preferences-print.png +share/gnome/help/gnome-dictionary/fi/figures/gnome-dictionary-preferences-source.png +share/gnome/help/gnome-dictionary/fi/gnome-dictionary.xml share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-add-source.png share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-applet-window.png share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-applet.png @@ -182,6 +277,15 @@ share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-lookup.png share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-preferences-print.png share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-preferences-source.png share/gnome/help/gnome-dictionary/it/gnome-dictionary.xml +share/gnome/help/gnome-dictionary/oc/figures/gnome-dictionary-add-source.png +share/gnome/help/gnome-dictionary/oc/figures/gnome-dictionary-applet-window.png +share/gnome/help/gnome-dictionary/oc/figures/gnome-dictionary-applet.png +share/gnome/help/gnome-dictionary/oc/figures/gnome-dictionary-application.png +share/gnome/help/gnome-dictionary/oc/figures/gnome-dictionary-find.png +share/gnome/help/gnome-dictionary/oc/figures/gnome-dictionary-lookup.png +share/gnome/help/gnome-dictionary/oc/figures/gnome-dictionary-preferences-print.png +share/gnome/help/gnome-dictionary/oc/figures/gnome-dictionary-preferences-source.png +share/gnome/help/gnome-dictionary/oc/gnome-dictionary.xml share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-add-source.png share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet-window.png share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet.png @@ -214,12 +318,18 @@ share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml share/gnome/help/gnome-search-tool/C/legal.xml share/gnome/help/gnome-search-tool/ca/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/ca/gnome-search-tool.xml +share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png +share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml share/gnome/help/gnome-search-tool/en_GB/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/en_GB/gnome-search-tool.xml share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml +share/gnome/help/gnome-search-tool/fi/figures/gnome-search-tool_window.png +share/gnome/help/gnome-search-tool/fi/gnome-search-tool.xml share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/fr/gnome-search-tool.xml +share/gnome/help/gnome-search-tool/it/figures/gnome-search-tool_window.png +share/gnome/help/gnome-search-tool/it/gnome-search-tool.xml share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml share/gnome/help/gnome-search-tool/oc/figures/gnome-search-tool_window.png @@ -235,10 +345,16 @@ share/gnome/help/gnome-system-log/C/gnome-system-log.xml share/gnome/help/gnome-system-log/C/legal.xml share/gnome/help/gnome-system-log/ca/figures/syslog_window.png share/gnome/help/gnome-system-log/ca/gnome-system-log.xml +share/gnome/help/gnome-system-log/de/figures/syslog_window.png +share/gnome/help/gnome-system-log/de/gnome-system-log.xml +share/gnome/help/gnome-system-log/el/figures/syslog_window.png +share/gnome/help/gnome-system-log/el/gnome-system-log.xml share/gnome/help/gnome-system-log/en_GB/figures/syslog_window.png share/gnome/help/gnome-system-log/en_GB/gnome-system-log.xml share/gnome/help/gnome-system-log/es/figures/syslog_window.png share/gnome/help/gnome-system-log/es/gnome-system-log.xml +share/gnome/help/gnome-system-log/fi/figures/syslog_window.png +share/gnome/help/gnome-system-log/fi/gnome-system-log.xml share/gnome/help/gnome-system-log/fr/figures/syslog_window.png share/gnome/help/gnome-system-log/fr/gnome-system-log.xml share/gnome/help/gnome-system-log/it/figures/syslog_window.png @@ -255,26 +371,39 @@ share/gnome/help/gnome-system-log/uk/figures/syslog_window.png share/gnome/help/gnome-system-log/uk/gnome-system-log.xml share/omf/baobab/baobab-C.omf share/omf/baobab/baobab-ca.omf +share/omf/baobab/baobab-da.omf +share/omf/baobab/baobab-de.omf share/omf/baobab/baobab-en_GB.omf share/omf/baobab/baobab-es.omf +share/omf/baobab/baobab-fi.omf share/omf/baobab/baobab-fr.omf +share/omf/baobab/baobab-it.omf share/omf/baobab/baobab-oc.omf +share/omf/baobab/baobab-ru.omf share/omf/baobab/baobab-sv.omf share/omf/baobab/baobab-uk.omf +share/omf/baobab/baobab-zh_HK.omf +share/omf/baobab/baobab-zh_TW.omf share/omf/gnome-dictionary/gnome-dictionary-C.omf share/omf/gnome-dictionary/gnome-dictionary-ca.omf +share/omf/gnome-dictionary/gnome-dictionary-de.omf share/omf/gnome-dictionary/gnome-dictionary-el.omf share/omf/gnome-dictionary/gnome-dictionary-en_GB.omf share/omf/gnome-dictionary/gnome-dictionary-es.omf +share/omf/gnome-dictionary/gnome-dictionary-fi.omf share/omf/gnome-dictionary/gnome-dictionary-fr.omf share/omf/gnome-dictionary/gnome-dictionary-it.omf +share/omf/gnome-dictionary/gnome-dictionary-oc.omf share/omf/gnome-dictionary/gnome-dictionary-ru.omf share/omf/gnome-dictionary/gnome-dictionary-sv.omf share/omf/gnome-dictionary/gnome-dictionary-uk.omf share/omf/gnome-search-tool/gnome-search-tool-C.omf share/omf/gnome-search-tool/gnome-search-tool-ca.omf +share/omf/gnome-search-tool/gnome-search-tool-de.omf share/omf/gnome-search-tool/gnome-search-tool-en_GB.omf share/omf/gnome-search-tool/gnome-search-tool-es.omf +share/omf/gnome-search-tool/gnome-search-tool-fi.omf +share/omf/gnome-search-tool/gnome-search-tool-it.omf share/omf/gnome-search-tool/gnome-search-tool-ko.omf share/omf/gnome-search-tool/gnome-search-tool-oc.omf share/omf/gnome-search-tool/gnome-search-tool-fr.omf @@ -283,8 +412,11 @@ share/omf/gnome-search-tool/gnome-search-tool-sv.omf share/omf/gnome-search-tool/gnome-search-tool-uk.omf share/omf/gnome-system-log/gnome-system-log-C.omf share/omf/gnome-system-log/gnome-system-log-ca.omf +share/omf/gnome-system-log/gnome-system-log-de.omf +share/omf/gnome-system-log/gnome-system-log-el.omf share/omf/gnome-system-log/gnome-system-log-en_GB.omf share/omf/gnome-system-log/gnome-system-log-es.omf +share/omf/gnome-system-log/gnome-system-log-fi.omf share/omf/gnome-system-log/gnome-system-log-fr.omf share/omf/gnome-system-log/gnome-system-log-it.omf share/omf/gnome-system-log/gnome-system-log-ko.omf @@ -296,9 +428,11 @@ share/pixmaps/gsearchtool/thumbnail_frame.png share/icons/hicolor/24x24/apps/baobab.png share/icons/hicolor/scalable/apps/baobab.svg share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/as/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/be@latin/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/bn_IN/LC_MESSAGES/gnome-utils-2.0.mo @@ -329,14 +463,17 @@ share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ka/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/kn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ku/LC_MESSAGES/gnome-utils-2.0.mo share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/mai/LC_MESSAGES/gnome-utils-2.0.mo share/locale/mg/LC_MESSAGES/gnome-utils-2.0.mo share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ml/LC_MESSAGES/gnome-utils-2.0.mo share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/mr/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nb/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ne/LC_MESSAGES/gnome-utils-2.0.mo @@ -346,6 +483,7 @@ share/locale/oc/LC_MESSAGES/gnome-utils-2.0.mo share/locale/or/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pa/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pl/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/ps/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pt/LC_MESSAGES/gnome-utils-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo @@ -356,7 +494,7 @@ share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-utils-2.0.mo share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo share/locale/te/LC_MESSAGES/gnome-utils-2.0.mo @@ -388,10 +526,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-system-log/it @dirrm share/gnome/help/gnome-system-log/fr/figures @dirrm share/gnome/help/gnome-system-log/fr +@dirrm share/gnome/help/gnome-system-log/fi/figures +@dirrm share/gnome/help/gnome-system-log/fi @dirrm share/gnome/help/gnome-system-log/es/figures @dirrm share/gnome/help/gnome-system-log/es @dirrm share/gnome/help/gnome-system-log/en_GB/figures @dirrm share/gnome/help/gnome-system-log/en_GB +@dirrm share/gnome/help/gnome-system-log/el/figures +@dirrm share/gnome/help/gnome-system-log/el +@dirrm share/gnome/help/gnome-system-log/de/figures +@dirrm share/gnome/help/gnome-system-log/de @dirrm share/gnome/help/gnome-system-log/ca/figures @dirrm share/gnome/help/gnome-system-log/ca @dirrm share/gnome/help/gnome-system-log/C/figures @@ -407,12 +551,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-search-tool/oc @dirrm share/gnome/help/gnome-search-tool/ko/figures @dirrm share/gnome/help/gnome-search-tool/ko +@dirrm share/gnome/help/gnome-search-tool/it/figures +@dirrm share/gnome/help/gnome-search-tool/it @dirrm share/gnome/help/gnome-search-tool/fr/figures @dirrm share/gnome/help/gnome-search-tool/fr +@dirrm share/gnome/help/gnome-search-tool/fi/figures +@dirrm share/gnome/help/gnome-search-tool/fi @dirrm share/gnome/help/gnome-search-tool/es/figures @dirrm share/gnome/help/gnome-search-tool/es @dirrm share/gnome/help/gnome-search-tool/en_GB/figures @dirrm share/gnome/help/gnome-search-tool/en_GB +@dirrm share/gnome/help/gnome-search-tool/de/figures +@dirrm share/gnome/help/gnome-search-tool/de @dirrm share/gnome/help/gnome-search-tool/ca/figures @dirrm share/gnome/help/gnome-search-tool/ca @dirrm share/gnome/help/gnome-search-tool/C/figures @@ -424,40 +574,59 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-dictionary/sv @dirrm share/gnome/help/gnome-dictionary/ru/figures @dirrm share/gnome/help/gnome-dictionary/ru +@dirrm share/gnome/help/gnome-dictionary/oc/figures +@dirrm share/gnome/help/gnome-dictionary/oc @dirrm share/gnome/help/gnome-dictionary/it/figures @dirrm share/gnome/help/gnome-dictionary/it @dirrm share/gnome/help/gnome-dictionary/fr/figures @dirrm share/gnome/help/gnome-dictionary/fr +@dirrm share/gnome/help/gnome-dictionary/fi/figures +@dirrm share/gnome/help/gnome-dictionary/fi @dirrm share/gnome/help/gnome-dictionary/es/figures @dirrm share/gnome/help/gnome-dictionary/es @dirrm share/gnome/help/gnome-dictionary/en_GB/figures @dirrm share/gnome/help/gnome-dictionary/en_GB @dirrm share/gnome/help/gnome-dictionary/el/figures @dirrm share/gnome/help/gnome-dictionary/el +@dirrm share/gnome/help/gnome-dictionary/de/figures +@dirrm share/gnome/help/gnome-dictionary/de @dirrm share/gnome/help/gnome-dictionary/ca/figures @dirrm share/gnome/help/gnome-dictionary/ca @dirrm share/gnome/help/gnome-dictionary/C/figures @dirrm share/gnome/help/gnome-dictionary/C @dirrm share/gnome/help/gnome-dictionary +@dirrm share/gnome/help/baobab/zh_TW/figures +@dirrm share/gnome/help/baobab/zh_TW +@dirrm share/gnome/help/baobab/zh_HK/figures +@dirrm share/gnome/help/baobab/zh_HK @dirrm share/gnome/help/baobab/uk/figures @dirrm share/gnome/help/baobab/uk @dirrm share/gnome/help/baobab/sv/figures @dirrm share/gnome/help/baobab/sv +@dirrm share/gnome/help/baobab/ru/figures +@dirrm share/gnome/help/baobab/ru @dirrm share/gnome/help/baobab/oc/figures @dirrm share/gnome/help/baobab/oc +@dirrm share/gnome/help/baobab/it/figures +@dirrm share/gnome/help/baobab/it @dirrm share/gnome/help/baobab/fr/figures @dirrm share/gnome/help/baobab/fr +@dirrm share/gnome/help/baobab/fi/figures +@dirrm share/gnome/help/baobab/fi @dirrm share/gnome/help/baobab/es/figures @dirrm share/gnome/help/baobab/es @dirrm share/gnome/help/baobab/en_GB/figures @dirrm share/gnome/help/baobab/en_GB +@dirrm share/gnome/help/baobab/de/figures +@dirrm share/gnome/help/baobab/de +@dirrm share/gnome/help/baobab/da/figures +@dirrm share/gnome/help/baobab/da @dirrm share/gnome/help/baobab/ca/figures @dirrm share/gnome/help/baobab/ca @dirrm share/gnome/help/baobab/C/figures @dirrm share/gnome/help/baobab/C @dirrm share/gnome/help/baobab @dirrm share/gnome-system-log -@dirrm share/gnome-screenshot/glade @dirrm share/gnome-screenshot @dirrm share/gnome-dictionary @dirrm share/gdict-1.0/sources @@ -467,24 +636,36 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/doc/gdict @dirrm include/gdict-1.0/gdict @dirrm include/gdict-1.0 +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@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/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index f4aaa9eb608c..59c49e55c359 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gucharmap/Makefile,v 1.47 2008/03/09 22:24:55 mezz Exp $ +# $MCom: ports/deskutils/gucharmap/Makefile,v 1.57 2008/11/25 05:40:17 mezz Exp $ # PORTNAME= gucharmap -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,11 +21,9 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2 -WANT_GNOME= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo index c5ef7f5189ba..c2718ac86611 100644 --- a/deskutils/gucharmap/distinfo +++ b/deskutils/gucharmap/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gucharmap-2.22.3.tar.bz2) = f57290934466fda80eb883f77c0a2ff1 -SHA256 (gnome2/gucharmap-2.22.3.tar.bz2) = 5d8a15ce45551e073bbaa7ef7b55b3ee259c19ebec14990f4305dfd765106c62 -SIZE (gnome2/gucharmap-2.22.3.tar.bz2) = 2634874 +MD5 (gnome2/gucharmap-2.24.2.tar.bz2) = 8e1c82736e122fe509e98a9b3059e2d6 +SHA256 (gnome2/gucharmap-2.24.2.tar.bz2) = 1774b37cf529c5320e93de5e327fd7c716d84a99b959fa1ef2e8dcf72c5ee23c +SIZE (gnome2/gucharmap-2.24.2.tar.bz2) = 2922955 diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist index 7bf41a2c8449..80d040647b5c 100644 --- a/deskutils/gucharmap/pkg-plist +++ b/deskutils/gucharmap/pkg-plist @@ -1,27 +1,22 @@ bin/charmap bin/gnome-character-map bin/gucharmap -include/gucharmap/gucharmap-block-chapters-model.h -include/gucharmap/gucharmap-block-chapters.h -include/gucharmap/gucharmap-chapters-model.h -include/gucharmap/gucharmap-chapters-view.h -include/gucharmap/gucharmap-chapters.h -include/gucharmap/gucharmap-charmap.h -include/gucharmap/gucharmap-codepoint-list.h -include/gucharmap/gucharmap-mini-fontsel.h -include/gucharmap/gucharmap-script-chapters-model.h -include/gucharmap/gucharmap-script-chapters.h -include/gucharmap/gucharmap-script-codepoint-list.h -include/gucharmap/gucharmap-search-dialog.h -include/gucharmap/gucharmap-settings.h -include/gucharmap/gucharmap-table.h -include/gucharmap/gucharmap-unicode-info.h -include/gucharmap/gucharmap-window.h -include/gucharmap/gucharmap.h +include/gucharmap-2/gucharmap/gucharmap-block-chapters-model.h +include/gucharmap-2/gucharmap/gucharmap-block-codepoint-list.h +include/gucharmap-2/gucharmap/gucharmap-chapters-model.h +include/gucharmap-2/gucharmap/gucharmap-chapters-view.h +include/gucharmap-2/gucharmap/gucharmap-charmap.h +include/gucharmap-2/gucharmap/gucharmap-chartable.h +include/gucharmap-2/gucharmap/gucharmap-codepoint-list.h +include/gucharmap-2/gucharmap/gucharmap-script-chapters-model.h +include/gucharmap-2/gucharmap/gucharmap-script-codepoint-list.h +include/gucharmap-2/gucharmap/gucharmap-type-builtins.h +include/gucharmap-2/gucharmap/gucharmap-unicode-info.h +include/gucharmap-2/gucharmap/gucharmap.h lib/libgucharmap.la lib/libgucharmap.so -lib/libgucharmap.so.6 -libdata/pkgconfig/gucharmap.pc +lib/libgucharmap.so.7 +libdata/pkgconfig/gucharmap-2.pc share/applications/gucharmap.desktop share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png share/gnome/help/gucharmap/C/figures/gucharmap_window.png @@ -30,6 +25,9 @@ share/gnome/help/gucharmap/C/legal.xml share/gnome/help/gucharmap/bg/figures/gucharmap_start_window.png share/gnome/help/gucharmap/bg/figures/gucharmap_window.png share/gnome/help/gucharmap/bg/gucharmap.xml +share/gnome/help/gucharmap/ca/figures/gucharmap_start_window.png +share/gnome/help/gucharmap/ca/figures/gucharmap_window.png +share/gnome/help/gucharmap/ca/gucharmap.xml share/gnome/help/gucharmap/de/figures/gucharmap_start_window.png share/gnome/help/gucharmap/de/figures/gucharmap_window.png share/gnome/help/gucharmap/de/gucharmap.xml @@ -66,13 +64,16 @@ share/gnome/help/gucharmap/ru/gucharmap.xml share/gnome/help/gucharmap/sv/figures/gucharmap_start_window.png share/gnome/help/gucharmap/sv/figures/gucharmap_window.png share/gnome/help/gucharmap/sv/gucharmap.xml +share/gnome/help/gucharmap/vi/figures/gucharmap_start_window.png +share/gnome/help/gucharmap/vi/figures/gucharmap_window.png +share/gnome/help/gucharmap/vi/gucharmap.xml share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png share/gnome/help/gucharmap/zh_CN/gucharmap.xml share/gnome/help/gucharmap/zh_CN/legal.xml share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png share/gnome/help/gucharmap/zh_TW/gucharmap.xml share/gnome/help/gucharmap/zh_TW/legal.xml -share/icons/hicolor/48x48/apps/gucharmap.png +share/locale/af/LC_MESSAGES/gucharmap.mo share/locale/am/LC_MESSAGES/gucharmap.mo share/locale/ar/LC_MESSAGES/gucharmap.mo share/locale/az/LC_MESSAGES/gucharmap.mo @@ -137,9 +138,10 @@ share/locale/sk/LC_MESSAGES/gucharmap.mo share/locale/sl/LC_MESSAGES/gucharmap.mo share/locale/sq/LC_MESSAGES/gucharmap.mo share/locale/sr/LC_MESSAGES/gucharmap.mo -share/locale/sr@Latn/LC_MESSAGES/gucharmap.mo +share/locale/sr@latin/LC_MESSAGES/gucharmap.mo share/locale/sv/LC_MESSAGES/gucharmap.mo share/locale/ta/LC_MESSAGES/gucharmap.mo +share/locale/te/LC_MESSAGES/gucharmap.mo share/locale/th/LC_MESSAGES/gucharmap.mo share/locale/tr/LC_MESSAGES/gucharmap.mo share/locale/uk/LC_MESSAGES/gucharmap.mo @@ -151,6 +153,7 @@ share/locale/zh_HK/LC_MESSAGES/gucharmap.mo share/locale/zh_TW/LC_MESSAGES/gucharmap.mo share/omf/gucharmap/gucharmap-C.omf share/omf/gucharmap/gucharmap-bg.omf +share/omf/gucharmap/gucharmap-ca.omf share/omf/gucharmap/gucharmap-de.omf share/omf/gucharmap/gucharmap-en_GB.omf share/omf/gucharmap/gucharmap-es.omf @@ -163,6 +166,7 @@ share/omf/gucharmap/gucharmap-oc.omf share/omf/gucharmap/gucharmap-pt_BR.omf share/omf/gucharmap/gucharmap-ru.omf share/omf/gucharmap/gucharmap-sv.omf +share/omf/gucharmap/gucharmap-vi.omf share/omf/gucharmap/gucharmap-zh_CN.omf share/omf/gucharmap/gucharmap-zh_TW.omf @dirrm share/omf/gucharmap @@ -170,6 +174,8 @@ share/omf/gucharmap/gucharmap-zh_TW.omf @dirrm share/gnome/help/gucharmap/zh_TW @dirrm share/gnome/help/gucharmap/zh_CN/figures @dirrm share/gnome/help/gucharmap/zh_CN +@dirrm share/gnome/help/gucharmap/vi/figures +@dirrm share/gnome/help/gucharmap/vi @dirrm share/gnome/help/gucharmap/sv/figures @dirrm share/gnome/help/gucharmap/sv @dirrm share/gnome/help/gucharmap/ru/figures @@ -194,17 +200,24 @@ share/omf/gucharmap/gucharmap-zh_TW.omf @dirrm share/gnome/help/gucharmap/en_GB @dirrm share/gnome/help/gucharmap/de/figures @dirrm share/gnome/help/gucharmap/de +@dirrm share/gnome/help/gucharmap/ca/figures +@dirrm share/gnome/help/gucharmap/ca @dirrm share/gnome/help/gucharmap/bg/figures @dirrm share/gnome/help/gucharmap/bg @dirrm share/gnome/help/gucharmap/C/figures @dirrm share/gnome/help/gucharmap/C @dirrm share/gnome/help/gucharmap @dirrmtry share/applications -@dirrm include/gucharmap +@dirrm include/gucharmap-2/gucharmap +@dirrm include/gucharmap-2 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile new file mode 100644 index 000000000000..f6cc0cb2507e --- /dev/null +++ b/deskutils/hamster-applet/Makefile @@ -0,0 +1,36 @@ +# New ports collection makefile for: hamster-applet +# Date created: 06 August 2008 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/deskutils/hamster-applet/Makefile,v 1.13 2008/11/25 16:12:27 marcus Exp $ +# + +PORTNAME= hamster-applet +PORTVERSION= 2.24.2 +CATEGORIES= deskutils gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Time management applet for the GNOME Desktop + +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 + +USE_BZIP2= yes +USE_GETTEXT= yes +USE_GMAKE= yes +USE_PYTHON= yes +USE_XORG= xscrnsaver +USE_GNOME= gnomeprefix intlhack gnomehack pygnomedesktop \ + gnomecontrolcenter2 +GNU_CONFIGURE= yes +INSTALLS_OMF= yes +INSTALLS_ICONS= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= hamster-applet.schemas + +.include <bsd.port.mk> diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo new file mode 100644 index 000000000000..9262390d22a8 --- /dev/null +++ b/deskutils/hamster-applet/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/hamster-applet-2.24.2.tar.bz2) = b754f3953c6aa1ef48838de812600da8 +SHA256 (gnome2/hamster-applet-2.24.2.tar.bz2) = 2bd0f14b5421193106fd8d3ba21c7a5880bda348e1ea4bf589e6c51acfdb4f6d +SIZE (gnome2/hamster-applet-2.24.2.tar.bz2) = 401252 diff --git a/deskutils/hamster-applet/files/patch-hamster___init__.py b/deskutils/hamster-applet/files/patch-hamster___init__.py new file mode 100644 index 000000000000..a277063e0211 --- /dev/null +++ b/deskutils/hamster-applet/files/patch-hamster___init__.py @@ -0,0 +1,10 @@ +--- hamster/__init__.py.orig 2008-08-07 10:53:47.000000000 -0400 ++++ hamster/__init__.py 2008-08-07 10:54:01.000000000 -0400 +@@ -74,6 +74,7 @@ if not exists(USER_HAMSTER_DIR): + if not exists(HAMSTER_DB): + print "Database not found in %s - installing default from %s!" % (HAMSTER_DB, SHARED_DATA_DIR) + copyfile(join(SHARED_DATA_DIR, DB_FILE), HAMSTER_DB) ++ os.chmod(HAMSTER_DB, 0644) + + # Init storage + diff --git a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py new file mode 100644 index 000000000000..e61e0f77b1d7 --- /dev/null +++ b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py @@ -0,0 +1,17 @@ +--- hamster/hamster-applet.py.orig 2008-08-07 10:22:46.000000000 -0400 ++++ hamster/hamster-applet.py 2008-08-07 10:23:13.000000000 -0400 +@@ -51,10 +51,10 @@ if hasattr(gettext, 'bind_textdomain_cod + gettext.bind_textdomain_codeset('hamster-applet','UTF-8') + gettext.textdomain('hamster-applet') + +-locale.bindtextdomain('hamster-applet', abspath(join(hamster.defs.DATA_DIR, "locale"))) +-if hasattr(locale, 'bind_textdomain_codeset'): +- locale.bind_textdomain_codeset('hamster-applet','UTF-8') +-locale.textdomain('hamster-applet') ++#locale.bindtextdomain('hamster-applet', abspath(join(hamster.defs.DATA_DIR, "locale"))) ++#if hasattr(locale, 'bind_textdomain_codeset'): ++# locale.bind_textdomain_codeset('hamster-applet','UTF-8') ++#locale.textdomain('hamster-applet') + + hamster.__init_db() + import hamster.applet diff --git a/deskutils/hamster-applet/pkg-descr b/deskutils/hamster-applet/pkg-descr new file mode 100644 index 000000000000..9e3edc3cbf72 --- /dev/null +++ b/deskutils/hamster-applet/pkg-descr @@ -0,0 +1,3 @@ +Hamster Applet allows you to keep track on where are you spending your time. + +WWW: http://projecthamster.wordpress.com/ diff --git a/deskutils/hamster-applet/pkg-plist b/deskutils/hamster-applet/pkg-plist new file mode 100644 index 000000000000..251bc010fd75 --- /dev/null +++ b/deskutils/hamster-applet/pkg-plist @@ -0,0 +1,133 @@ +lib/hamster-applet/hamster-applet +%%PYTHON_SITELIBDIR%%/hamster/Configuration.py +%%PYTHON_SITELIBDIR%%/hamster/Configuration.pyc +%%PYTHON_SITELIBDIR%%/hamster/Configuration.pyo +%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.py +%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyc +%%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyo +%%PYTHON_SITELIBDIR%%/hamster/__init__.py +%%PYTHON_SITELIBDIR%%/hamster/__init__.pyc +%%PYTHON_SITELIBDIR%%/hamster/__init__.pyo +%%PYTHON_SITELIBDIR%%/hamster/about.py +%%PYTHON_SITELIBDIR%%/hamster/about.pyc +%%PYTHON_SITELIBDIR%%/hamster/about.pyo +%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.py +%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.pyc +%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.pyo +%%PYTHON_SITELIBDIR%%/hamster/applet.py +%%PYTHON_SITELIBDIR%%/hamster/applet.pyc +%%PYTHON_SITELIBDIR%%/hamster/applet.pyo +%%PYTHON_SITELIBDIR%%/hamster/charting.py +%%PYTHON_SITELIBDIR%%/hamster/charting.pyc +%%PYTHON_SITELIBDIR%%/hamster/charting.pyo +%%PYTHON_SITELIBDIR%%/hamster/db.py +%%PYTHON_SITELIBDIR%%/hamster/db.pyc +%%PYTHON_SITELIBDIR%%/hamster/db.pyo +%%PYTHON_SITELIBDIR%%/hamster/defs.py +%%PYTHON_SITELIBDIR%%/hamster/defs.pyc +%%PYTHON_SITELIBDIR%%/hamster/defs.pyo +%%PYTHON_SITELIBDIR%%/hamster/dispatcher.py +%%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyc +%%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyo +%%PYTHON_SITELIBDIR%%/hamster/eds.py +%%PYTHON_SITELIBDIR%%/hamster/eds.pyc +%%PYTHON_SITELIBDIR%%/hamster/eds.pyo +%%PYTHON_SITELIBDIR%%/hamster/idle.py +%%PYTHON_SITELIBDIR%%/hamster/idle.pyc +%%PYTHON_SITELIBDIR%%/hamster/idle.pyo +%%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.py +%%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.pyc +%%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.pyo +%%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.la +%%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.so +%%PYTHON_SITELIBDIR%%/hamster/preferences.py +%%PYTHON_SITELIBDIR%%/hamster/preferences.pyc +%%PYTHON_SITELIBDIR%%/hamster/preferences.pyo +%%PYTHON_SITELIBDIR%%/hamster/reports.py +%%PYTHON_SITELIBDIR%%/hamster/reports.pyc +%%PYTHON_SITELIBDIR%%/hamster/reports.pyo +%%PYTHON_SITELIBDIR%%/hamster/stats.py +%%PYTHON_SITELIBDIR%%/hamster/stats.pyc +%%PYTHON_SITELIBDIR%%/hamster/stats.pyo +%%PYTHON_SITELIBDIR%%/hamster/storage.py +%%PYTHON_SITELIBDIR%%/hamster/storage.pyc +%%PYTHON_SITELIBDIR%%/hamster/storage.pyo +%%PYTHON_SITELIBDIR%%/hamster/stuff.py +%%PYTHON_SITELIBDIR%%/hamster/stuff.pyc +%%PYTHON_SITELIBDIR%%/hamster/stuff.pyo +libdata/bonobo/servers/Hamster_Applet.server +share/gnome-control-center/keybindings/99-hamster-applet.xml +%%DATADIR%%/Hamster_Applet.xml +%%DATADIR%%/add_custom_fact.glade +%%DATADIR%%/art/hamster-applet.png +%%DATADIR%%/art/stock_calendar-view-day.png +%%DATADIR%%/art/stock_calendar-view-month.png +%%DATADIR%%/art/stock_calendar-view-week.png +%%DATADIR%%/hamster.db +%%DATADIR%%/menu.glade +%%DATADIR%%/preferences.glade +%%DATADIR%%/stats.glade +share/icons/hicolor/16x16/apps/hamster-applet.png +share/icons/hicolor/22x22/apps/hamster-applet.png +share/icons/hicolor/32x32/apps/hamster-applet.png +share/icons/hicolor/48x48/apps/hamster-applet.png +share/icons/hicolor/scalable/apps/hamster-applet.svg +share/locale/ar/LC_MESSAGES/hamster-applet.mo +share/locale/bg/LC_MESSAGES/hamster-applet.mo +share/locale/bn_IN/LC_MESSAGES/hamster-applet.mo +share/locale/ca/LC_MESSAGES/hamster-applet.mo +share/locale/cs/LC_MESSAGES/hamster-applet.mo +share/locale/da/LC_MESSAGES/hamster-applet.mo +share/locale/de/LC_MESSAGES/hamster-applet.mo +share/locale/el/LC_MESSAGES/hamster-applet.mo +share/locale/en_GB/LC_MESSAGES/hamster-applet.mo +share/locale/es/LC_MESSAGES/hamster-applet.mo +share/locale/et/LC_MESSAGES/hamster-applet.mo +share/locale/eu/LC_MESSAGES/hamster-applet.mo +share/locale/fi/LC_MESSAGES/hamster-applet.mo +share/locale/fr/LC_MESSAGES/hamster-applet.mo +share/locale/gl/LC_MESSAGES/hamster-applet.mo +share/locale/gu/LC_MESSAGES/hamster-applet.mo +share/locale/he/LC_MESSAGES/hamster-applet.mo +share/locale/hi/LC_MESSAGES/hamster-applet.mo +share/locale/hu/LC_MESSAGES/hamster-applet.mo +share/locale/it/LC_MESSAGES/hamster-applet.mo +share/locale/ja/LC_MESSAGES/hamster-applet.mo +share/locale/kn/LC_MESSAGES/hamster-applet.mo +share/locale/ko/LC_MESSAGES/hamster-applet.mo +share/locale/lt/LC_MESSAGES/hamster-applet.mo +share/locale/lv/LC_MESSAGES/hamster-applet.mo +share/locale/mk/LC_MESSAGES/hamster-applet.mo +share/locale/ml/LC_MESSAGES/hamster-applet.mo +share/locale/mr/LC_MESSAGES/hamster-applet.mo +share/locale/nb/LC_MESSAGES/hamster-applet.mo +share/locale/nl/LC_MESSAGES/hamster-applet.mo +share/locale/pa/LC_MESSAGES/hamster-applet.mo +share/locale/pl/LC_MESSAGES/hamster-applet.mo +share/locale/pt/LC_MESSAGES/hamster-applet.mo +share/locale/pt_BR/LC_MESSAGES/hamster-applet.mo +share/locale/ru/LC_MESSAGES/hamster-applet.mo +share/locale/sl/LC_MESSAGES/hamster-applet.mo +share/locale/sq/LC_MESSAGES/hamster-applet.mo +share/locale/sr/LC_MESSAGES/hamster-applet.mo +share/locale/sr@latin/LC_MESSAGES/hamster-applet.mo +share/locale/sv/LC_MESSAGES/hamster-applet.mo +share/locale/ta/LC_MESSAGES/hamster-applet.mo +share/locale/th/LC_MESSAGES/hamster-applet.mo +share/locale/tr/LC_MESSAGES/hamster-applet.mo +share/locale/zh_CN/LC_MESSAGES/hamster-applet.mo +share/locale/zh_HK/LC_MESSAGES/hamster-applet.mo +share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo +@dirrm %%DATADIR%%/art +@dirrm %%DATADIR%% +@dirrm %%PYTHON_SITELIBDIR%%/hamster/keybinder +@dirrm %%PYTHON_SITELIBDIR%%/hamster +@dirrm lib/hamster-applet +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index 4d151bc58dde..f50b5d230fa4 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -3,11 +3,11 @@ # Whom: Andreas Kohn <andreas@syndrom23.de> # # $FreeBSD$ +# $MCom: ports/deskutils/notification-daemon/Makefile,v 1.4 2008/11/30 19:43:36 marcus Exp $ # PORTNAME= notification-daemon -PORTVERSION= 0.3.7 -PORTREVISION= 3 +PORTVERSION= 0.4.0 CATEGORIES= deskutils gnome MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/ @@ -17,10 +17,13 @@ COMMENT= Send small notifications to your desktop LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sexy:${PORTSDIR}/x11-toolkits/libsexy -USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gconf2 libwnck +USE_GNOME= gnomehack gnomeprefix gnometarget intlhack gconf2 libwnck \ + libglade2 USE_GMAKE= yes USE_GETTEXT= yes USE_XORG= x11 xt sm ice xext +USE_GSTREAMER= good +INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-dbus-services=${PREFIX}/share/dbus-1/services CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/notification-daemon/distinfo b/deskutils/notification-daemon/distinfo index 3e07022aeaa3..f0f4ede63712 100644 --- a/deskutils/notification-daemon/distinfo +++ b/deskutils/notification-daemon/distinfo @@ -1,3 +1,3 @@ -MD5 (notification-daemon-0.3.7.tar.gz) = 7fa369bff1031acbe4ca41f03bee7d02 -SHA256 (notification-daemon-0.3.7.tar.gz) = 53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540 -SIZE (notification-daemon-0.3.7.tar.gz) = 412184 +MD5 (notification-daemon-0.4.0.tar.gz) = 281624263e3fc82c888dd7433a37194b +SHA256 (notification-daemon-0.4.0.tar.gz) = 0c0c90ec7f2fc7fc5cbefba2e04df6ae311abc7ace23dd34f21dc063e119d808 +SIZE (notification-daemon-0.4.0.tar.gz) = 404178 diff --git a/deskutils/notification-daemon/pkg-plist b/deskutils/notification-daemon/pkg-plist index 72ecf2f92b39..b4160c5ec039 100644 --- a/deskutils/notification-daemon/pkg-plist +++ b/deskutils/notification-daemon/pkg-plist @@ -1,10 +1,24 @@ +bin/notification-properties lib/notification-daemon-1.0/engines/libstandard.a lib/notification-daemon-1.0/engines/libstandard.la lib/notification-daemon-1.0/engines/libstandard.so libexec/notification-daemon +share/applications/notification-properties.desktop share/dbus-1/services/org.freedesktop.Notifications.service +share/icons/hicolor/16x16/apps/notification-properties.png +share/icons/hicolor/22x22/apps/notification-properties.png +share/icons/hicolor/24x24/apps/notification-properties.png +share/icons/hicolor/32x32/apps/notification-properties.png +share/icons/hicolor/48x48/apps/notification-properties.png +share/icons/hicolor/scalable/apps/notification-properties.svg +share/locale/ar/LC_MESSAGES/notification-daemon.mo share/locale/de/LC_MESSAGES/notification-daemon.mo +share/locale/it/LC_MESSAGES/notification-daemon.mo share/locale/nl/LC_MESSAGES/notification-daemon.mo +share/locale/pl/LC_MESSAGES/notification-daemon.mo share/locale/sv/LC_MESSAGES/notification-daemon.mo +share/notification-daemon/notification-properties.glade +@dirrm share/notification-daemon @dirrm lib/notification-daemon-1.0/engines @dirrm lib/notification-daemon-1.0 +@dirrmtry share/applications diff --git a/devel/Makefile b/devel/Makefile index 8f16541a5020..1d68a05890ad 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -447,6 +447,7 @@ SUBDIR += gob2 SUBDIR += goffice SUBDIR += goffice04 + SUBDIR += goffice06 SUBDIR += goffice1 SUBDIR += gonzui SUBDIR += google-perftools diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index d16450f8db45..bc12266f36ca 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -3,15 +3,14 @@ # Whom: Chia-liang Kao <clkao@CirX.ORG> # # $FreeBSD$ -# $MCom: ports/devel/ORBit2/Makefile,v 1.50 2006/04/13 07:52:31 bland Exp $ +# $MCom: ports/devel/ORBit2/Makefile,v 1.53 2008/09/21 06:32:52 kwm Exp $ # PORTNAME= ORBit2 -PORTVERSION= 2.14.14 +PORTVERSION= 2.14.16 PORTREVISION?= 0 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -25,8 +24,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack libidl ltverhack referencehack -CONFIGURE_ARGS= --disable-indent \ - --with-html-dir=${PREFIX}/share/doc \ +CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 7799542881d1..6785eb3255a5 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/ORBit2-2.14.14.tar.bz2) = f288e9a4354fce14cf6bb35140ac5d9b -SHA256 (gnome2/ORBit2-2.14.14.tar.bz2) = 3b224f78dcebf8f91a832a40021b78cd32267453155b17a134df7ce3f6784ab1 -SIZE (gnome2/ORBit2-2.14.14.tar.bz2) = 739599 +MD5 (gnome2/ORBit2-2.14.16.tar.bz2) = f4898b999f39c79d55c13c0e0f597c71 +SHA256 (gnome2/ORBit2-2.14.16.tar.bz2) = e7bc69a316e6e2a263987a0aec5c6249dc152361e9559b4818a680681409aac1 +SIZE (gnome2/ORBit2-2.14.16.tar.bz2) = 739458 diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index 8dc8e3ed4495..b058243de6e6 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -3,12 +3,12 @@ # Whom: Dmitry Sivachenko <demon@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/anjuta/Makefile,v 1.22 2008/03/11 03:52:48 marcus Exp $ +# $MCom: ports/devel/anjuta/Makefile,v 1.32 2008/11/27 02:17:34 marcus Exp $ # PORTNAME= anjuta -PORTVERSION= 2.4.2 -PORTREVISION= 2 +PORTVERSION= 2.24.2 +PORTREVISION= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +20,7 @@ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ bash:${PORTSDIR}/shells/bash \ neato:${PORTSDIR}/graphics/graphviz LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - gbf-1.1:${PORTSDIR}/devel/gnome-build \ + gbf-1.2:${PORTSDIR}/devel/gnome-build \ gladeui-1.7:${PORTSDIR}/devel/glade3 \ neon.28:${PORTSDIR}/www/neon28 \ devhelp-1.0:${PORTSDIR}/devel/devhelp @@ -36,17 +36,14 @@ USE_GMAKE= yes USE_GETTEXT= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack libgnomeprintui libgnomeui vte \ - gtksourceview2 +USE_GNOME= gnomeprefix gnomehack libgnomeui vte gtksourceview2 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --enable-plugin-symbol-db USE_LDCONFIG= yes -PKGMESSAGE= ${WRKDIR}/pkg-message GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ anjuta-cvs-plugin.schemas anjuta-document-manager.schemas \ - anjuta-editor-scintilla.schemas anjuta-language-cpp-java.schemas \ + anjuta-language-cpp-java.schemas \ anjuta-message-manager-plugin.schemas \ anjuta-editor-sourceview.schemas \ anjuta-symbol-browser-plugin.schemas \ @@ -54,7 +51,9 @@ GCONF_SCHEMAS= anjuta-build-basic-autotools-plugin.schemas \ MAN1= anjuta.1 anjuta_launcher.1 -OPTIONS= SVN "Build subversion plugins" off +OPTIONS= SVN "Build subversion plugin" off \ + SYMBOL "Build experimental symbol-db plugin" off \ + SCINTILLA "Build scintilla plugin" off .include <bsd.port.pre.mk> @@ -74,14 +73,34 @@ CONFIGURE_ARGS+=--disable-plugin-subversion PLIST_SUB+= SVN="@comment " .endif +.if defined(WITH_SCINTILLA) +USE_GNOME+= libgnomeprintui +CONFIGURE_ARGS+=--enable-plugin-scintilla +GCONF_SCHEMAS+= anjuta-editor-scintilla.schemas +PLIST_SUB+= SCINTILLA="" +.else +#CONFIGURE_ARGS+=--disable-plugin-scintilla +PLIST_SUB+= SCINTILLA="@comment " +.endif + +.if defined(WITH_SYMBOL) +USE_GNOME+= libgda4 +CONFIGURE_ARGS+=--enable-plugin-symbol-db +GCONF_SCHEMAS+= anjuta-symbol-db.schemas +PLIST_SUB+= SYMBOL="" +.else +CONFIGURE_ARGS+=--disable-plugin-symbol-db +PLIST_SUB+= SYMBOL="@comment " +.endif + post-configure: @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash| ; \ s|/usr/local|${PREFIX}|' \ ${WRKSRC}/global-tags/create_global_tags.sh.in @${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|make|gmake|g' \ - ${WRKSRC}/plugins/build-basic-autotools/build-basic-autotools.c + @${REINPLACE_CMD} -e 's|"make|"gmake|g' \ + ${WRKSRC}/plugins/build-basic-autotools/plugin.c post-install: .if !defined(NOPORTDOCS) diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index 6e77ef47153b..aa83de8919c7 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/anjuta-2.4.2.tar.bz2) = 66dc5a9aeb051846f82715b1bed55e37 -SHA256 (gnome2/anjuta-2.4.2.tar.bz2) = 217e49d8f1d8ac06607166bb7c6b3797e692e5a387f973efb40260ab362693c9 -SIZE (gnome2/anjuta-2.4.2.tar.bz2) = 6369144 +MD5 (gnome2/anjuta-2.24.2.tar.bz2) = d1db75bc1c8d4ab4c9d180767e24e39a +SHA256 (gnome2/anjuta-2.24.2.tar.bz2) = 7b60753b98a12c5ae85b7fee126d280385ac67dd94a855ab50c17de862df6c68 +SIZE (gnome2/anjuta-2.24.2.tar.bz2) = 6713913 diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in index 1451a0d3ba41..132cd27555dd 100644 --- a/devel/anjuta/files/patch-Makefile.in +++ b/devel/anjuta/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2008-04-07 18:57:45.000000000 -0400 -+++ Makefile.in 2008-04-07 18:58:11.000000000 -0400 -@@ -522,14 +522,14 @@ uninstall-anjuta_dataDATA: +--- Makefile.in.orig 2008-09-22 14:17:35.000000000 -0400 ++++ Makefile.in 2008-09-22 14:20:32.000000000 -0400 +@@ -505,14 +505,14 @@ uninstall-anjuta_dataDATA: rm -f "$(DESTDIR)$(anjuta_datadir)/$$f"; \ done install-anjutadocDATA: $(anjutadoc_DATA) - @$(NORMAL_INSTALL) -- test -z "$(anjutadocdir)" || $(mkdir_p) "$(DESTDIR)$(anjutadocdir)" +- test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" - @list='$(anjutadoc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ @@ -13,7 +13,7 @@ - $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \ - done +# @$(NORMAL_INSTALL) -+# test -z "$(anjutadocdir)" || $(mkdir_p) "$(DESTDIR)$(anjutadocdir)" ++# test -z "$(anjutadocdir)" || $(MKDIR_P) "$(DESTDIR)$(anjutadocdir)" +# @list='$(anjutadoc_DATA)'; for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +# f=$(am__strip_dir) \ diff --git a/devel/anjuta/files/patch-doc::Makefile.in b/devel/anjuta/files/patch-doc::Makefile.in index aac2a1bf2cae..a567fda3389c 100644 --- a/devel/anjuta/files/patch-doc::Makefile.in +++ b/devel/anjuta/files/patch-doc::Makefile.in @@ -1,25 +1,11 @@ ---- doc/Makefile.in.orig 2008-04-07 18:58:53.000000000 -0400 -+++ doc/Makefile.in 2008-04-07 18:59:30.000000000 -0400 -@@ -472,14 +472,14 @@ uninstall-man1: - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done - install-anjuta_docDATA: $(anjuta_doc_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(anjuta_docdir)" || $(mkdir_p) "$(DESTDIR)$(anjuta_docdir)" -- @list='$(anjuta_doc_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(anjuta_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjuta_docdir)/$$f'"; \ -- $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \ -- done -+# @$(NORMAL_INSTALL) -+# test -z "$(anjuta_docdir)" || $(mkdir_p) "$(DESTDIR)$(anjuta_docdir)" -+# @list='$(anjuta_doc_DATA)'; for p in $$list; do \ -+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+# f=$(am__strip_dir) \ -+# echo " $(anjuta_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjuta_docdir)/$$f'"; \ -+# $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \ -+# done +--- doc/Makefile.in.orig 2008-08-06 17:40:26.000000000 +0200 ++++ doc/Makefile.in 2008-08-06 17:41:04.000000000 +0200 +@@ -540,7 +540,7 @@ + + info-am: + +-install-data-am: install-anjuta_docDATA install-man ++install-data-am: install-man + + install-dvi: install-dvi-am - uninstall-anjuta_docDATA: - @$(NORMAL_UNINSTALL) diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c index 1c7679ab2b95..0235ff1e8d24 100644 --- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c +++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c @@ -1,15 +1,6 @@ ---- libanjuta/anjuta-launcher.c.orig 2008-02-15 18:32:29.000000000 -0500 -+++ libanjuta/anjuta-launcher.c 2008-02-25 22:45:03.000000000 -0500 -@@ -37,7 +37,7 @@ - #include <signal.h> - - #if !defined(__sun) && !defined(__NetBSD__) --# ifndef FREEBSD -+# if !defined(__FreeBSD__) - # include <pty.h> - # else - # include <libutil.h> -@@ -749,7 +749,8 @@ anjuta_launcher_scan_output (GIOChannel +--- libanjuta/anjuta-launcher.c.orig 2008-05-29 22:37:02.000000000 +0200 ++++ libanjuta/anjuta-launcher.c 2008-06-05 16:12:17.000000000 +0200 +@@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel GError *err = NULL; do { @@ -18,8 +9,8 @@ + status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); if (n > 0) /* There is output */ { - gchar *utf8_chars; -@@ -776,6 +777,13 @@ anjuta_launcher_scan_output (GIOChannel + gchar *utf8_chars = NULL; +@@ -789,6 +790,13 @@ anjuta_launcher_scan_output (GIOChannel anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -33,7 +24,7 @@ /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -805,7 +813,8 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -818,7 +826,8 @@ anjuta_launcher_scan_error (GIOChannel * GError *err = NULL; do { @@ -43,7 +34,7 @@ if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -833,6 +842,13 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -844,6 +853,13 @@ anjuta_launcher_scan_error (GIOChannel * anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -57,7 +48,7 @@ /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -862,7 +878,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch +@@ -873,7 +889,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch GError *err = NULL; do { @@ -67,8 +58,8 @@ if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -893,6 +910,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch - g_warning ("pty: %s", err->message); +@@ -902,6 +919,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch + { ret = FALSE; } + else if (status == G_IO_STATUS_EOF) diff --git a/devel/anjuta/files/patch-scripts::anjuta_import.sh.in b/devel/anjuta/files/patch-scripts::anjuta_import.sh.in deleted file mode 100644 index 94b1413d60db..000000000000 --- a/devel/anjuta/files/patch-scripts::anjuta_import.sh.in +++ /dev/null @@ -1,8 +0,0 @@ ---- scripts/anjuta_import.sh.in.orig Wed May 14 16:09:42 2003 -+++ scripts/anjuta_import.sh.in Wed May 14 16:11:15 2003 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # Shell script to automatically create an Anjuta 1.x project file - # Copyright: Biswapesh Chattopadhyay (biswapesh_chatterjee@tcscal.co.in) 2001-2002 diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist index d27734a81085..7aef13fece46 100644 --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -3,12 +3,14 @@ bin/anjuta_import.sh bin/anjuta_launcher include/libanjuta-1.0/libanjuta/anjuta-async-command.h include/libanjuta-1.0/libanjuta/anjuta-command.h +include/libanjuta-1.0/libanjuta/anjuta-convert.h include/libanjuta-1.0/libanjuta/anjuta-debug.h include/libanjuta-1.0/libanjuta/anjuta-encodings.h include/libanjuta-1.0/libanjuta/anjuta-enum-types.h include/libanjuta-1.0/libanjuta/anjuta-error.h include/libanjuta-1.0/libanjuta/anjuta-launcher.h include/libanjuta-1.0/libanjuta/anjuta-marshal.h +include/libanjuta-1.0/libanjuta/anjuta-message-area.h include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h @@ -22,11 +24,14 @@ include/libanjuta-1.0/libanjuta/anjuta-serializer.h include/libanjuta-1.0/libanjuta/anjuta-session.h include/libanjuta-1.0/libanjuta/anjuta-shell.h include/libanjuta-1.0/libanjuta/anjuta-status.h +include/libanjuta-1.0/libanjuta/anjuta-sync-command.h include/libanjuta-1.0/libanjuta/anjuta-ui.h include/libanjuta-1.0/libanjuta/anjuta-utils.h include/libanjuta-1.0/libanjuta/anjuta-vcs-status-tree-view.h +include/libanjuta-1.0/libanjuta/anjuta-version.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-bookmark.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-buildable.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-builder.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debug-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-breakpoint.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-instruction.h @@ -52,6 +57,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-selection.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-view.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-zoom.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-environment.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-loader.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-file-savable.h @@ -92,7 +98,7 @@ lib/anjuta/anjuta-cvs.plugin lib/anjuta/anjuta-debug-manager.plugin lib/anjuta/anjuta-devhelp.plugin lib/anjuta/anjuta-document-manager.plugin -lib/anjuta/anjuta-editor.plugin +%%SCINTILLA%%lib/anjuta/anjuta-editor.plugin lib/anjuta/anjuta-file-wizard.plugin lib/anjuta/anjuta-gdb.plugin lib/anjuta/anjuta-glade.plugin @@ -105,13 +111,17 @@ lib/anjuta/anjuta-patch.plugin lib/anjuta/anjuta-project-import.plugin lib/anjuta/anjuta-project-manager.plugin lib/anjuta/anjuta-project-wizard.plugin +lib/anjuta/anjuta-run-program.plugin lib/anjuta/anjuta-sample.plugin +lib/anjuta/anjuta-scratchbox.plugin lib/anjuta/anjuta-search.plugin %%SVN%%lib/anjuta/anjuta-subversion.plugin lib/anjuta/anjuta-symbol-browser.plugin +lib/anjuta/anjuta-tags lib/anjuta/anjuta-terminal.plugin lib/anjuta/anjuta-tools.plugin lib/anjuta/file-manager.plugin +lib/anjuta/git.plugin lib/anjuta/language-manager.plugin lib/anjuta/libanjuta-build-basic-autotools.la lib/anjuta/libanjuta-build-basic-autotools.so @@ -127,12 +137,14 @@ lib/anjuta/libanjuta-devhelp.la lib/anjuta/libanjuta-devhelp.so lib/anjuta/libanjuta-document-manager.la lib/anjuta/libanjuta-document-manager.so -lib/anjuta/libanjuta-editor.la -lib/anjuta/libanjuta-editor.so +%%SCINTILLA%%lib/anjuta/libanjuta-editor.la +%%SCINTILLA%%lib/anjuta/libanjuta-editor.so lib/anjuta/libanjuta-file-wizard.la lib/anjuta/libanjuta-file-wizard.so lib/anjuta/libanjuta-gdb.la lib/anjuta/libanjuta-gdb.so +lib/anjuta/libanjuta-git.la +lib/anjuta/libanjuta-git.so lib/anjuta/libanjuta-glade.la lib/anjuta/libanjuta-glade.so lib/anjuta/libanjuta-gtodo.la @@ -155,8 +167,12 @@ lib/anjuta/libanjuta-project-manager.la lib/anjuta/libanjuta-project-manager.so lib/anjuta/libanjuta-project-wizard.la lib/anjuta/libanjuta-project-wizard.so +lib/anjuta/libanjuta-run-program.la +lib/anjuta/libanjuta-run-program.so lib/anjuta/libanjuta-sample.la lib/anjuta/libanjuta-sample.so +lib/anjuta/libanjuta-scratchbox.la +lib/anjuta/libanjuta-scratchbox.so lib/anjuta/libanjuta-search.la lib/anjuta/libanjuta-search.so lib/anjuta/libanjuta-sourceview.la @@ -165,6 +181,8 @@ lib/anjuta/libanjuta-sourceview.so %%SVN%%lib/anjuta/libanjuta-subversion.so lib/anjuta/libanjuta-symbol-browser.la lib/anjuta/libanjuta-symbol-browser.so +%%SYMBOL%%lib/anjuta/libanjuta-symbol-db.la +%%SYMBOL%%lib/anjuta/libanjuta-symbol-db.so lib/anjuta/libanjuta-terminal.la lib/anjuta/libanjuta-terminal.so lib/anjuta/libanjuta-tools.la @@ -174,17 +192,14 @@ lib/anjuta/libfile-manager.so lib/anjuta/libfile-manager.so.0 lib/anjuta/liblanguage-manager.la lib/anjuta/liblanguage-manager.so -lib/anjuta/liblanguage-manager.so.0 lib/anjuta/profiler.plugin lib/anjuta/sourceview.plugin +%%SYMBOL%%lib/anjuta/symbol-db.plugin lib/glade3/modules/libgladeanjuta.la lib/glade3/modules/libgladeanjuta.so lib/libanjuta-ctags.la lib/libanjuta-ctags.so lib/libanjuta-ctags.so.0 -lib/libanjuta-egg.la -lib/libanjuta-egg.so -lib/libanjuta-egg.so.0 lib/libanjuta.la lib/libanjuta.so lib/libanjuta.so.0 @@ -202,25 +217,27 @@ share/anjuta/glade/anjuta-class-gen-plugin.glade share/anjuta/glade/anjuta-cvs-plugin.glade share/anjuta/glade/anjuta-debug-manager.glade share/anjuta/glade/anjuta-document-manager.glade -share/anjuta/glade/anjuta-editor-scintilla.glade +%%SCINTILLA%%share/anjuta/glade/anjuta-editor-scintilla.glade share/anjuta/glade/anjuta-editor-sourceview.glade share/anjuta/glade/anjuta-file-wizard.glade share/anjuta/glade/anjuta-gdb.glade +share/anjuta/glade/anjuta-git.glade share/anjuta/glade/anjuta-language-cpp-java.glade share/anjuta/glade/anjuta-macro.glade share/anjuta/glade/anjuta-message-manager-plugin.glade -share/anjuta/glade/anjuta-project-import.glade share/anjuta/glade/anjuta-project-wizard.glade +share/anjuta/glade/anjuta-run-program.glade +share/anjuta/glade/anjuta-scratchbox.glade share/anjuta/glade/anjuta-search.glade %%SVN%%share/anjuta/glade/anjuta-subversion.glade share/anjuta/glade/anjuta-symbol-browser-plugin.glade +%%SYMBOL%%share/anjuta/glade/anjuta-symbol-db.glade share/anjuta/glade/anjuta-terminal-plugin.glade share/anjuta/glade/anjuta-tools.glade share/anjuta/glade/anjuta.glade share/anjuta/glade/applogo.png share/anjuta/glade/appwizard.png share/anjuta/glade/file-manager.glade -share/anjuta/glade/layout.glade share/anjuta/glade/patch-plugin.glade share/anjuta/glade/profiler-call-graph.glade share/anjuta/glade/profiler-flat-profile.glade @@ -245,6 +262,12 @@ share/anjuta/project/anjuta-plugin/src/plugin.glade share/anjuta/project/anjuta-plugin/src/plugin.h share/anjuta/project/anjuta-plugin/src/plugin.plugin.in share/anjuta/project/anjuta-plugin/src/plugin.ui +share/anjuta/project/anjuta-plugin-vala.wiz +share/anjuta/project/anjuta-plugin-vala/configure.ac.tpl +share/anjuta/project/anjuta-plugin-vala/po/POTFILES.in +share/anjuta/project/anjuta-plugin-vala/src/Makefile.am.tpl +share/anjuta/project/anjuta-plugin-vala/src/config.vapi +share/anjuta/project/anjuta-plugin-vala/src/plugin.vala share/anjuta/project/appwiz_sdl.png share/anjuta/project/cpp-logo.png share/anjuta/project/cpp.wiz @@ -288,6 +311,10 @@ share/anjuta/project/java/po/POTFILES.in share/anjuta/project/java/project.anjuta share/anjuta/project/java/src/Makefile.am.tpl share/anjuta/project/java/src/main.java +share/anjuta/project/licenses/BSD +share/anjuta/project/licenses/GPL +share/anjuta/project/licenses/LGPL +share/anjuta/project/licenses/None share/anjuta/project/minimal.wiz share/anjuta/project/minimal/Makefile.am.tpl share/anjuta/project/minimal/autogen.sh @@ -350,55 +377,56 @@ share/anjuta/project/xlib/configure.ac.tpl share/anjuta/project/xlib/po/POTFILES.in share/anjuta/project/xlib/src/Makefile.am.tpl share/anjuta/project/xlib/src/main.c -share/anjuta/properties/Embedded.properties -share/anjuta/properties/SciTEGlobal.properties -share/anjuta/properties/ada.properties -share/anjuta/properties/anjuta.properties -share/anjuta/properties/asm.properties -share/anjuta/properties/asn1.properties -share/anjuta/properties/au3.properties -share/anjuta/properties/ave.properties -share/anjuta/properties/baan.properties -share/anjuta/properties/bullant.properties -share/anjuta/properties/conf.properties -share/anjuta/properties/cpp.properties -share/anjuta/properties/css.properties -share/anjuta/properties/eiffel.properties -share/anjuta/properties/erlang.properties -share/anjuta/properties/escript.properties -share/anjuta/properties/forth.properties -share/anjuta/properties/fortran.properties -share/anjuta/properties/html.properties -share/anjuta/properties/kix.properties -share/anjuta/properties/latex.properties -share/anjuta/properties/lisp.properties -share/anjuta/properties/lot.properties -share/anjuta/properties/lout.properties -share/anjuta/properties/lua.properties -share/anjuta/properties/matlab.properties -share/anjuta/properties/metapost.properties -share/anjuta/properties/mmixal.properties -share/anjuta/properties/nncrontab.properties -share/anjuta/properties/nsis.properties -share/anjuta/properties/others.properties -share/anjuta/properties/pascal.properties -share/anjuta/properties/perl.properties -share/anjuta/properties/pov.properties -share/anjuta/properties/ps.properties -share/anjuta/properties/python.properties -share/anjuta/properties/ruby.properties -share/anjuta/properties/scriptol.properties -share/anjuta/properties/specman.properties -share/anjuta/properties/sql.properties -share/anjuta/properties/styles.properties -share/anjuta/properties/tcl.properties -share/anjuta/properties/tex.properties -share/anjuta/properties/user.properties -share/anjuta/properties/vb.properties -share/anjuta/properties/verilog.properties -share/anjuta/properties/vhdl.properties -share/anjuta/properties/yaml.properties +%%SCINTILLA%%share/anjuta/properties/Embedded.properties +%%SCINTILLA%%share/anjuta/properties/SciTEGlobal.properties +%%SCINTILLA%%share/anjuta/properties/ada.properties +%%SCINTILLA%%share/anjuta/properties/anjuta.properties +%%SCINTILLA%%share/anjuta/properties/asm.properties +%%SCINTILLA%%share/anjuta/properties/asn1.properties +%%SCINTILLA%%share/anjuta/properties/au3.properties +%%SCINTILLA%%share/anjuta/properties/ave.properties +%%SCINTILLA%%share/anjuta/properties/baan.properties +%%SCINTILLA%%share/anjuta/properties/bullant.properties +%%SCINTILLA%%share/anjuta/properties/conf.properties +%%SCINTILLA%%share/anjuta/properties/cpp.properties +%%SCINTILLA%%share/anjuta/properties/css.properties +%%SCINTILLA%%share/anjuta/properties/eiffel.properties +%%SCINTILLA%%share/anjuta/properties/erlang.properties +%%SCINTILLA%%share/anjuta/properties/escript.properties +%%SCINTILLA%%share/anjuta/properties/forth.properties +%%SCINTILLA%%share/anjuta/properties/fortran.properties +%%SCINTILLA%%share/anjuta/properties/html.properties +%%SCINTILLA%%share/anjuta/properties/kix.properties +%%SCINTILLA%%share/anjuta/properties/latex.properties +%%SCINTILLA%%share/anjuta/properties/lisp.properties +%%SCINTILLA%%share/anjuta/properties/lot.properties +%%SCINTILLA%%share/anjuta/properties/lout.properties +%%SCINTILLA%%share/anjuta/properties/lua.properties +%%SCINTILLA%%share/anjuta/properties/matlab.properties +%%SCINTILLA%%share/anjuta/properties/metapost.properties +%%SCINTILLA%%share/anjuta/properties/mmixal.properties +%%SCINTILLA%%share/anjuta/properties/nncrontab.properties +%%SCINTILLA%%share/anjuta/properties/nsis.properties +%%SCINTILLA%%share/anjuta/properties/others.properties +%%SCINTILLA%%share/anjuta/properties/pascal.properties +%%SCINTILLA%%share/anjuta/properties/perl.properties +%%SCINTILLA%%share/anjuta/properties/pov.properties +%%SCINTILLA%%share/anjuta/properties/ps.properties +%%SCINTILLA%%share/anjuta/properties/python.properties +%%SCINTILLA%%share/anjuta/properties/ruby.properties +%%SCINTILLA%%share/anjuta/properties/scriptol.properties +%%SCINTILLA%%share/anjuta/properties/specman.properties +%%SCINTILLA%%share/anjuta/properties/sql.properties +%%SCINTILLA%%share/anjuta/properties/styles.properties +%%SCINTILLA%%share/anjuta/properties/tcl.properties +%%SCINTILLA%%share/anjuta/properties/tex.properties +%%SCINTILLA%%share/anjuta/properties/user.properties +%%SCINTILLA%%share/anjuta/properties/vb.properties +%%SCINTILLA%%share/anjuta/properties/verilog.properties +%%SCINTILLA%%share/anjuta/properties/vhdl.properties +%%SCINTILLA%%share/anjuta/properties/yaml.properties share/anjuta/scripts/create_global_tags.sh +%%SYMBOL%%share/anjuta/tables.sql share/anjuta/tools/find-fixmes.pl share/anjuta/tools/prepare-changelog.pl share/anjuta/tools/tools-2.xml @@ -409,6 +437,7 @@ share/anjuta/ui/anjuta-debug-manager.ui share/anjuta/ui/anjuta-devhelp-simple.ui share/anjuta/ui/anjuta-devhelp.ui share/anjuta/ui/anjuta-document-manager.ui +share/anjuta/ui/anjuta-git.ui share/anjuta/ui/anjuta-glade.ui share/anjuta/ui/anjuta-gtodo.ui share/anjuta/ui/anjuta-language-support-cpp-java.ui @@ -417,10 +446,12 @@ share/anjuta/ui/anjuta-macro.ui share/anjuta/ui/anjuta-message-manager.ui share/anjuta/ui/anjuta-patch.ui share/anjuta/ui/anjuta-project-manager.ui +share/anjuta/ui/anjuta-run-program.ui share/anjuta/ui/anjuta-sample.ui share/anjuta/ui/anjuta-search.ui %%SVN%%share/anjuta/ui/anjuta-subversion.ui share/anjuta/ui/anjuta-symbol-browser-plugin.ui +share/anjuta/ui/anjuta-terminal-plugin.ui share/anjuta/ui/anjuta-tools.ui share/anjuta/ui/anjuta.ui share/anjuta/ui/file-manager.ui @@ -436,7 +467,11 @@ share/applications/anjuta.desktop %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html %%PORTDOCS%%%%DOCSDIR%%/TODO +share/doc/libanjuta/AnjutaAsyncCommand.html +share/doc/libanjuta/AnjutaCellRendererCaptionedImage.html +share/doc/libanjuta/AnjutaCommand.html share/doc/libanjuta/AnjutaLauncher.html +share/doc/libanjuta/AnjutaMessageArea.html share/doc/libanjuta/AnjutaPlugin.html share/doc/libanjuta/AnjutaPluginHandle.html share/doc/libanjuta/AnjutaPluginManager.html @@ -448,6 +483,8 @@ share/doc/libanjuta/AnjutaSavePrompt.html share/doc/libanjuta/AnjutaSerializer.html share/doc/libanjuta/AnjutaSession.html share/doc/libanjuta/AnjutaStatus.html +share/doc/libanjuta/AnjutaSyncCommand.html +share/doc/libanjuta/AnjutaVcsStatusTreeView.html share/doc/libanjuta/AnjutaUI.html share/doc/libanjuta/action-block.html share/doc/libanjuta/anjuta-architecture.html @@ -458,10 +495,10 @@ share/doc/libanjuta/home.png share/doc/libanjuta/index.html share/doc/libanjuta/index.sgml share/doc/libanjuta/left.png -share/doc/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html share/doc/libanjuta/libanjuta-ESplash.html share/doc/libanjuta/libanjuta-anjuta-c-module.html share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html +share/doc/libanjuta/libanjuta-anjuta-convert.html share/doc/libanjuta/libanjuta-anjuta-debug.html share/doc/libanjuta/libanjuta-anjuta-encodings.html share/doc/libanjuta/libanjuta-anjuta-enum-types.html @@ -471,11 +508,14 @@ share/doc/libanjuta/libanjuta-anjuta-plugin-description.html share/doc/libanjuta/libanjuta-anjuta-shell.html share/doc/libanjuta/libanjuta-anjuta-utils-priv.html share/doc/libanjuta/libanjuta-anjuta-utils.html +share/doc/libanjuta/libanjuta-anjuta-version.html share/doc/libanjuta/libanjuta-api.html share/doc/libanjuta/libanjuta-ianjuta-bookmark.html share/doc/libanjuta/libanjuta-ianjuta-buildable.html +share/doc/libanjuta/libanjuta-ianjuta-builder.html share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html share/doc/libanjuta/libanjuta-ianjuta-debugger-breakpoint.html +share/doc/libanjuta/libanjuta-ianjuta-environment.html share/doc/libanjuta/libanjuta-ianjuta-debugger-instruction.html share/doc/libanjuta/libanjuta-ianjuta-debugger-memory.html share/doc/libanjuta/libanjuta-ianjuta-debugger-register.html @@ -515,7 +555,6 @@ share/doc/libanjuta/libanjuta-ianjuta-markable.html share/doc/libanjuta/libanjuta-ianjuta-message-manager.html share/doc/libanjuta/libanjuta-ianjuta-message-view.html share/doc/libanjuta/libanjuta-ianjuta-plugin-factory.html -share/doc/libanjuta/libanjuta-ianjuta-plugin-loader.html share/doc/libanjuta/libanjuta-ianjuta-preferences.html share/doc/libanjuta/libanjuta-ianjuta-print.html share/doc/libanjuta/libanjuta-ianjuta-project-manager.html @@ -550,10 +589,10 @@ share/gnome/help/anjuta-faqs/C/anjuta-faqs.xml share/gnome/help/anjuta-faqs/C/legal.xml share/gnome/help/anjuta-manual/C/anjuta-manual.xml share/gnome/help/anjuta-manual/C/authors.xml +share/gnome/help/anjuta-manual/C/build.xml share/gnome/help/anjuta-manual/C/debugger.xml share/gnome/help/anjuta-manual/C/figures/add_edit_macro.png share/gnome/help/anjuta-manual/C/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/C/figures/arguments.png share/gnome/help/anjuta-manual/C/figures/attach.png share/gnome/help/anjuta-manual/C/figures/brk_add.png share/gnome/help/anjuta-manual/C/figures/brk_dlg.png @@ -603,7 +642,6 @@ share/gnome/help/anjuta-manual/C/tools.xml share/gnome/help/anjuta-manual/es/anjuta-manual.xml share/gnome/help/anjuta-manual/es/figures/add_edit_macro.png share/gnome/help/anjuta-manual/es/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/es/figures/arguments.png share/gnome/help/anjuta-manual/es/figures/attach.png share/gnome/help/anjuta-manual/es/figures/brk_add.png share/gnome/help/anjuta-manual/es/figures/brk_dlg.png @@ -644,7 +682,6 @@ share/gnome/help/anjuta-manual/es/figures/tool-editor.png share/gnome/help/anjuta-manual/oc/anjuta-manual.xml share/gnome/help/anjuta-manual/oc/figures/add_edit_macro.png share/gnome/help/anjuta-manual/oc/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/oc/figures/arguments.png share/gnome/help/anjuta-manual/oc/figures/attach.png share/gnome/help/anjuta-manual/oc/figures/brk_add.png share/gnome/help/anjuta-manual/oc/figures/brk_dlg.png @@ -685,7 +722,6 @@ share/gnome/help/anjuta-manual/oc/figures/tool-editor.png share/gnome/help/anjuta-manual/sv/anjuta-manual.xml share/gnome/help/anjuta-manual/sv/figures/add_edit_macro.png share/gnome/help/anjuta-manual/sv/figures/anjuta-in-action.png -share/gnome/help/anjuta-manual/sv/figures/arguments.png share/gnome/help/anjuta-manual/sv/figures/attach.png share/gnome/help/anjuta-manual/sv/figures/brk_add.png share/gnome/help/anjuta-manual/sv/figures/brk_dlg.png @@ -745,6 +781,8 @@ share/locale/fi/LC_MESSAGES/anjuta.mo share/locale/fr/LC_MESSAGES/anjuta.mo share/locale/ga/LC_MESSAGES/anjuta.mo share/locale/gl/LC_MESSAGES/anjuta.mo +share/locale/gu/LC_MESSAGES/anjuta.mo +share/locale/he/LC_MESSAGES/anjuta.mo share/locale/hi/LC_MESSAGES/anjuta.mo share/locale/hr/LC_MESSAGES/anjuta.mo share/locale/hu/LC_MESSAGES/anjuta.mo @@ -756,6 +794,7 @@ share/locale/ko/LC_MESSAGES/anjuta.mo share/locale/lt/LC_MESSAGES/anjuta.mo share/locale/mk/LC_MESSAGES/anjuta.mo share/locale/ml/LC_MESSAGES/anjuta.mo +share/locale/mr/LC_MESSAGES/anjuta.mo share/locale/ms/LC_MESSAGES/anjuta.mo share/locale/nb/LC_MESSAGES/anjuta.mo share/locale/ne/LC_MESSAGES/anjuta.mo @@ -772,10 +811,12 @@ share/locale/sk/LC_MESSAGES/anjuta.mo share/locale/sl/LC_MESSAGES/anjuta.mo share/locale/sq/LC_MESSAGES/anjuta.mo share/locale/sr/LC_MESSAGES/anjuta.mo -share/locale/sr@Latn/LC_MESSAGES/anjuta.mo +share/locale/sr@latin/LC_MESSAGES/anjuta.mo share/locale/sv/LC_MESSAGES/anjuta.mo +share/locale/th/LC_MESSAGES/anjuta.mo share/locale/tr/LC_MESSAGES/anjuta.mo share/locale/uk/LC_MESSAGES/anjuta.mo +share/locale/vi/LC_MESSAGES/anjuta.mo share/locale/zh_CN/LC_MESSAGES/anjuta.mo share/locale/zh_HK/LC_MESSAGES/anjuta.mo share/locale/zh_TW/LC_MESSAGES/anjuta.mo @@ -785,46 +826,6 @@ share/omf/anjuta-manual/anjuta-manual-C.omf share/omf/anjuta-manual/anjuta-manual-es.omf share/omf/anjuta-manual/anjuta-manual-oc.omf share/omf/anjuta-manual/anjuta-manual-sv.omf -share/pixmaps/anjuta/Icons.16x16.Class -share/pixmaps/anjuta/Icons.16x16.Enum -share/pixmaps/anjuta/Icons.16x16.Event -share/pixmaps/anjuta/Icons.16x16.Field -share/pixmaps/anjuta/Icons.16x16.FormsDesigner.BringToFront -share/pixmaps/anjuta/Icons.16x16.FormsDesigner.SendToBack -share/pixmaps/anjuta/Icons.16x16.Interface -share/pixmaps/anjuta/Icons.16x16.InternalClass -share/pixmaps/anjuta/Icons.16x16.InternalDelegate -share/pixmaps/anjuta/Icons.16x16.InternalEnum -share/pixmaps/anjuta/Icons.16x16.InternalEvent -share/pixmaps/anjuta/Icons.16x16.InternalField -share/pixmaps/anjuta/Icons.16x16.InternalInterface -share/pixmaps/anjuta/Icons.16x16.InternalMethod -share/pixmaps/anjuta/Icons.16x16.InternalProperty -share/pixmaps/anjuta/Icons.16x16.InternalStruct -share/pixmaps/anjuta/Icons.16x16.Literal -share/pixmaps/anjuta/Icons.16x16.Method -share/pixmaps/anjuta/Icons.16x16.NameSpace -share/pixmaps/anjuta/Icons.16x16.PrivateClass -share/pixmaps/anjuta/Icons.16x16.PrivateDelegate -share/pixmaps/anjuta/Icons.16x16.PrivateEnum -share/pixmaps/anjuta/Icons.16x16.PrivateEvent -share/pixmaps/anjuta/Icons.16x16.PrivateField -share/pixmaps/anjuta/Icons.16x16.PrivateInterface -share/pixmaps/anjuta/Icons.16x16.PrivateMethod -share/pixmaps/anjuta/Icons.16x16.PrivateProperty -share/pixmaps/anjuta/Icons.16x16.PrivateStruct -share/pixmaps/anjuta/Icons.16x16.Property -share/pixmaps/anjuta/Icons.16x16.ProtectedClass -share/pixmaps/anjuta/Icons.16x16.ProtectedDelegate -share/pixmaps/anjuta/Icons.16x16.ProtectedEnum -share/pixmaps/anjuta/Icons.16x16.ProtectedEvent -share/pixmaps/anjuta/Icons.16x16.ProtectedField -share/pixmaps/anjuta/Icons.16x16.ProtectedInterface -share/pixmaps/anjuta/Icons.16x16.ProtectedMethod -share/pixmaps/anjuta/Icons.16x16.ProtectedProperty -share/pixmaps/anjuta/Icons.16x16.ProtectedStruct -share/pixmaps/anjuta/Icons.16x16.Reference -share/pixmaps/anjuta/Icons.16x16.Struct share/pixmaps/anjuta/anjuta-attach-16.png share/pixmaps/anjuta/anjuta-attach-24.png share/pixmaps/anjuta/anjuta-block-end-16.png @@ -868,8 +869,19 @@ share/pixmaps/anjuta/anjuta-devhelp-plugin-48.png share/pixmaps/anjuta/anjuta-devhelp-plugin.svg share/pixmaps/anjuta/anjuta-document-manager-plugin-48.png share/pixmaps/anjuta/anjuta-document-manager-plugin.svg -share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png -share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg +%%SCINTILLA%%share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png +%%SCINTILLA%%share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg +share/pixmaps/anjuta/element-class-16.png +share/pixmaps/anjuta/element-delegate-16.png +share/pixmaps/anjuta/element-enumeration-16.png +share/pixmaps/anjuta/element-event-16.png +share/pixmaps/anjuta/element-field-16.png +share/pixmaps/anjuta/element-interface-16.png +share/pixmaps/anjuta/element-literal-16.png +share/pixmaps/anjuta/element-method-16.png +share/pixmaps/anjuta/element-namespace-16.png +share/pixmaps/anjuta/element-property-16.png +share/pixmaps/anjuta/element-structure-16.png share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png share/pixmaps/anjuta/anjuta-file-manager-plugin.svg @@ -881,6 +893,7 @@ share/pixmaps/anjuta/anjuta-fold-open-24.png share/pixmaps/anjuta/anjuta-fold-toggle-16.png share/pixmaps/anjuta/anjuta-fold-toggle-24.png share/pixmaps/anjuta/anjuta-gdb.plugin.png +share/pixmaps/anjuta/anjuta-git-plugin-48.png share/pixmaps/anjuta/anjuta-glade-plugin-48.png share/pixmaps/anjuta/anjuta-glade-plugin.svg share/pixmaps/anjuta/anjuta-go-help-next-16.png @@ -933,8 +946,10 @@ share/pixmaps/anjuta/anjuta-project-wizard-plugin-48.png share/pixmaps/anjuta/anjuta-project-wizard-plugin.svg share/pixmaps/anjuta/anjuta-run-to-cursor-16.png share/pixmaps/anjuta/anjuta-run-to-cursor-24.png +share/pixmaps/anjuta/anjuta-run-program-48.png share/pixmaps/anjuta/anjuta-sample-plugin-48.png share/pixmaps/anjuta/anjuta-sample-plugin.svg +share/pixmaps/anjuta/anjuta-scratchbox-48.png share/pixmaps/anjuta/anjuta-search-plugin-48.png share/pixmaps/anjuta/anjuta-search-plugin.svg share/pixmaps/anjuta/anjuta-step-into-16.png @@ -949,6 +964,7 @@ share/pixmaps/anjuta/anjuta-swap-16.png share/pixmaps/anjuta/anjuta-swap-24.png share/pixmaps/anjuta/anjuta-symbol-browser-plugin-48.png share/pixmaps/anjuta/anjuta-symbol-browser-plugin.svg +%%SYMBOL%%share/pixmaps/anjuta/anjuta-symbol-db-plugin-48.png share/pixmaps/anjuta/anjuta-terminal-plugin-48.png share/pixmaps/anjuta/anjuta-terminal-plugin.svg share/pixmaps/anjuta/anjuta-tools-plugin-48.png @@ -991,7 +1007,7 @@ share/pixmaps/anjuta/start-with-import.png @dirrm share/anjuta/ui @dirrm share/anjuta/tools @dirrm share/anjuta/scripts -@dirrm share/anjuta/properties +%%SCINTILLA%%@dirrm share/anjuta/properties @dirrm share/anjuta/project/xlib/src @dirrm share/anjuta/project/xlib/po @dirrm share/anjuta/project/xlib-dock/src @@ -1014,6 +1030,7 @@ share/pixmaps/anjuta/start-with-import.png @dirrm share/anjuta/project/mkfile/po @dirrm share/anjuta/project/mkfile @dirrm share/anjuta/project/minimal +@dirrm share/anjuta/project/licenses @dirrm share/anjuta/project/java/src @dirrm share/anjuta/project/java/po @dirrm share/anjuta/project/java @@ -1031,6 +1048,9 @@ share/pixmaps/anjuta/start-with-import.png @dirrm share/anjuta/project/cpp/src @dirrm share/anjuta/project/cpp/po @dirrm share/anjuta/project/cpp +@dirrm share/anjuta/project/anjuta-plugin-vala/src +@dirrm share/anjuta/project/anjuta-plugin-vala/po +@dirrm share/anjuta/project/anjuta-plugin-vala @dirrm share/anjuta/project/anjuta-plugin/src @dirrm share/anjuta/project/anjuta-plugin/po @dirrm share/anjuta/project/anjuta-plugin @@ -1052,12 +1072,16 @@ share/pixmaps/anjuta/start-with-import.png @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index e6326a3999aa..5362c457bcf7 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/bug-buddy/Makefile,v 1.60 2008/03/11 03:04:07 mezz Exp $ +# $MCom: ports/devel/bug-buddy/Makefile,v 1.71 2008/11/25 17:43:11 mezz Exp $ # PORTNAME= bug-buddy -PORTVERSION= 2.22.0 -PORTREVISION= 3 +PORTVERSION= 2.24.2 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,7 +23,7 @@ USE_GETTEXT= yes INSTALLS_ICONS= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ +USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus \ gnomedocutils evolutiondataserver GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -32,6 +31,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= bug-buddy.schemas +MAN1= bug-buddy.1 + post-patch: @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \ ${WRKSRC}/src/bugzilla.c diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index 05e227a42086..b4d410c17103 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.22.0.tar.bz2) = 092e1f91d0be4ca133cd0650622a6b06 -SHA256 (gnome2/bug-buddy-2.22.0.tar.bz2) = 09c6d01f8b029b5ffccabfcbc502f637d06a7989e93c374de24b5b838b9878a6 -SIZE (gnome2/bug-buddy-2.22.0.tar.bz2) = 1076752 +MD5 (gnome2/bug-buddy-2.24.2.tar.bz2) = faeeb2351398b9284eee794ff6ea9588 +SHA256 (gnome2/bug-buddy-2.24.2.tar.bz2) = d64125505546183d44727e812b0ac7e9c60f0fff0eaf164b874974647067cbb4 +SIZE (gnome2/bug-buddy-2.24.2.tar.bz2) = 1109562 diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index 27e3a523bc6c..7655acd7ebcb 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -4,7 +4,6 @@ lib/gtk-2.0/modules/libgnomebreakpad.so share/applications/bug-buddy.desktop %%DATADIR%%/bug-buddy.gtkbuilder %%DATADIR%%/bug-buddy.menu -%%DATADIR%%/bug-buddy.png %%DATADIR%%/bugzilla/gnome.bugzilla %%DATADIR%%/bugzilla/gnome/config %%DATADIR%%/bugzilla/gnome/mostfreq @@ -14,7 +13,13 @@ share/applications/bug-buddy.desktop %%DATADIR%%/bugzilla/ximian/mostfreq %%DATADIR%%/bugzilla/ximian/products %%DATADIR%%/gdb-cmd +share/icons/HighContrastLargePrint/48x48/apps/bug-buddy.png +share/icons/hicolor/16x16/apps/bug-buddy.png +share/icons/hicolor/22x22/apps/bug-buddy.png +share/icons/hicolor/24x24/apps/bug-buddy.png +share/icons/hicolor/32x32/apps/bug-buddy.png share/icons/hicolor/48x48/apps/bug-buddy.png +share/icons/hicolor/scalable/apps/bug-buddy.svg share/locale/af/LC_MESSAGES/bug-buddy.mo share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo @@ -53,6 +58,7 @@ share/locale/is/LC_MESSAGES/bug-buddy.mo share/locale/it/LC_MESSAGES/bug-buddy.mo share/locale/ja/LC_MESSAGES/bug-buddy.mo share/locale/ka/LC_MESSAGES/bug-buddy.mo +share/locale/kn/LC_MESSAGES/bug-buddy.mo share/locale/ko/LC_MESSAGES/bug-buddy.mo share/locale/ku/LC_MESSAGES/bug-buddy.mo share/locale/ky/LC_MESSAGES/bug-buddy.mo @@ -72,6 +78,7 @@ share/locale/oc/LC_MESSAGES/bug-buddy.mo share/locale/or/LC_MESSAGES/bug-buddy.mo share/locale/pa/LC_MESSAGES/bug-buddy.mo share/locale/pl/LC_MESSAGES/bug-buddy.mo +share/locale/ps/LC_MESSAGES/bug-buddy.mo share/locale/pt/LC_MESSAGES/bug-buddy.mo share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo share/locale/ro/LC_MESSAGES/bug-buddy.mo @@ -82,7 +89,7 @@ share/locale/sk/LC_MESSAGES/bug-buddy.mo share/locale/sl/LC_MESSAGES/bug-buddy.mo share/locale/sq/LC_MESSAGES/bug-buddy.mo share/locale/sr/LC_MESSAGES/bug-buddy.mo -share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo +share/locale/sr@latin/LC_MESSAGES/bug-buddy.mo share/locale/sv/LC_MESSAGES/bug-buddy.mo share/locale/ta/LC_MESSAGES/bug-buddy.mo share/locale/te/LC_MESSAGES/bug-buddy.mo @@ -97,6 +104,9 @@ share/locale/xh/LC_MESSAGES/bug-buddy.mo share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo +@dirrmtry share/icons/HighContrastLargePrint/48x48/apps +@dirrmtry share/icons/HighContrastLargePrint/48x48 +@dirrmtry share/icons/HighContrastLargePrint @dirrm %%DATADIR%%/bugzilla/ximian @dirrm %%DATADIR%%/bugzilla/gnome @dirrm %%DATADIR%%/bugzilla @@ -112,10 +122,14 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile index 2be0fd37d82e..2dac28c6e18e 100644 --- a/devel/dbus-glib/Makefile +++ b/devel/dbus-glib/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dbus -PORTVERSION= 0.76 +PORTVERSION= 0.78 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-glib/ PKGNAMESUFFIX= -glib diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo index 300048eb641b..aae323c5b08e 100644 --- a/devel/dbus-glib/distinfo +++ b/devel/dbus-glib/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-glib-0.76.tar.gz) = d3b716a7e798faa1c6a867675f00306a -SHA256 (dbus-glib-0.76.tar.gz) = 8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3 -SIZE (dbus-glib-0.76.tar.gz) = 667547 +MD5 (dbus-glib-0.78.tar.gz) = d4aa04b9df35b4bd663be38e959941c8 +SHA256 (dbus-glib-0.78.tar.gz) = ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21 +SIZE (dbus-glib-0.78.tar.gz) = 683454 diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist index ca73973caaa3..54bca846061c 100644 --- a/devel/dbus-glib/pkg-plist +++ b/devel/dbus-glib/pkg-plist @@ -1,4 +1,5 @@ bin/dbus-binding-tool +etc/profile.d/dbus-bash-completion.sh include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h @@ -9,6 +10,7 @@ lib/libdbus-glib-1.la lib/libdbus-glib-1.so lib/libdbus-glib-1.so.2 libdata/pkgconfig/dbus-glib-1.pc +libexec/dbus-bash-completion-helper %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html %%DOCSDIR%%/ch03.html @@ -30,3 +32,4 @@ libdata/pkgconfig/dbus-glib-1.pc %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png @dirrm %%DOCSDIR%% +@dirrmtry etc/profile.d diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index c5a63e7e2b0d..89df6ae07e7a 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -6,17 +6,18 @@ # PORTNAME= dbus -PORTVERSION?= 1.2.1 +PORTVERSION?= 1.2.4.2 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ +DISTNAME= dbus-${PORTVERSION}permissive MAINTAINER= gnome@FreeBSD.org COMMENT= A message bus system for inter-application communication LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_GNOME?= gnomehack gnometarget libxml2 ltverhack +USE_GNOME?= gnomehack libxml2 ltverhack USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo index 19b7feafa05f..00cc4ea6a0c2 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-1.2.1.tar.gz) = b57aa1ba0834cbbb1e7502dc2cbfacc2 -SHA256 (dbus-1.2.1.tar.gz) = 8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86 -SIZE (dbus-1.2.1.tar.gz) = 1406833 +MD5 (dbus-1.2.4.2permissive.tar.gz) = 92418f1d2932c2f4980b815e00c993cc +SHA256 (dbus-1.2.4.2permissive.tar.gz) = 1d384f4d1c7d2e022e68e421f980c3e60557016d44999560f2136d2a58f7c9c9 +SIZE (dbus-1.2.4.2permissive.tar.gz) = 1574034 diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c index bd0353d36d62..aa623c158889 100644 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c @@ -1,6 +1,6 @@ ---- dbus/dbus-sysdeps-unix.c.orig 2008-02-15 20:26:46.000000000 -0500 -+++ dbus/dbus-sysdeps-unix.c 2008-02-15 20:28:46.000000000 -0500 -@@ -1032,9 +1032,9 @@ write_credentials_byte (int +--- dbus/dbus-sysdeps-unix.c.orig 2008-08-06 13:00:29.000000000 -0400 ++++ dbus/dbus-sysdeps-unix.c 2008-08-10 15:04:32.000000000 -0400 +@@ -1041,9 +1041,9 @@ write_credentials_byte (int int bytes_written; char buf[1] = { '\0' }; #if defined(HAVE_CMSGCRED) @@ -12,7 +12,7 @@ } cmsg; struct iovec iov; struct msghdr msg; -@@ -1045,10 +1045,10 @@ write_credentials_byte (int +@@ -1054,10 +1054,10 @@ write_credentials_byte (int msg.msg_iov = &iov; msg.msg_iovlen = 1; @@ -26,7 +26,7 @@ cmsg.hdr.cmsg_level = SOL_SOCKET; cmsg.hdr.cmsg_type = SCM_CREDS; #endif -@@ -1124,9 +1124,9 @@ _dbus_read_credentials_socket (int +@@ -1133,9 +1133,9 @@ _dbus_read_credentials_socket (int pid_read = DBUS_PID_UNSET; #ifdef HAVE_CMSGCRED @@ -38,7 +38,7 @@ } cmsg; #elif defined(LOCAL_CREDS) -@@ -1163,8 +1163,8 @@ _dbus_read_credentials_socket (int +@@ -1172,8 +1172,8 @@ _dbus_read_credentials_socket (int #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) memset (&cmsg, 0, sizeof (cmsg)); @@ -49,7 +49,7 @@ #endif again: -@@ -1202,7 +1202,8 @@ _dbus_read_credentials_socket (int +@@ -1211,7 +1211,8 @@ _dbus_read_credentials_socket (int } #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) @@ -59,7 +59,7 @@ { dbus_set_error (error, DBUS_ERROR_FAILED, "Message from recvmsg() was not SCM_CREDS"); -@@ -1229,8 +1230,11 @@ _dbus_read_credentials_socket (int +@@ -1238,8 +1239,11 @@ _dbus_read_credentials_socket (int cr_len, (int) sizeof (cr), _dbus_strerror (errno)); } #elif defined(HAVE_CMSGCRED) diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c new file mode 100644 index 000000000000..cdf6eaf0796d --- /dev/null +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c @@ -0,0 +1,10 @@ +--- dbus/dbus-sysdeps-util-unix.c.orig 2008-12-21 14:51:17.000000000 -0500 ++++ dbus/dbus-sysdeps-util-unix.c 2008-12-21 14:51:37.000000000 -0500 +@@ -38,6 +38,7 @@ + #include <stdio.h> + #include <errno.h> + #include <fcntl.h> ++#include <syslog.h> + #include <sys/stat.h> + #include <grp.h> + #include <sys/socket.h> diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 46f4d75ff26b..5f0c3dca365c 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -3,16 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/devel/devhelp/Makefile,v 1.10 2009/01/09 22:20:28 kwm Exp $ PORTNAME= devhelp -PORTVERSION= 0.19.1 -PORTREVISION= 1 +PORTVERSION= 0.22 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kwm@FreeBSD.org COMMENT= Developer help browser for GNOME 2 USE_BZIP2= yes @@ -43,10 +42,6 @@ PLIST_SUB+= GEDIT="" PLIST_SUB+= GEDIT="@comment " .endif -# This target is only meant to be used by the port maintainer. -x-generate-plist: - (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,^@dirrm share/((gnome/[^d]|pixmaps|application|locale).*|gnome$$),,;s,^@dirrm etc/gconf.*,,;s,^etc/gconf/gconf.*,,'|${TR} -s '\n') > temp-pkg-plist - post-patch: .if defined(WITHOUT_GEDIT) @${REINPLACE_CMD} -e 's|gedit-plugin||' \ diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo index 6421119815df..8c21dd82e15f 100644 --- a/devel/devhelp/distinfo +++ b/devel/devhelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/devhelp-0.19.1.tar.bz2) = 6c12a272a94ac9cfc1dc6234590b46d8 -SHA256 (gnome2/devhelp-0.19.1.tar.bz2) = be447b9496b09e97bde51e6d638c94e6e4718feebe6b3c76cf256a18baf22e4f -SIZE (gnome2/devhelp-0.19.1.tar.bz2) = 533193 +MD5 (gnome2/devhelp-0.22.tar.bz2) = 7cdd0688dba0184b6dd2688532af24cb +SHA256 (gnome2/devhelp-0.22.tar.bz2) = 1fa4b69c99b10de0e27374e18eea7988e3e8f9243020a22a47f79c9ccad92947 +SIZE (gnome2/devhelp-0.22.tar.bz2) = 517581 diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c index ffa3c3b54602..3dbf1c71cf4e 100644 --- a/devel/devhelp/files/patch-src_dh-base.c +++ b/devel/devhelp/files/patch-src_dh-base.c @@ -1,13 +1,14 @@ ---- src/dh-base.c.orig Tue May 15 13:00:24 2007 -+++ src/dh-base.c Sun Jul 8 03:48:13 2007 -@@ -233,6 +233,10 @@ base_add_books_in_data_dir (DhBase *base - dir = g_build_filename (data_dir, "devhelp", "books", NULL); - base_add_books (base, dir); - g_free (dir); +--- src/dh-base.c.orig 2008-10-11 00:00:18.000000000 +0200 ++++ src/dh-base.c 2009-01-09 23:10:12.000000000 +0100 +@@ -214,6 +214,11 @@ base_add_books_in_data_dir (DhBase + dir = g_build_filename (data_dir, "devhelp", "books", NULL); + base_add_books (base, dir); + g_free (dir); ++ ++ dir = g_build_filename (data_dir, "doc", NULL); ++ base_add_books (base, dir); ++ g_free (dir); + -+ dir = g_build_filename (data_dir, "doc", NULL); -+ base_add_books (base, dir); -+ g_free (dir); } static void diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist index 4584ddfe5609..83649fae27a5 100644 --- a/devel/devhelp/pkg-plist +++ b/devel/devhelp/pkg-plist @@ -1,16 +1,13 @@ bin/devhelp +include/devhelp-1.0/devhelp/dh-assistant-view.h +include/devhelp-1.0/devhelp/dh-assistant.h include/devhelp-1.0/devhelp/dh-base.h include/devhelp-1.0/devhelp/dh-book-tree.h include/devhelp-1.0/devhelp/dh-error.h -include/devhelp-1.0/devhelp/dh-html.h include/devhelp-1.0/devhelp/dh-keyword-model.h include/devhelp-1.0/devhelp/dh-link.h -include/devhelp-1.0/devhelp/dh-parser.h -include/devhelp-1.0/devhelp/dh-preferences.h include/devhelp-1.0/devhelp/dh-search.h -include/devhelp-1.0/devhelp/dh-util.h include/devhelp-1.0/devhelp/dh-window.h -include/devhelp-1.0/devhelp/eggfindbar.h %%GEDIT%%lib/gedit-2/plugins/devhelp.gedit-plugin %%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.py %%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.pyc @@ -24,12 +21,11 @@ lib/libdevhelp-1.so lib/libdevhelp-1.so.0 libdata/pkgconfig/libdevhelp-1.0.pc share/applications/devhelp.desktop -share/devhelp/default-prefs.js -share/devhelp/devhelp.glade +share/devhelp/assistant/assistant.css +share/devhelp/assistant/assistant.js +share/devhelp/devhelp.defaults share/devhelp/dtd/devhelp-1.dtd -share/devhelp/images/book_closed.png -share/devhelp/images/book_open.png -share/devhelp/images/helpdoc.png +share/devhelp/ui/devhelp.builder share/devhelp/ui/window.ui share/icons/hicolor/16x16/apps/devhelp.png share/icons/hicolor/22x22/apps/devhelp.png @@ -81,6 +77,7 @@ share/locale/oc/LC_MESSAGES/devhelp.mo share/locale/or/LC_MESSAGES/devhelp.mo share/locale/pa/LC_MESSAGES/devhelp.mo share/locale/pl/LC_MESSAGES/devhelp.mo +share/locale/ps/LC_MESSAGES/devhelp.mo share/locale/pt/LC_MESSAGES/devhelp.mo share/locale/pt_BR/LC_MESSAGES/devhelp.mo share/locale/ru/LC_MESSAGES/devhelp.mo @@ -103,6 +100,7 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo @dirrm share/devhelp/ui @dirrm share/devhelp/images @dirrm share/devhelp/dtd +@dirrm share/devhelp/assistant @dirrm share/devhelp @dirrm include/devhelp-1.0/devhelp @dirrm include/devhelp-1.0 @@ -110,10 +108,16 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/sr@Latn/LC_MESSAGES +@dirrmtry share/locale/sr@Latn @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index fa5bb40801c2..9a1a9cedb1a8 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gamin/Makefile,v 1.4 2008/01/09 19:55:24 marcus Exp $ +# $MCom: ports/devel/gamin/Makefile,v 1.6 2008/11/26 06:48:13 marcus Exp $ # PORTNAME= gamin -PORTVERSION= 0.1.9 -PORTREVISION= 2 +PORTVERSION= 0.1.10 CATEGORIES?= devel MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/ diff --git a/devel/gamin/distinfo b/devel/gamin/distinfo index fffc0de2e3ad..399e962883db 100644 --- a/devel/gamin/distinfo +++ b/devel/gamin/distinfo @@ -1,3 +1,3 @@ -MD5 (gamin-0.1.9.tar.gz) = 2d3a6a70df090ed923238e381e6c2982 -SHA256 (gamin-0.1.9.tar.gz) = 19e2c620e84da678b629d4acb07d93f47a2e5075982892646f77520bb277f239 -SIZE (gamin-0.1.9.tar.gz) = 645429 +MD5 (gamin-0.1.10.tar.gz) = b4ec549e57da470c04edd5ec2876a028 +SHA256 (gamin-0.1.10.tar.gz) = 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 +SIZE (gamin-0.1.10.tar.gz) = 653392 diff --git a/devel/gamin/files/patch-python_Makefile.in b/devel/gamin/files/patch-python_Makefile.in index 3cc568b4e851..24bbe73c6d67 100644 --- a/devel/gamin/files/patch-python_Makefile.in +++ b/devel/gamin/files/patch-python_Makefile.in @@ -1,23 +1,20 @@ ---- python/Makefile.in.orig Mon Feb 6 23:00:32 2006 -+++ python/Makefile.in Tue Feb 7 08:10:46 2006 -@@ -59,7 +59,7 @@ +--- python/Makefile.in.orig 2008-11-26 01:42:29.000000000 -0500 ++++ python/Makefile.in 2008-11-26 01:43:26.000000000 -0500 +@@ -53,7 +53,7 @@ am__strip_dir = `echo $$p | sed -e 's|^. + am__installdirs = "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)" pythonLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(python_LTLIBRARIES) - @WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = \ --@WITH_PYTHON_TRUE@ $(top_builddir)/libgamin/libgamin-1.la -+@WITH_PYTHON_TRUE@ -lgamin-1 - @WITH_PYTHON_TRUE@_gamin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) - am___gamin_la_SOURCES_DIST = gamin.c - @WITH_PYTHON_TRUE@am__gamin_la_OBJECTS = gamin.lo -@@ -239,9 +239,9 @@ - gamin.c \ - gamin.py +-_gamin_la_DEPENDENCIES = $(top_builddir)/libgamin/libgamin-1.la ++_gamin_la_DEPENDENCIES = -lgamin-1 + am__gamin_la_OBJECTS = gamin.lo + _gamin_la_OBJECTS = $(am__gamin_la_OBJECTS) + _gamin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -228,7 +228,7 @@ INCLUDES = \ --_gamin_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/libgamin/.libs -+_gamin_la_LDFLAGS = -module -avoid-version - @WITH_PYTHON_TRUE@mylibs = \ --@WITH_PYTHON_TRUE@ $(top_builddir)/libgamin/libgamin-1.la -+@WITH_PYTHON_TRUE@ -lgamin-1 - - @WITH_PYTHON_TRUE@python_LTLIBRARIES = _gamin.la - @WITH_PYTHON_TRUE@_gamin_la_SOURCES = gamin.c + python_LTLIBRARIES = _gamin.la + _gamin_la_SOURCES = gamin.c +-_gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la ++_gamin_la_LIBADD = -lgamin-1 + _gamin_la_LDFLAGS = -module -avoid-version + python_PYTHON = gamin.py + all: all-recursive diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 540ece1a10c5..f9127163f048 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.96 2008/03/10 16:25:56 ahze Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.102 2008/09/23 04:54:38 marcus Exp $ # PORTNAME= gconf2 -PORTVERSION= 2.22.0 -PORTREVISION?= 1 +PORTVERSION= 2.24.0 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,6 +22,9 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + polkit.2:${PORTSDIR}/sysutils/policykit + USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \ diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index 69fd7f190c62..f3cebd9eea58 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/GConf-2.22.0.tar.bz2) = a56c043afeb1052abaf45407409b0331 -SHA256 (gnome2/GConf-2.22.0.tar.bz2) = 54e40cf047eb431cdf994f763ae840107ed6e9b8f9521b2b2eb07c7a55f92ce0 -SIZE (gnome2/GConf-2.22.0.tar.bz2) = 1416685 +MD5 (gnome2/GConf-2.24.0.tar.bz2) = 4971d96f5ba94fe4a69396267bd5afe8 +SHA256 (gnome2/GConf-2.24.0.tar.bz2) = 990003904ee13b2fd98a61d55fa4d0fcb30fb233454a036bb9465f42d1acbb1b +SIZE (gnome2/GConf-2.24.0.tar.bz2) = 1467817 diff --git a/devel/gconf2/files/patch-gconf_gconfd.c b/devel/gconf2/files/patch-gconf_gconfd.c index ef551cb28e81..31a6470a42e5 100644 --- a/devel/gconf2/files/patch-gconf_gconfd.c +++ b/devel/gconf2/files/patch-gconf_gconfd.c @@ -1,6 +1,6 @@ ---- gconf/gconfd.c.orig Fri May 5 12:40:23 2006 -+++ gconf/gconfd.c Fri May 5 12:41:43 2006 -@@ -124,12 +124,6 @@ +--- gconf/gconfd.c.orig 2008-05-10 08:34:31.000000000 -0400 ++++ gconf/gconfd.c 2008-08-16 14:08:05.000000000 -0400 +@@ -123,12 +123,6 @@ static void gconf_handle_segv (int signu static gboolean in_shutdown = FALSE; @@ -13,10 +13,11 @@ /* * CORBA goo */ -@@ -410,6 +404,18 @@ +@@ -408,6 +402,18 @@ gconf_server_load_sources(void) + } } - static void ++static void +reload_db (void) +{ + gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); @@ -28,22 +29,20 @@ + logfile_read (); +} + -+static void - signal_handler (int signo) - { - static gint in_fatal = 0; -@@ -482,8 +488,8 @@ + /* + * Signal handlers should not log debug messages as this code is non-reentrant. + * Please avoid calling gconf_log in this function. +@@ -471,8 +477,7 @@ signal_handler (int signo) case SIGHUP: --in_fatal; - /* reload sources during next periodic_cleanup() */ - need_db_reload = TRUE; -+ /* reload sources immediately */ + reload_db (); break; #endif -@@ -864,18 +870,6 @@ +@@ -828,17 +833,6 @@ static gboolean need_log_cleanup = FALSE static gboolean periodic_cleanup_timeout(gpointer data) { @@ -58,7 +57,6 @@ - gconf_server_load_sources (); - logfile_read (); - } -- + gconf_log (GCL_DEBUG, "Performing periodic cleanup, expiring cache cruft"); - drop_old_clients (); diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index fc96aad3d6fd..85be04736253 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -1,5 +1,6 @@ bin/gconf-merge-tree bin/gconftool-2 +etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf %%LDAP%%etc/gconf/2/evoldap.conf etc/gconf/2/path include/gconf/2/gconf/gconf-changeset.h @@ -11,6 +12,7 @@ include/gconf/2/gconf/gconf-listeners.h include/gconf/2/gconf/gconf-schema.h include/gconf/2/gconf/gconf-value.h include/gconf/2/gconf/gconf.h +libexec/gconf-defaults-mechanism %%LDAP%%lib/GConf/2/libgconfbackend-evoldap.a %%LDAP%%lib/GConf/2/libgconfbackend-evoldap.la %%LDAP%%lib/GConf/2/libgconfbackend-evoldap.so @@ -29,6 +31,9 @@ libexec/gconf-sanity-check-2 libexec/gconfd-2 %%LDAP%%share/GConf/schema/evoldap.schema share/aclocal/gconf-2.m4 +share/PolicyKit/policy/org.gnome.gconf.defaults.policy +share/dbus-1/system-services/org.gnome.GConf.Defaults.service +share/dbus-1/services/org.gnome.GConf.service share/locale/am/LC_MESSAGES/GConf2.mo share/locale/ar/LC_MESSAGES/GConf2.mo share/locale/as/LC_MESSAGES/GConf2.mo @@ -65,10 +70,12 @@ share/locale/is/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo share/locale/ka/LC_MESSAGES/GConf2.mo +share/locale/kn/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo share/locale/ku/LC_MESSAGES/GConf2.mo share/locale/lt/LC_MESSAGES/GConf2.mo share/locale/lv/LC_MESSAGES/GConf2.mo +share/locale/mai/LC_MESSAGES/GConf2.mo share/locale/mg/LC_MESSAGES/GConf2.mo share/locale/mk/LC_MESSAGES/GConf2.mo share/locale/ml/LC_MESSAGES/GConf2.mo @@ -93,7 +100,7 @@ share/locale/sk/LC_MESSAGES/GConf2.mo share/locale/sl/LC_MESSAGES/GConf2.mo share/locale/sq/LC_MESSAGES/GConf2.mo share/locale/sr/LC_MESSAGES/GConf2.mo -share/locale/sr@Latn/LC_MESSAGES/GConf2.mo +share/locale/sr@latin/LC_MESSAGES/GConf2.mo share/locale/sv/LC_MESSAGES/GConf2.mo share/locale/ta/LC_MESSAGES/GConf2.mo share/locale/te/LC_MESSAGES/GConf2.mo @@ -122,6 +129,8 @@ share/sgml/gconf/gconf-1.0.dtd @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -132,6 +141,8 @@ share/sgml/gconf/gconf-1.0.dtd @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 diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile index d8269f08ab19..45bb0d961ca9 100644 --- a/devel/gconfmm26/Makefile +++ b/devel/gconfmm26/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/gconfmm26/Makefile,v 1.20 2008/03/08 16:24:44 marcus Exp $ +# $MCom: ports/devel/gconfmm26/Makefile,v 1.23 2008/09/22 11:47:53 kwm Exp $ # PORTNAME= gconfmm -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.24.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo index 12c3db942420..20aa775d8721 100644 --- a/devel/gconfmm26/distinfo +++ b/devel/gconfmm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconfmm-2.22.0.tar.bz2) = 4090b7333a928c6baeff583a9a0b2b55 -SHA256 (gnome2/gconfmm-2.22.0.tar.bz2) = ff0db2c7d91f69f825ec5988547ebf5be144930b4f4013c678313ee0b2725f4a -SIZE (gnome2/gconfmm-2.22.0.tar.bz2) = 283460 +MD5 (gnome2/gconfmm-2.24.0.tar.bz2) = cd2c3c919dbf8f90f703680d2fa088b2 +SHA256 (gnome2/gconfmm-2.24.0.tar.bz2) = d801f3422411269b4234e97589d8c90a2495336320e608c5aab4a277c0010baa +SIZE (gnome2/gconfmm-2.24.0.tar.bz2) = 298222 diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index 213d7c5f640d..3793ee1b7566 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.9 2008/03/12 17:46:37 marcus Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.24 2009/01/09 21:30:35 kwm Exp $ # PORTNAME= gio-fam-backend -PORTVERSION= 2.16.5 +PORTVERSION= 2.18.4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ @@ -26,7 +26,7 @@ USE_BZIP2= yes BUILD_WRKSRC= ${WRKSRC}/gio/fam INSTALL_WRKSRC= ${BUILD_WRKSRC} GNU_CONFIGURE= yes -USE_GNOME= gnomehack gnometarget pkgconfig _glib20 +USE_GNOME= gnomehack pkgconfig _glib20 USE_FAM= yes USE_GMAKE= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo index e0bf9be7e599..d16c3b42fe58 100644 --- a/devel/gio-fam-backend/distinfo +++ b/devel/gio-fam-backend/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.16.5.tar.bz2) = 039f02d47d4071322a3f00abf031e5d9 -SHA256 (gnome2/glib-2.16.5.tar.bz2) = cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20 -SIZE (gnome2/glib-2.16.5.tar.bz2) = 4570123 +MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf +SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100 +SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051 diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist index 4304d626a688..7e06d5a98ee3 100644 --- a/devel/gio-fam-backend/pkg-plist +++ b/devel/gio-fam-backend/pkg-plist @@ -1,5 +1,3 @@ lib/gio/modules/libgiofam.a lib/gio/modules/libgiofam.la lib/gio/modules/libgiofam.so -@dirrmtry lib/gio/modules -@dirrmtry lib/gio diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 810534940c64..33e5a3ed6454 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,12 +3,13 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.117 2008/03/19 04:44:58 marcus Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.137 2009/01/09 21:30:35 kwm Exp $ # +# !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib -PORTVERSION= 2.16.5 -PORTREVISION?= 1 +PORTVERSION= 2.18.4 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ @@ -33,7 +34,7 @@ LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -USE_GNOME= gnomehack gnometarget pkgconfig ltverhack +USE_GNOME= gnomehack pkgconfig ltverhack USE_GMAKE= yes USE_PYTHON= yes USE_PERL5= yes diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index e0bf9be7e599..d16c3b42fe58 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.16.5.tar.bz2) = 039f02d47d4071322a3f00abf031e5d9 -SHA256 (gnome2/glib-2.16.5.tar.bz2) = cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20 -SIZE (gnome2/glib-2.16.5.tar.bz2) = 4570123 +MD5 (gnome2/glib-2.18.4.tar.bz2) = ec25ed261534d870141000ab73f1a2bf +SHA256 (gnome2/glib-2.18.4.tar.bz2) = 6aeb2c845e9fdc388943acdaba2f6357e3007c5ffaa8d666904679cfb40de100 +SIZE (gnome2/glib-2.18.4.tar.bz2) = 4809051 diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in index 3c5676d2eb1e..4791780e29cc 100644 --- a/devel/glib20/files/extra-patch-glib_Makefile.in +++ b/devel/glib20/files/extra-patch-glib_Makefile.in @@ -1,9 +1,9 @@ ---- glib/Makefile.in.orig Wed Jul 19 01:08:13 2006 -+++ glib/Makefile.in Wed Jul 19 01:09:10 2006 -@@ -130,7 +130,7 @@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +--- glib/Makefile.in.orig 2008-12-01 16:15:34.000000000 -0500 ++++ glib/Makefile.in 2008-12-01 16:16:03.000000000 -0500 +@@ -272,7 +272,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ + LD = @LD@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ -licui18n LIBOBJS = @LIBOBJS@ diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 2ba6ab189dda..0345b8acd046 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig 2008-03-17 23:32:05.000000000 -0400 -+++ configure 2008-03-18 17:55:42.000000000 -0400 -@@ -32748,6 +32748,12 @@ cat confdefs.h >>conftest.$ac_ext +--- configure.orig 2008-11-24 13:44:42.000000000 -0600 ++++ configure 2008-11-24 13:50:51.000000000 -0600 +@@ -29576,6 +29576,12 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -13,16 +13,16 @@ int main () { -@@ -34051,7 +34057,7 @@ done +@@ -31407,7 +31413,7 @@ -for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid +for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - { echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -39139,6 +39145,8 @@ fi + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -36810,6 +36816,8 @@ ;; esac fi diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h index 58aa93037507..039571d8b496 100644 --- a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h +++ b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h @@ -1,12 +1,12 @@ ---- gio/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400 -+++ gio/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400 -@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach - #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) - #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) - #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) -+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) - +--- gio/xdgmime/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 ++++ gio/xdgmime/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 +@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) #endif + extern XdgMimeCache **_caches; diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in index 9cec8906fb28..352c0cf6031c 100644 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in @@ -1,6 +1,6 @@ ---- glib/libcharset/Makefile.in.orig 2007-12-21 16:55:09.000000000 -0500 -+++ glib/libcharset/Makefile.in 2007-12-21 16:56:04.000000000 -0500 -@@ -277,15 +277,15 @@ EXTRA_DIST = README config.charset ref-a +--- glib/libcharset/Makefile.in.orig 2008-06-04 00:03:14.000000000 +0200 ++++ glib/libcharset/Makefile.in 2008-06-04 00:05:58.000000000 +0200 +@@ -278,7 +278,7 @@ EXTRA_DIST = README config.charset ref-a codeset.m4 update.sh make-patch.sh libcharset-glib.patch TEST_PROGS = INCLUDES = \ @@ -9,7 +9,8 @@ noinst_LTLIBRARIES = libcharset.la libcharset_la_SOURCES = \ - libcharset.h \ +@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \ + localcharset.h \ localcharset.c -charset_alias = $(DESTDIR)$(libdir)/charset.alias @@ -19,7 +20,7 @@ SUFFIXES = .sed .sin CLEANFILES = charset.alias ref-add.sed ref-del.sed all: all-am -@@ -497,7 +497,7 @@ install-data-am: +@@ -498,7 +498,7 @@ install-data-am: install-dvi: install-dvi-am diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 44bbc76976a6..48f0c14e712e 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -17,6 +17,8 @@ include/glib-2.0/gio/gcontenttype.h include/glib-2.0/gio/gdatainputstream.h include/glib-2.0/gio/gdataoutputstream.h include/glib-2.0/gio/gdrive.h +include/glib-2.0/gio/gemblem.h +include/glib-2.0/gio/gemblemedicon.h include/glib-2.0/gio/gfile.h include/glib-2.0/gio/gfileattribute.h include/glib-2.0/gio/gfileenumerator.h @@ -31,10 +33,12 @@ include/glib-2.0/gio/gfilteroutputstream.h include/glib-2.0/gio/gicon.h include/glib-2.0/gio/ginputstream.h include/glib-2.0/gio/gio.h +include/glib-2.0/gio/gioenums.h include/glib-2.0/gio/gioenumtypes.h include/glib-2.0/gio/gioerror.h include/glib-2.0/gio/giomodule.h include/glib-2.0/gio/gioscheduler.h +include/glib-2.0/gio/giotypes.h include/glib-2.0/gio/gloadableicon.h include/glib-2.0/gio/gmemoryinputstream.h include/glib-2.0/gio/gmemoryoutputstream.h @@ -204,6 +208,7 @@ share/locale/ko/LC_MESSAGES/glib20.mo share/locale/ku/LC_MESSAGES/glib20.mo share/locale/lt/LC_MESSAGES/glib20.mo share/locale/lv/LC_MESSAGES/glib20.mo +share/locale/mai/LC_MESSAGES/glib20.mo share/locale/mg/LC_MESSAGES/glib20.mo share/locale/mk/LC_MESSAGES/glib20.mo share/locale/ml/LC_MESSAGES/glib20.mo @@ -218,6 +223,7 @@ share/locale/oc/LC_MESSAGES/glib20.mo share/locale/or/LC_MESSAGES/glib20.mo share/locale/pa/LC_MESSAGES/glib20.mo share/locale/pl/LC_MESSAGES/glib20.mo +share/locale/ps/LC_MESSAGES/glib20.mo share/locale/pt/LC_MESSAGES/glib20.mo share/locale/pt_BR/LC_MESSAGES/glib20.mo share/locale/ro/LC_MESSAGES/glib20.mo @@ -228,8 +234,8 @@ share/locale/sk/LC_MESSAGES/glib20.mo share/locale/sl/LC_MESSAGES/glib20.mo share/locale/sq/LC_MESSAGES/glib20.mo share/locale/sr/LC_MESSAGES/glib20.mo -share/locale/sr@Latn/LC_MESSAGES/glib20.mo share/locale/sr@ije/LC_MESSAGES/glib20.mo +share/locale/sr@latin/LC_MESSAGES/glib20.mo share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo share/locale/te/LC_MESSAGES/glib20.mo @@ -248,6 +254,9 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm share/glib-2.0/gettext/po @dirrm share/glib-2.0/gettext @dirrm share/glib-2.0 +@exec mkdir -p %D/lib/gio/modules +@dirrmtry lib/gio/modules +@dirrmtry lib/gio @dirrm include/glib-2.0/gobject @dirrm include/glib-2.0/glib @dirrm include/glib-2.0/gio @@ -266,18 +275,24 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/tl @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @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/hy/LC_MESSAGES diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index cea3e3382df6..437f13cbf92b 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -3,16 +3,15 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glibmm/Makefile,v 1.58 2008/03/10 23:01:49 ahze Exp $ +# $MCom: ports/devel/glibmm/Makefile,v 1.68 2008/10/21 15:59:45 mezz Exp $ # PORTNAME= glibmm -PORTVERSION= 2.16.4 +PORTVERSION= 2.18.1 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -28,9 +27,9 @@ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes -USE_GNOME= gnomehack gnometarget glib20 +USE_GNOME= gnomehack glib20 ltverhack USE_PERL5= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index 1f5c23b56d76..61f8ad49d045 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glibmm-2.16.4.tar.bz2) = fe2e91fa93759ffc812e80ca50ace233 -SHA256 (gnome2/glibmm-2.16.4.tar.bz2) = a6d165e61d03e52956a040de4ccd8d35364be22124c6be6d048214aa6d7eae83 -SIZE (gnome2/glibmm-2.16.4.tar.bz2) = 6375753 +MD5 (gnome2/glibmm-2.18.1.tar.bz2) = 942290a4b77dac3ea18a5b70373fe04c +SHA256 (gnome2/glibmm-2.18.1.tar.bz2) = 79641fe9ca2ad2ad4c49f2ebe15f360b16cbbff852eaa51c99b8f36b362ce649 +SIZE (gnome2/glibmm-2.18.1.tar.bz2) = 6714825 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index 4ecfe4391546..c6208677d2fb 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -100,6 +100,7 @@ include/glibmm-%%API_VERSION%%/glibmm/main.h include/glibmm-%%API_VERSION%%/glibmm/markup.h include/glibmm-%%API_VERSION%%/glibmm/miscutils.h include/glibmm-%%API_VERSION%%/glibmm/module.h +include/glibmm-%%API_VERSION%%/glibmm/nodetree.h include/glibmm-%%API_VERSION%%/glibmm/object.h include/glibmm-%%API_VERSION%%/glibmm/objectbase.h include/glibmm-%%API_VERSION%%/glibmm/optioncontext.h @@ -116,6 +117,7 @@ include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/nodetree_p.h include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h include/glibmm-%%API_VERSION%%/glibmm/private/optioncontext_p.h include/glibmm-%%API_VERSION%%/glibmm/private/optionentry_p.h diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile index b17449dbb6cb..aefb73e37044 100644 --- a/devel/gnome-build/Makefile +++ b/devel/gnome-build/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnome-build/Makefile,v 1.5 2007/09/09 22:45:25 mezz Exp $ +# $MCom: ports/devel/gnome-build/Makefile,v 1.9 2008/10/20 03:25:46 mezz Exp $ # PORTNAME= gnome-build -PORTVERSION= 0.2.4 -PORTREVISION= 2 +PORTVERSION= 2.24.1 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -18,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME Build Framework (GBF) BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext -LIB_DEPENDS= gdl-gnome-1.0:${PORTSDIR}/x11-toolkits/gdl +LIB_DEPENDS= gdl-1.0:${PORTSDIR}/x11-toolkits/gdl RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext USE_BZIP2= yes diff --git a/devel/gnome-build/distinfo b/devel/gnome-build/distinfo index f6ab147151ef..df535af68f22 100644 --- a/devel/gnome-build/distinfo +++ b/devel/gnome-build/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-build-0.2.4.tar.bz2) = 1d424be4ec2d7bd2fbac12f08de6f346 -SHA256 (gnome2/gnome-build-0.2.4.tar.bz2) = 25f259ddf33441c8fb8b5a5597b8afc628bff5456c780d5875f05ac379460f63 -SIZE (gnome2/gnome-build-0.2.4.tar.bz2) = 483854 +MD5 (gnome2/gnome-build-2.24.1.tar.bz2) = b35c918b6c0c70652e9eb1d2e45138f1 +SHA256 (gnome2/gnome-build-2.24.1.tar.bz2) = 35c8bf4ebbe93639400985c92322f1be80de3e193ed1d715443949bb9a5c43a0 +SIZE (gnome2/gnome-build-2.24.1.tar.bz2) = 517031 diff --git a/devel/gnome-build/files/patch-src::backends::libgbf_am::gbf-am-build.c b/devel/gnome-build/files/patch-src::backends::libgbf_am::gbf-am-build.c deleted file mode 100644 index 4c8380eb3706..000000000000 --- a/devel/gnome-build/files/patch-src::backends::libgbf_am::gbf-am-build.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/backends/libgbf_am/gbf-am-build.c.orig Thu Oct 16 11:34:19 2003 -+++ src/backends/libgbf_am/gbf-am-build.c Thu Oct 16 11:35:42 2003 -@@ -27,9 +27,9 @@ - #include <stdlib.h> - #include <unistd.h> - #include <string.h> --#include <regex.h> - #include "gbf-i18n.h" - #include "gbf-am-build.h" -+#include <gnuregex.h> - - /* FIXME: mark strings for translation and this file to POTFILES.in */ - diff --git a/devel/gnome-build/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c b/devel/gnome-build/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c deleted file mode 100644 index 698c8f484da1..000000000000 --- a/devel/gnome-build/files/patch-src_backends_libgbf_mkfile_gbf-mkfile-build.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/backends/libgbf_mkfile/gbf-mkfile-build.c.orig Mon May 15 18:06:23 2006 -+++ src/backends/libgbf_mkfile/gbf-mkfile-build.c Mon May 15 18:07:32 2006 -@@ -32,7 +32,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <string.h> --#include <regex.h> - #include "gbf-i18n.h" - #include "gbf-mkfile-build.h" -+#include <gnuregex.h> - diff --git a/devel/gnome-build/pkg-plist b/devel/gnome-build/pkg-plist index 73d5c908782f..60ff88f77411 100644 --- a/devel/gnome-build/pkg-plist +++ b/devel/gnome-build/pkg-plist @@ -1,7 +1,6 @@ bin/gbf-am-parse bin/gbf-mkfile-parse include/gnome-build-1.0/gbf/gbf-backend.h -include/gnome-build-1.0/gbf/gbf-build-info.h include/gnome-build-1.0/gbf/gbf-project-model.h include/gnome-build-1.0/gbf/gbf-project-util.h include/gnome-build-1.0/gbf/gbf-project-view.h @@ -17,10 +16,10 @@ lib/gnome-build-1.0/backends/libgbf-mkfile.la lib/gnome-build-1.0/backends/libgbf-mkfile.so lib/libgbf-1.la lib/libgbf-1.so -lib/libgbf-1.so.1 +lib/libgbf-1.so.2 lib/libgbf-widgets-1.la lib/libgbf-widgets-1.so -lib/libgbf-widgets-1.so.1 +lib/libgbf-widgets-1.so.2 libdata/pkgconfig/gnome-build-1.0.pc share/gnome-build/GBF/AmFiles.pm share/gnome-build/GBF/General.pm @@ -34,16 +33,19 @@ share/locale/be/LC_MESSAGES/gbf-1.mo share/locale/bg/LC_MESSAGES/gbf-1.mo share/locale/ca/LC_MESSAGES/gbf-1.mo share/locale/cs/LC_MESSAGES/gbf-1.mo +share/locale/da/LC_MESSAGES/gbf-1.mo share/locale/de/LC_MESSAGES/gbf-1.mo share/locale/dz/LC_MESSAGES/gbf-1.mo share/locale/el/LC_MESSAGES/gbf-1.mo share/locale/en_CA/LC_MESSAGES/gbf-1.mo share/locale/en_GB/LC_MESSAGES/gbf-1.mo share/locale/es/LC_MESSAGES/gbf-1.mo +share/locale/et/LC_MESSAGES/gbf-1.mo share/locale/eu/LC_MESSAGES/gbf-1.mo share/locale/fi/LC_MESSAGES/gbf-1.mo share/locale/fr/LC_MESSAGES/gbf-1.mo share/locale/gl/LC_MESSAGES/gbf-1.mo +share/locale/gu/LC_MESSAGES/gbf-1.mo share/locale/he/LC_MESSAGES/gbf-1.mo share/locale/hi/LC_MESSAGES/gbf-1.mo share/locale/hr/LC_MESSAGES/gbf-1.mo @@ -55,10 +57,12 @@ share/locale/lt/LC_MESSAGES/gbf-1.mo share/locale/lv/LC_MESSAGES/gbf-1.mo share/locale/mk/LC_MESSAGES/gbf-1.mo share/locale/ml/LC_MESSAGES/gbf-1.mo +share/locale/mr/LC_MESSAGES/gbf-1.mo share/locale/ms/LC_MESSAGES/gbf-1.mo share/locale/nb/LC_MESSAGES/gbf-1.mo share/locale/ne/LC_MESSAGES/gbf-1.mo share/locale/nl/LC_MESSAGES/gbf-1.mo +share/locale/nn/LC_MESSAGES/gbf-1.mo share/locale/oc/LC_MESSAGES/gbf-1.mo share/locale/pa/LC_MESSAGES/gbf-1.mo share/locale/pl/LC_MESSAGES/gbf-1.mo @@ -71,13 +75,15 @@ share/locale/sk/LC_MESSAGES/gbf-1.mo share/locale/sl/LC_MESSAGES/gbf-1.mo share/locale/sq/LC_MESSAGES/gbf-1.mo share/locale/sr/LC_MESSAGES/gbf-1.mo -share/locale/sr@Latn/LC_MESSAGES/gbf-1.mo +share/locale/sr@latin/LC_MESSAGES/gbf-1.mo share/locale/sv/LC_MESSAGES/gbf-1.mo share/locale/th/LC_MESSAGES/gbf-1.mo share/locale/tr/LC_MESSAGES/gbf-1.mo share/locale/uk/LC_MESSAGES/gbf-1.mo share/locale/vi/LC_MESSAGES/gbf-1.mo share/locale/zh_CN/LC_MESSAGES/gbf-1.mo +share/locale/zh_HK/LC_MESSAGES/gbf-1.mo +share/locale/zh_TW/LC_MESSAGES/gbf-1.mo share/pixmaps/gbf-build.png share/pixmaps/gbf-install.png @dirrm share/gnome-build/glade @@ -87,11 +93,17 @@ share/pixmaps/gbf-install.png @dirrm lib/gnome-build-1.0 @dirrm include/gnome-build-1.0/gbf @dirrm include/gnome-build-1.0 +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index 45c002dc1d57..75aa7fa29037 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnome-common/Makefile,v 1.7 2007/09/17 18:37:36 ahze Exp $ +# $MCom: ports/devel/gnome-common/Makefile,v 1.10 2008/09/27 01:52:59 mezz Exp $ # PORTNAME= gnome-common -PORTVERSION= 2.20.0 +PORTVERSION= 2.24.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,7 +18,7 @@ COMMENT= Common automake macros for GNOME and GNOME 2 USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig gnometarget +USE_GNOME= pkgconfig GNU_CONFIGURE= yes .include <bsd.port.mk> diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo index 394b5ed28354..dea6ccade4f9 100644 --- a/devel/gnome-common/distinfo +++ b/devel/gnome-common/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-common-2.20.0.tar.bz2) = 89e47677fb72695c75d2cefac84ff9f1 -SHA256 (gnome2/gnome-common-2.20.0.tar.bz2) = 0e807cfe74a684c494a0949b7f96d231660f323253a89053e3ec32c4f518c8d9 -SIZE (gnome2/gnome-common-2.20.0.tar.bz2) = 64309 +MD5 (gnome2/gnome-common-2.24.0.tar.bz2) = f72230d19ab9f2fa8923dcb078c69e9a +SHA256 (gnome2/gnome-common-2.24.0.tar.bz2) = e36fc07118e9d3cc0a4808cfbc6bfbd03ab5ba1ce0a311df9573dbbc0d189bac +SIZE (gnome2/gnome-common-2.24.0.tar.bz2) = 64560 diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 5ec27ed4142f..cee963b7593c 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/Makefile,v 1.182 2008/03/10 23:08:21 ahze Exp $ +# $MCom: ports/devel/gnome-vfs/Makefile,v 1.185 2008/09/22 10:26:54 kwm Exp $ # PORTNAME= gnome-vfs -PORTVERSION= 2.22.0 -PORTREVISION?= 2 +PORTVERSION= 2.24.0 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 71b68d87f596..0b2dc3c17e30 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.22.0.tar.bz2) = 369105fd82cb99e69e63acab8f3b89b7 -SHA256 (gnome2/gnome-vfs-2.22.0.tar.bz2) = 622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1 -SIZE (gnome2/gnome-vfs-2.22.0.tar.bz2) = 1939765 +MD5 (gnome2/gnome-vfs-2.24.0.tar.bz2) = 870ee8861bfcaeb852934e95657ef83e +SHA256 (gnome2/gnome-vfs-2.24.0.tar.bz2) = b8ae3c81a2d6a3798534e72216899021013b47bc012e405fa00167d190559d94 +SIZE (gnome2/gnome-vfs-2.24.0.tar.bz2) = 1935735 diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h index 69292f2f1a16..7d987f400d90 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h @@ -1,25 +1,12 @@ ---- libgnomevfs/xdgmimecache.h.orig Mon May 29 20:04:24 2006 -+++ libgnomevfs/xdgmimecache.h Mon May 29 20:11:42 2006 -@@ -32,9 +32,19 @@ - typedef struct _XdgMimeCache XdgMimeCache; - - #ifdef XDG_PREFIX --#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) --#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) --#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) -+#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) -+#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) -+#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) -+#define _xdg_mime_cache_get_mime_type_for_data XDG_ENTRY(cache_get_mime_type_for_data) -+#define _xdg_mime_cache_get_mime_type_for_file XDG_ENTRY(cache_get_mime_type_for_file) -+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name) -+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) -+#define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) -+#define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) -+#define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) -+#define _xdg_mime_cache_get_max_buffer_extents XDG_ENTRY(cache_get_max_buffer_extents) +--- libgnomevfs/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 ++++ libgnomevfs/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 +@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) #endif extern XdgMimeCache **_caches; diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index f8b22aaaf1b4..402f3449c6f9 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.17 2008/01/30 17:29:15 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.20 2008/08/06 04:22:49 mezz Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index 72da3bf8ba79..19bf94479dab 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.17 2008/01/30 17:29:15 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.20 2008/08/06 04:22:49 mezz Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index d1e23ffc8251..6625cbfc171a 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -151,6 +151,7 @@ share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/mai/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo @@ -175,7 +176,7 @@ share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo @@ -206,6 +207,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrmtry share/locale/xh @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/rw/LC_MESSAGES @@ -218,6 +221,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.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/bn_IN/LC_MESSAGES diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile index e9a6928b6669..4a5a2837525b 100644 --- a/devel/gnome-vfsmm/Makefile +++ b/devel/gnome-vfsmm/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.27 2008/03/08 16:44:51 marcus Exp $ +# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.29 2008/09/22 11:45:51 kwm Exp $ # PORTNAME= gnome-vfsmm -PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo index 20c4c5507789..857e752d8804 100644 --- a/devel/gnome-vfsmm/distinfo +++ b/devel/gnome-vfsmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 80b86e6f88ee0bd3a1babb686d0be03a -SHA256 (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 0e5d4e55aef65c5144217d4136ac2924f9c1a11f83e7dab13a4e0082e183fa92 -SIZE (gnome2/gnome-vfsmm-2.22.0.tar.bz2) = 354127 +MD5 (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = f02257451583832c4d67f4accba7ad62 +SHA256 (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = ab2fd9067d631254543f5dd33edf0649983e53073cfc697ce7de5157d4ba80ae +SIZE (gnome2/gnome-vfsmm-2.24.0.tar.bz2) = 359035 diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile index 74ba7798298f..853daae75d63 100644 --- a/devel/goffice/Makefile +++ b/devel/goffice/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/goffice/Makefile,v 1.32 2007/09/06 05:01:28 marcus Exp $ +# $MCom: ports/devel/goffice/Makefile,v 1.35 2008/10/20 18:13:37 kwm Exp $ # PORTNAME= goffice -PORTVERSION= 0.6.5 +PORTVERSION= 0.7.2 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -26,6 +26,8 @@ USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION=${PORTVERSION} - +PLIST_SUB= VERSION=${PORTVERSION} \ + SHORT_VER=0.8 +# SHORT_VER=${PORTVERSION:R} + .include <bsd.port.mk> diff --git a/devel/goffice/distinfo b/devel/goffice/distinfo index 9415b8d01277..9125ce83b5ab 100644 --- a/devel/goffice/distinfo +++ b/devel/goffice/distinfo @@ -1,3 +1,3 @@ -MD5 (goffice-0.6.5.tar.bz2) = ab0cf11995b7750f26112669cedf6707 -SHA256 (goffice-0.6.5.tar.bz2) = 15f3454820f8d29cfd724614bcfbe067b39ae33220ffcd1af778e112395a05c5 -SIZE (goffice-0.6.5.tar.bz2) = 1993186 +MD5 (goffice-0.7.2.tar.bz2) = f393f27dbab3b9efd92fe93633ddbfd6 +SHA256 (goffice-0.7.2.tar.bz2) = b885420c0e6a297239dbdc545cb8588dde81cb58034e1fc7e455a873f1cf39e4 +SIZE (goffice-0.7.2.tar.bz2) = 2071249 diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist index 5e44b5fc0726..3ee5d5c04eec 100644 --- a/devel/goffice/pkg-plist +++ b/devel/goffice/pkg-plist @@ -1,143 +1,152 @@ -include/libgoffice-0.6/goffice/app/error-info.h -include/libgoffice-0.6/goffice/app/file.h -include/libgoffice-0.6/goffice/app/go-cmd-context-impl.h -include/libgoffice-0.6/goffice/app/go-cmd-context.h -include/libgoffice-0.6/goffice/app/go-doc-control-impl.h -include/libgoffice-0.6/goffice/app/go-doc-control.h -include/libgoffice-0.6/goffice/app/go-doc-impl.h -include/libgoffice-0.6/goffice/app/go-doc.h -include/libgoffice-0.6/goffice/app/go-plugin-loader-module.h -include/libgoffice-0.6/goffice/app/go-plugin-loader.h -include/libgoffice-0.6/goffice/app/go-plugin-service-impl.h -include/libgoffice-0.6/goffice/app/go-plugin-service.h -include/libgoffice-0.6/goffice/app/go-plugin.h -include/libgoffice-0.6/goffice/app/goffice-app.h -include/libgoffice-0.6/goffice/app/io-context-priv.h -include/libgoffice-0.6/goffice/app/io-context.h -include/libgoffice-0.6/goffice/app/module-plugin-defs.h -include/libgoffice-0.6/goffice/component/go-component-factory.h -include/libgoffice-0.6/goffice/component/go-component.h -include/libgoffice-0.6/goffice/component/goffice-component.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-line.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-text.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-util.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas.h -include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/libfoocanvas.h -include/libgoffice-0.6/goffice/data/go-data-impl.h -include/libgoffice-0.6/goffice/data/go-data-simple.h -include/libgoffice-0.6/goffice/data/go-data.h -include/libgoffice-0.6/goffice/data/goffice-data.h -include/libgoffice-0.6/goffice/drawing/god-anchor.h -include/libgoffice-0.6/goffice/drawing/god-default-attributes.h -include/libgoffice-0.6/goffice/drawing/god-drawing-group.h -include/libgoffice-0.6/goffice/drawing/god-drawing-renderer-gdk.h -include/libgoffice-0.6/goffice/drawing/god-drawing-view.h -include/libgoffice-0.6/goffice/drawing/god-drawing.h -include/libgoffice-0.6/goffice/drawing/god-image-store.h -include/libgoffice-0.6/goffice/drawing/god-image.h -include/libgoffice-0.6/goffice/drawing/god-paragraph-attributes.h -include/libgoffice-0.6/goffice/drawing/god-property-table.h -include/libgoffice-0.6/goffice/drawing/god-shape.h -include/libgoffice-0.6/goffice/drawing/god-text-model.h -include/libgoffice-0.6/goffice/goffice-features.h -include/libgoffice-0.6/goffice/goffice.h -include/libgoffice-0.6/goffice/graph/goffice-graph.h -include/libgoffice-0.6/goffice/graph/gog-axis-line-impl.h -include/libgoffice-0.6/goffice/graph/gog-axis-line.h -include/libgoffice-0.6/goffice/graph/gog-axis.h -include/libgoffice-0.6/goffice/graph/gog-chart-impl.h -include/libgoffice-0.6/goffice/graph/gog-chart-map.h -include/libgoffice-0.6/goffice/graph/gog-chart.h -include/libgoffice-0.6/goffice/graph/gog-child-button.h -include/libgoffice-0.6/goffice/graph/gog-control-foocanvas.h -include/libgoffice-0.6/goffice/graph/gog-data-allocator.h -include/libgoffice-0.6/goffice/graph/gog-data-set.h -include/libgoffice-0.6/goffice/graph/gog-error-bar.h -include/libgoffice-0.6/goffice/graph/gog-graph-impl.h -include/libgoffice-0.6/goffice/graph/gog-graph.h -include/libgoffice-0.6/goffice/graph/gog-grid-line.h -include/libgoffice-0.6/goffice/graph/gog-grid.h -include/libgoffice-0.6/goffice/graph/gog-guru.h -include/libgoffice-0.6/goffice/graph/gog-label.h -include/libgoffice-0.6/goffice/graph/gog-legend.h -include/libgoffice-0.6/goffice/graph/gog-object-xml.h -include/libgoffice-0.6/goffice/graph/gog-object.h -include/libgoffice-0.6/goffice/graph/gog-outlined-object.h -include/libgoffice-0.6/goffice/graph/gog-plot-engine.h -include/libgoffice-0.6/goffice/graph/gog-plot-impl.h -include/libgoffice-0.6/goffice/graph/gog-plot.h -include/libgoffice-0.6/goffice/graph/gog-reg-curve.h -include/libgoffice-0.6/goffice/graph/gog-renderer.h -include/libgoffice-0.6/goffice/graph/gog-series-impl.h -include/libgoffice-0.6/goffice/graph/gog-series-lines.h -include/libgoffice-0.6/goffice/graph/gog-series.h -include/libgoffice-0.6/goffice/graph/gog-smoothed-curve.h -include/libgoffice-0.6/goffice/graph/gog-style.h -include/libgoffice-0.6/goffice/graph/gog-styled-object.h -include/libgoffice-0.6/goffice/graph/gog-theme.h -include/libgoffice-0.6/goffice/graph/gog-trend-line.h -include/libgoffice-0.6/goffice/graph/gog-view.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-color.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-pixmaps.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-stack.h -include/libgoffice-0.6/goffice/gtk/go-action-combo-text.h -include/libgoffice-0.6/goffice/gtk/go-charmap-sel.h -include/libgoffice-0.6/goffice/gtk/go-color-group.h -include/libgoffice-0.6/goffice/gtk/go-color-palette.h -include/libgoffice-0.6/goffice/gtk/go-color-selector.h -include/libgoffice-0.6/goffice/gtk/go-combo-box.h -include/libgoffice-0.6/goffice/gtk/go-combo-color.h -include/libgoffice-0.6/goffice/gtk/go-combo-pixmaps.h -include/libgoffice-0.6/goffice/gtk/go-combo-text.h -include/libgoffice-0.6/goffice/gtk/go-font-sel.h -include/libgoffice-0.6/goffice/gtk/go-format-sel.h -include/libgoffice-0.6/goffice/gtk/go-gradient-selector.h -include/libgoffice-0.6/goffice/gtk/go-graph-widget.h -include/libgoffice-0.6/goffice/gtk/go-line-selector.h -include/libgoffice-0.6/goffice/gtk/go-locale-sel.h -include/libgoffice-0.6/goffice/gtk/go-marker-selector.h -include/libgoffice-0.6/goffice/gtk/go-optionmenu.h -include/libgoffice-0.6/goffice/gtk/go-palette.h -include/libgoffice-0.6/goffice/gtk/go-pattern-selector.h -include/libgoffice-0.6/goffice/gtk/go-pixbuf.h -include/libgoffice-0.6/goffice/gtk/go-rotation-sel.h -include/libgoffice-0.6/goffice/gtk/go-selector.h -include/libgoffice-0.6/goffice/gtk/goffice-gtk.h -include/libgoffice-0.6/goffice/math/go-complex.h -include/libgoffice-0.6/goffice/math/go-cspline.h -include/libgoffice-0.6/goffice/math/go-fft.h -include/libgoffice-0.6/goffice/math/go-math.h -include/libgoffice-0.6/goffice/math/go-rangefunc.h -include/libgoffice-0.6/goffice/math/go-regression.h -include/libgoffice-0.6/goffice/ms-compat/go-ms-parser.h -include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms-client-handler.h -include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms.h -include/libgoffice-0.6/goffice/ms-compat/god-image-ms.h -include/libgoffice-0.6/goffice/utils/datetime.h -include/libgoffice-0.6/goffice/utils/go-cairo.h -include/libgoffice-0.6/goffice/utils/go-color.h -include/libgoffice-0.6/goffice/utils/go-file.h -include/libgoffice-0.6/goffice/utils/go-font.h -include/libgoffice-0.6/goffice/utils/go-format.h -include/libgoffice-0.6/goffice/utils/go-geometry.h -include/libgoffice-0.6/goffice/utils/go-glib-extras.h -include/libgoffice-0.6/goffice/utils/go-gradient.h -include/libgoffice-0.6/goffice/utils/go-image.h -include/libgoffice-0.6/goffice/utils/go-libxml-extras.h -include/libgoffice-0.6/goffice/utils/go-line.h -include/libgoffice-0.6/goffice/utils/go-locale.h -include/libgoffice-0.6/goffice/utils/go-marker.h -include/libgoffice-0.6/goffice/utils/go-pango-extras.h -include/libgoffice-0.6/goffice/utils/go-path.h -include/libgoffice-0.6/goffice/utils/go-pattern.h -include/libgoffice-0.6/goffice/utils/go-undo.h -include/libgoffice-0.6/goffice/utils/go-units.h -include/libgoffice-0.6/goffice/utils/goffice-utils.h -include/libgoffice-0.6/goffice/utils/regutf8.h +include/libgoffice-%%SHORT_VER%%/goffice/app/error-info.h +include/libgoffice-%%SHORT_VER%%/goffice/app/file.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-cmd-context-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-cmd-context.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-conf.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-control-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-control.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader-module.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service.h +include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin.h +include/libgoffice-%%SHORT_VER%%/goffice/app/goffice-app.h +include/libgoffice-%%SHORT_VER%%/goffice/app/io-context-priv.h +include/libgoffice-%%SHORT_VER%%/goffice/app/io-context.h +include/libgoffice-%%SHORT_VER%%/goffice/app/module-plugin-defs.h +include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-factory.h +include/libgoffice-%%SHORT_VER%%/goffice/component/go-component.h +include/libgoffice-%%SHORT_VER%%/goffice/component/goffice-component.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-line.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-text.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-util.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/foo-canvas.h +include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas/libfoocanvas.h +include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-simple.h +include/libgoffice-%%SHORT_VER%%/goffice/data/go-data.h +include/libgoffice-%%SHORT_VER%%/goffice/data/goffice-data.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-anchor.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-default-attributes.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-group.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-renderer-gdk.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-view.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image-store.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-paragraph-attributes.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-property-table.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-shape.h +include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-text-model.h +include/libgoffice-%%SHORT_VER%%/goffice/goffice-features.h +include/libgoffice-%%SHORT_VER%%/goffice/goffice.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/goffice-graph.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-3d-box.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map-3d.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-child-button.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-control-foocanvas.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-allocator.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-set.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-error-bar.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-grid-line.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-grid.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-guru.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-label.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-legend.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-object-xml.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-object.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-outlined-object.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot-engine.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-reg-curve.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-renderer.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-impl.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-lines.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-smoothed-curve.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-style.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-styled-object.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-theme.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-trend-line.h +include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-view.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-3d-rotation-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-color.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-pixmaps.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-stack.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-text.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-charmap-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-group.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-palette.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-box.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-color.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-pixmaps.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-text.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-font-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-format-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-gradient-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-graph-widget.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-image-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-line-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-locale-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-marker-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-optionmenu.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-palette.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pattern-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pixbuf.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-rotation-sel.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-selector.h +include/libgoffice-%%SHORT_VER%%/goffice/gtk/goffice-gtk.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-R.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-complex.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-cspline.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-distribution.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-fft.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-math.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-matrix3x3.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-rangefunc.h +include/libgoffice-%%SHORT_VER%%/goffice/math/go-regression.h +include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/go-ms-parser.h +include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms-client-handler.h +include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms.h +include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-image-ms.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/datetime.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-cairo.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-color.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-file.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-font.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-format.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-geometry.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-glib-extras.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-gradient.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-image.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-libxml-extras.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-line.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-locale.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-marker.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pango-extras.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-path.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pattern.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-persist.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-undo.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/go-units.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/goffice-utils.h +include/libgoffice-%%SHORT_VER%%/goffice/utils/regutf8.h lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so @@ -145,12 +154,12 @@ lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-barcol-prefs.glade lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-minmax-prefs.glade lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.a -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.la -lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.so -lib/goffice/%%VERSION%%/plugins/plot_boxes/gog-boxplot-prefs.glade -lib/goffice/%%VERSION%%/plugins/plot_boxes/plot-types.xml -lib/goffice/%%VERSION%%/plugins/plot_boxes/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.a +lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.la +lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.so +lib/goffice/%%VERSION%%/plugins/plot_distrib/gog-boxplot-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_distrib/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_distrib/plugin.xml lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.glade lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-series.glade lib/goffice/%%VERSION%%/plugins/plot_pie/gog-ring-prefs.glade @@ -164,7 +173,8 @@ lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml lib/goffice/%%VERSION%%/plugins/plot_radar/radar.a lib/goffice/%%VERSION%%/plugins/plot_radar/radar.la lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so -lib/goffice/%%VERSION%%/plugins/plot_surface/gog-contour-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-surface-prefs.glade lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a @@ -195,109 +205,112 @@ lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so lib/goffice/%%VERSION%%/plugins/smoothing/types.xml -lib/libgoffice-0.6.a -lib/libgoffice-0.6.la -lib/libgoffice-0.6.so -lib/libgoffice-0.6.so.6 -libdata/pkgconfig/libgoffice-0.6.pc -share/doc/goffice-0.6/GOComboBox.html -share/doc/goffice-0.6/GOComponent.html -share/doc/goffice-0.6/GOOptionMenu.html -share/doc/goffice-0.6/GOPalette.html -share/doc/goffice-0.6/GOPluginLoader.html -share/doc/goffice-0.6/GOSelector.html -share/doc/goffice-0.6/GOUndoUnary.html -share/doc/goffice-0.6/GogDataAllocator.html -share/doc/goffice-0.6/GogDataset.html -share/doc/goffice-0.6/GogObject.html -share/doc/goffice-0.6/GogOutlinedView.html -share/doc/goffice-0.6/GogRegCurve.html -share/doc/goffice-0.6/GogSmoothedCurve.html -share/doc/goffice-0.6/GogStyledObject.html -share/doc/goffice-0.6/GogView.html -share/doc/goffice-0.6/ch01.html -share/doc/goffice-0.6/ch02.html -share/doc/goffice-0.6/ch03.html -share/doc/goffice-0.6/ch04.html -share/doc/goffice-0.6/ch05.html -share/doc/goffice-0.6/ch06.html -share/doc/goffice-0.6/ch07.html -share/doc/goffice-0.6/ch08.html -share/doc/goffice-0.6/ch09.html -share/doc/goffice-0.6/ch10.html -share/doc/goffice-0.6/ch11.html -share/doc/goffice-0.6/ch12.html -share/doc/goffice-0.6/ch13.html -share/doc/goffice-0.6/goffice-0.6.devhelp -share/doc/goffice-0.6/goffice-0.6.devhelp2 -share/doc/goffice-0.6/goffice-06-go-cairo.html -share/doc/goffice-0.6/goffice-06-go-charmap-sel.html -share/doc/goffice-0.6/goffice-06-go-cmd-context.html -share/doc/goffice-0.6/goffice-06-go-color.html -share/doc/goffice-0.6/goffice-06-go-combo-color.html -share/doc/goffice-0.6/goffice-06-go-combo-pixmaps.html -share/doc/goffice-0.6/goffice-06-go-combo-text.html -share/doc/goffice-0.6/goffice-06-go-complex.html -share/doc/goffice-0.6/goffice-06-go-component-factory.html -share/doc/goffice-0.6/goffice-06-go-data.html -share/doc/goffice-0.6/goffice-06-go-doc-control.html -share/doc/goffice-0.6/goffice-06-go-doc.html -share/doc/goffice-0.6/goffice-06-go-fft.html -share/doc/goffice-0.6/goffice-06-go-file.html -share/doc/goffice-0.6/goffice-06-go-font-sel.html -share/doc/goffice-0.6/goffice-06-go-font.html -share/doc/goffice-0.6/goffice-06-go-format-sel.html -share/doc/goffice-0.6/goffice-06-go-format.html -share/doc/goffice-0.6/goffice-06-go-geometry.html -share/doc/goffice-0.6/goffice-06-go-glib-extras.html -share/doc/goffice-0.6/goffice-06-go-gradient.html -share/doc/goffice-0.6/goffice-06-go-libxml-extras.html -share/doc/goffice-0.6/goffice-06-go-line.html -share/doc/goffice-0.6/goffice-06-go-locale-sel.html -share/doc/goffice-0.6/goffice-06-go-marker.html -share/doc/goffice-0.6/goffice-06-go-math.html -share/doc/goffice-0.6/goffice-06-go-path.html -share/doc/goffice-0.6/goffice-06-go-pattern.html -share/doc/goffice-0.6/goffice-06-go-plugin-loader-module.html -share/doc/goffice-0.6/goffice-06-go-plugin-service.html -share/doc/goffice-0.6/goffice-06-go-plugin.html -share/doc/goffice-0.6/goffice-06-go-regression.html -share/doc/goffice-0.6/goffice-06-go-rotation-sel.html -share/doc/goffice-0.6/goffice-06-go-units.html -share/doc/goffice-0.6/goffice-06-gog-axis-line.html -share/doc/goffice-0.6/goffice-06-gog-axis.html -share/doc/goffice-0.6/goffice-06-gog-chart-map.html -share/doc/goffice-0.6/goffice-06-gog-chart.html -share/doc/goffice-0.6/goffice-06-gog-control-foocanvas.html -share/doc/goffice-0.6/goffice-06-gog-error-bar.html -share/doc/goffice-0.6/goffice-06-gog-graph.html -share/doc/goffice-0.6/goffice-06-gog-grid-line.html -share/doc/goffice-0.6/goffice-06-gog-grid.html -share/doc/goffice-0.6/goffice-06-gog-guru.html -share/doc/goffice-0.6/goffice-06-gog-label.html -share/doc/goffice-0.6/goffice-06-gog-legend.html -share/doc/goffice-0.6/goffice-06-gog-plot-engine.html -share/doc/goffice-0.6/goffice-06-gog-plot.html -share/doc/goffice-0.6/goffice-06-gog-renderer.html -share/doc/goffice-0.6/goffice-06-gog-series-lines.html -share/doc/goffice-0.6/goffice-06-gog-series.html -share/doc/goffice-0.6/goffice-06-gog-style.html -share/doc/goffice-0.6/goffice-06-gog-theme.html -share/doc/goffice-0.6/goffice-06-gog-trend-line.html -share/doc/goffice-0.6/home.png -share/doc/goffice-0.6/index.html -share/doc/goffice-0.6/index.sgml -share/doc/goffice-0.6/left.png -share/doc/goffice-0.6/pt01.html -share/doc/goffice-0.6/pt02.html -share/doc/goffice-0.6/pt03.html -share/doc/goffice-0.6/right.png -share/doc/goffice-0.6/style.css -share/doc/goffice-0.6/up.png +lib/libgoffice-%%SHORT_VER%%.a +lib/libgoffice-%%SHORT_VER%%.la +lib/libgoffice-%%SHORT_VER%%.so +lib/libgoffice-%%SHORT_VER%%.so.7 +libdata/pkgconfig/libgoffice-%%SHORT_VER%%.pc +%%DOCSDIR%%-%%SHORT_VER%%/GOComboBox.html +%%DOCSDIR%%-%%SHORT_VER%%/GOComponent.html +%%DOCSDIR%%-%%SHORT_VER%%/GOOptionMenu.html +%%DOCSDIR%%-%%SHORT_VER%%/GOPalette.html +%%DOCSDIR%%-%%SHORT_VER%%/GOPluginLoader.html +%%DOCSDIR%%-%%SHORT_VER%%/GOSelector.html +%%DOCSDIR%%-%%SHORT_VER%%/GOUndoUnary.html +%%DOCSDIR%%-%%SHORT_VER%%/GogDataAllocator.html +%%DOCSDIR%%-%%SHORT_VER%%/GogDataset.html +%%DOCSDIR%%-%%SHORT_VER%%/GogObject.html +%%DOCSDIR%%-%%SHORT_VER%%/GogOutlinedView.html +%%DOCSDIR%%-%%SHORT_VER%%/GogRegCurve.html +%%DOCSDIR%%-%%SHORT_VER%%/GogSmoothedCurve.html +%%DOCSDIR%%-%%SHORT_VER%%/GogStyledObject.html +%%DOCSDIR%%-%%SHORT_VER%%/GogView.html +%%DOCSDIR%%-%%SHORT_VER%%/ch01.html +%%DOCSDIR%%-%%SHORT_VER%%/ch02.html +%%DOCSDIR%%-%%SHORT_VER%%/ch03.html +%%DOCSDIR%%-%%SHORT_VER%%/ch04.html +%%DOCSDIR%%-%%SHORT_VER%%/ch05.html +%%DOCSDIR%%-%%SHORT_VER%%/ch06.html +%%DOCSDIR%%-%%SHORT_VER%%/ch07.html +%%DOCSDIR%%-%%SHORT_VER%%/ch08.html +%%DOCSDIR%%-%%SHORT_VER%%/ch09.html +%%DOCSDIR%%-%%SHORT_VER%%/ch10.html +%%DOCSDIR%%-%%SHORT_VER%%/ch11.html +%%DOCSDIR%%-%%SHORT_VER%%/ch12.html +%%DOCSDIR%%-%%SHORT_VER%%/ch13.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-%%SHORT_VER%%.devhelp +%%DOCSDIR%%-%%SHORT_VER%%/goffice-%%SHORT_VER%%.devhelp2 +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-cairo.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-charmap-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-cmd-context.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-color.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-color.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-pixmaps.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-combo-text.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-complex.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-component-factory.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-data.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-doc-control.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-doc.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-fft.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-file.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-font-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-font.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-format-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-format.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-geometry.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-glib-extras.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-gradient.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-libxml-extras.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-line.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-locale-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-marker.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-math.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-path.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-pattern.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin-loader-module.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin-service.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-plugin.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-regression.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-rotation-sel.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-go-units.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-axis-line.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-axis.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-chart-map.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-chart.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-control-foocanvas.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-error-bar.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-graph.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-grid-line.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-grid.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-guru.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-label.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-legend.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-plot-engine.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-plot.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-renderer.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-series-lines.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-series.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-style.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-theme.html +%%DOCSDIR%%-%%SHORT_VER%%/goffice-08-gog-trend-line.html +%%DOCSDIR%%-%%SHORT_VER%%/home.png +%%DOCSDIR%%-%%SHORT_VER%%/index.html +%%DOCSDIR%%-%%SHORT_VER%%/index.sgml +%%DOCSDIR%%-%%SHORT_VER%%/left.png +%%DOCSDIR%%-%%SHORT_VER%%/pt01.html +%%DOCSDIR%%-%%SHORT_VER%%/pt02.html +%%DOCSDIR%%-%%SHORT_VER%%/pt03.html +%%DOCSDIR%%-%%SHORT_VER%%/right.png +%%DOCSDIR%%-%%SHORT_VER%%/style.css +%%DOCSDIR%%-%%SHORT_VER%%/up.png +%%DATADIR%%/%%VERSION%%/glade/go-3d-rotation-sel.glade %%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade %%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade %%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade +%%DATADIR%%/%%VERSION%%/glade/go-image-sel.glade %%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade +%%DATADIR%%/%%VERSION%%/glade/gog-3d-box-prefs.glade %%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade %%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade %%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade @@ -366,7 +379,6 @@ share/pixmaps/goffice/%%VERSION%%/bar-vboth.png share/pixmaps/goffice/%%VERSION%%/bar-vminus.png share/pixmaps/goffice/%%VERSION%%/bar-vplus.png share/pixmaps/goffice/%%VERSION%%/bar.xpm -share/pixmaps/goffice/%%VERSION%%/boxplot.xpm share/pixmaps/goffice/%%VERSION%%/bubble.xpm share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png @@ -428,6 +440,7 @@ share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_prob_1_1.png share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png @@ -455,11 +468,13 @@ share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png share/pixmaps/goffice/%%VERSION%%/chart_surface_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_surface_2_2.png share/pixmaps/goffice/%%VERSION%%/color.xpm share/pixmaps/goffice/%%VERSION%%/column.xpm +share/pixmaps/goffice/%%VERSION%%/contour.xpm +share/pixmaps/goffice/%%VERSION%%/dist.xpm share/pixmaps/goffice/%%VERSION%%/doughnut.xpm share/pixmaps/goffice/%%VERSION%%/dropbar.xpm -share/pixmaps/goffice/%%VERSION%%/hist.xpm share/pixmaps/goffice/%%VERSION%%/linegraph.xpm share/pixmaps/goffice/%%VERSION%%/minmax.xpm share/pixmaps/goffice/%%VERSION%%/pie.xpm @@ -469,18 +484,12 @@ share/pixmaps/goffice/%%VERSION%%/scatter.xpm share/pixmaps/goffice/%%VERSION%%/stock.xpm share/pixmaps/goffice/%%VERSION%%/surface.xpm @dirrm share/pixmaps/goffice/%%VERSION%% -@dirrm share/pixmaps/goffice -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr +@dirrmtry share/pixmaps/goffice @dirrm %%DATADIR%%/%%VERSION%%/patterns @dirrm %%DATADIR%%/%%VERSION%%/glade @dirrm %%DATADIR%%/%%VERSION%% -@dirrm %%DATADIR%% -@dirrm share/doc/goffice-0.6 +@dirrmtry %%DATADIR%% +@dirrm %%DOCSDIR%%-%%SHORT_VER%% @dirrm lib/goffice/%%VERSION%%/plugins/smoothing @dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit @dirrm lib/goffice/%%VERSION%%/plugins/reg_linear @@ -488,21 +497,27 @@ share/pixmaps/goffice/%%VERSION%%/surface.xpm @dirrm lib/goffice/%%VERSION%%/plugins/plot_surface @dirrm lib/goffice/%%VERSION%%/plugins/plot_radar @dirrm lib/goffice/%%VERSION%%/plugins/plot_pie -@dirrm lib/goffice/%%VERSION%%/plugins/plot_boxes +@dirrm lib/goffice/%%VERSION%%/plugins/plot_distrib @dirrm lib/goffice/%%VERSION%%/plugins/plot_barcol @dirrm lib/goffice/%%VERSION%%/plugins @dirrm lib/goffice/%%VERSION%% @dirrmtry lib/goffice -@dirrm include/libgoffice-0.6/goffice/utils -@dirrm include/libgoffice-0.6/goffice/ms-compat -@dirrm include/libgoffice-0.6/goffice/math -@dirrm include/libgoffice-0.6/goffice/gtk -@dirrm include/libgoffice-0.6/goffice/graph -@dirrm include/libgoffice-0.6/goffice/drawing -@dirrm include/libgoffice-0.6/goffice/data -@dirrm include/libgoffice-0.6/goffice/cut-n-paste/foocanvas -@dirrm include/libgoffice-0.6/goffice/cut-n-paste -@dirrm include/libgoffice-0.6/goffice/component -@dirrm include/libgoffice-0.6/goffice/app -@dirrm include/libgoffice-0.6/goffice -@dirrm include/libgoffice-0.6 +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/utils +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/ms-compat +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/math +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/gtk +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/graph +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/drawing +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/data +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste/foocanvas +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/cut-n-paste +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/component +@dirrm include/libgoffice-%%SHORT_VER%%/goffice/app +@dirrm include/libgoffice-%%SHORT_VER%%/goffice +@dirrm include/libgoffice-%%SHORT_VER%% +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile new file mode 100644 index 000000000000..ada358a453a5 --- /dev/null +++ b/devel/goffice06/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: goffice +# Date created: 07 June 2005 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/goffice06/Makefile,v 1.1 2008/09/09 00:10:24 kwm Exp $ +# + +PORTNAME= goffice +PORTVERSION= 0.6.5 +CATEGORIES= devel gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GLib/GTK+ set of document centric objects and utilities + +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre + +NO_LATEST_LINK= yes + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ + libgsf_gnome libgnomeui ltverhack +USE_GETTEXT= yes +USE_AUTOTOOLS= libtool:15 +USE_LDCONFIG= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +PLIST_SUB= VERSION=${PORTVERSION} + +.include <bsd.port.mk> diff --git a/devel/goffice06/distinfo b/devel/goffice06/distinfo new file mode 100644 index 000000000000..9415b8d01277 --- /dev/null +++ b/devel/goffice06/distinfo @@ -0,0 +1,3 @@ +MD5 (goffice-0.6.5.tar.bz2) = ab0cf11995b7750f26112669cedf6707 +SHA256 (goffice-0.6.5.tar.bz2) = 15f3454820f8d29cfd724614bcfbe067b39ae33220ffcd1af778e112395a05c5 +SIZE (goffice-0.6.5.tar.bz2) = 1993186 diff --git a/devel/goffice06/pkg-descr b/devel/goffice06/pkg-descr new file mode 100644 index 000000000000..0d48f505271e --- /dev/null +++ b/devel/goffice06/pkg-descr @@ -0,0 +1,11 @@ +Goffice is a set of document centric components for GLib and GTK+. + +There are common operations for document centric applications that are +conceptually simple, but complex to implement fully. + - plugins + - load/save documents + - undo/redo + +Goffice provides a single library for performing such operations. + +WWW: http://live.gnome.org/libgoffice diff --git a/devel/goffice06/pkg-plist b/devel/goffice06/pkg-plist new file mode 100644 index 000000000000..271e89099305 --- /dev/null +++ b/devel/goffice06/pkg-plist @@ -0,0 +1,508 @@ +include/libgoffice-0.6/goffice/app/error-info.h +include/libgoffice-0.6/goffice/app/file.h +include/libgoffice-0.6/goffice/app/go-cmd-context-impl.h +include/libgoffice-0.6/goffice/app/go-cmd-context.h +include/libgoffice-0.6/goffice/app/go-doc-control-impl.h +include/libgoffice-0.6/goffice/app/go-doc-control.h +include/libgoffice-0.6/goffice/app/go-doc-impl.h +include/libgoffice-0.6/goffice/app/go-doc.h +include/libgoffice-0.6/goffice/app/go-plugin-loader-module.h +include/libgoffice-0.6/goffice/app/go-plugin-loader.h +include/libgoffice-0.6/goffice/app/go-plugin-service-impl.h +include/libgoffice-0.6/goffice/app/go-plugin-service.h +include/libgoffice-0.6/goffice/app/go-plugin.h +include/libgoffice-0.6/goffice/app/goffice-app.h +include/libgoffice-0.6/goffice/app/io-context-priv.h +include/libgoffice-0.6/goffice/app/io-context.h +include/libgoffice-0.6/goffice/app/module-plugin-defs.h +include/libgoffice-0.6/goffice/component/go-component-factory.h +include/libgoffice-0.6/goffice/component/go-component.h +include/libgoffice-0.6/goffice/component/goffice-component.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-line.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-text.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-util.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/foo-canvas.h +include/libgoffice-0.6/goffice/cut-n-paste/foocanvas/libfoocanvas.h +include/libgoffice-0.6/goffice/data/go-data-impl.h +include/libgoffice-0.6/goffice/data/go-data-simple.h +include/libgoffice-0.6/goffice/data/go-data.h +include/libgoffice-0.6/goffice/data/goffice-data.h +include/libgoffice-0.6/goffice/drawing/god-anchor.h +include/libgoffice-0.6/goffice/drawing/god-default-attributes.h +include/libgoffice-0.6/goffice/drawing/god-drawing-group.h +include/libgoffice-0.6/goffice/drawing/god-drawing-renderer-gdk.h +include/libgoffice-0.6/goffice/drawing/god-drawing-view.h +include/libgoffice-0.6/goffice/drawing/god-drawing.h +include/libgoffice-0.6/goffice/drawing/god-image-store.h +include/libgoffice-0.6/goffice/drawing/god-image.h +include/libgoffice-0.6/goffice/drawing/god-paragraph-attributes.h +include/libgoffice-0.6/goffice/drawing/god-property-table.h +include/libgoffice-0.6/goffice/drawing/god-shape.h +include/libgoffice-0.6/goffice/drawing/god-text-model.h +include/libgoffice-0.6/goffice/goffice-features.h +include/libgoffice-0.6/goffice/goffice.h +include/libgoffice-0.6/goffice/graph/goffice-graph.h +include/libgoffice-0.6/goffice/graph/gog-axis-line-impl.h +include/libgoffice-0.6/goffice/graph/gog-axis-line.h +include/libgoffice-0.6/goffice/graph/gog-axis.h +include/libgoffice-0.6/goffice/graph/gog-chart-impl.h +include/libgoffice-0.6/goffice/graph/gog-chart-map.h +include/libgoffice-0.6/goffice/graph/gog-chart.h +include/libgoffice-0.6/goffice/graph/gog-child-button.h +include/libgoffice-0.6/goffice/graph/gog-control-foocanvas.h +include/libgoffice-0.6/goffice/graph/gog-data-allocator.h +include/libgoffice-0.6/goffice/graph/gog-data-set.h +include/libgoffice-0.6/goffice/graph/gog-error-bar.h +include/libgoffice-0.6/goffice/graph/gog-graph-impl.h +include/libgoffice-0.6/goffice/graph/gog-graph.h +include/libgoffice-0.6/goffice/graph/gog-grid-line.h +include/libgoffice-0.6/goffice/graph/gog-grid.h +include/libgoffice-0.6/goffice/graph/gog-guru.h +include/libgoffice-0.6/goffice/graph/gog-label.h +include/libgoffice-0.6/goffice/graph/gog-legend.h +include/libgoffice-0.6/goffice/graph/gog-object-xml.h +include/libgoffice-0.6/goffice/graph/gog-object.h +include/libgoffice-0.6/goffice/graph/gog-outlined-object.h +include/libgoffice-0.6/goffice/graph/gog-plot-engine.h +include/libgoffice-0.6/goffice/graph/gog-plot-impl.h +include/libgoffice-0.6/goffice/graph/gog-plot.h +include/libgoffice-0.6/goffice/graph/gog-reg-curve.h +include/libgoffice-0.6/goffice/graph/gog-renderer.h +include/libgoffice-0.6/goffice/graph/gog-series-impl.h +include/libgoffice-0.6/goffice/graph/gog-series-lines.h +include/libgoffice-0.6/goffice/graph/gog-series.h +include/libgoffice-0.6/goffice/graph/gog-smoothed-curve.h +include/libgoffice-0.6/goffice/graph/gog-style.h +include/libgoffice-0.6/goffice/graph/gog-styled-object.h +include/libgoffice-0.6/goffice/graph/gog-theme.h +include/libgoffice-0.6/goffice/graph/gog-trend-line.h +include/libgoffice-0.6/goffice/graph/gog-view.h +include/libgoffice-0.6/goffice/gtk/go-action-combo-color.h +include/libgoffice-0.6/goffice/gtk/go-action-combo-pixmaps.h +include/libgoffice-0.6/goffice/gtk/go-action-combo-stack.h +include/libgoffice-0.6/goffice/gtk/go-action-combo-text.h +include/libgoffice-0.6/goffice/gtk/go-charmap-sel.h +include/libgoffice-0.6/goffice/gtk/go-color-group.h +include/libgoffice-0.6/goffice/gtk/go-color-palette.h +include/libgoffice-0.6/goffice/gtk/go-color-selector.h +include/libgoffice-0.6/goffice/gtk/go-combo-box.h +include/libgoffice-0.6/goffice/gtk/go-combo-color.h +include/libgoffice-0.6/goffice/gtk/go-combo-pixmaps.h +include/libgoffice-0.6/goffice/gtk/go-combo-text.h +include/libgoffice-0.6/goffice/gtk/go-font-sel.h +include/libgoffice-0.6/goffice/gtk/go-format-sel.h +include/libgoffice-0.6/goffice/gtk/go-gradient-selector.h +include/libgoffice-0.6/goffice/gtk/go-graph-widget.h +include/libgoffice-0.6/goffice/gtk/go-line-selector.h +include/libgoffice-0.6/goffice/gtk/go-locale-sel.h +include/libgoffice-0.6/goffice/gtk/go-marker-selector.h +include/libgoffice-0.6/goffice/gtk/go-optionmenu.h +include/libgoffice-0.6/goffice/gtk/go-palette.h +include/libgoffice-0.6/goffice/gtk/go-pattern-selector.h +include/libgoffice-0.6/goffice/gtk/go-pixbuf.h +include/libgoffice-0.6/goffice/gtk/go-rotation-sel.h +include/libgoffice-0.6/goffice/gtk/go-selector.h +include/libgoffice-0.6/goffice/gtk/goffice-gtk.h +include/libgoffice-0.6/goffice/math/go-complex.h +include/libgoffice-0.6/goffice/math/go-cspline.h +include/libgoffice-0.6/goffice/math/go-fft.h +include/libgoffice-0.6/goffice/math/go-math.h +include/libgoffice-0.6/goffice/math/go-rangefunc.h +include/libgoffice-0.6/goffice/math/go-regression.h +include/libgoffice-0.6/goffice/ms-compat/go-ms-parser.h +include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms-client-handler.h +include/libgoffice-0.6/goffice/ms-compat/god-drawing-ms.h +include/libgoffice-0.6/goffice/ms-compat/god-image-ms.h +include/libgoffice-0.6/goffice/utils/datetime.h +include/libgoffice-0.6/goffice/utils/go-cairo.h +include/libgoffice-0.6/goffice/utils/go-color.h +include/libgoffice-0.6/goffice/utils/go-file.h +include/libgoffice-0.6/goffice/utils/go-font.h +include/libgoffice-0.6/goffice/utils/go-format.h +include/libgoffice-0.6/goffice/utils/go-geometry.h +include/libgoffice-0.6/goffice/utils/go-glib-extras.h +include/libgoffice-0.6/goffice/utils/go-gradient.h +include/libgoffice-0.6/goffice/utils/go-image.h +include/libgoffice-0.6/goffice/utils/go-libxml-extras.h +include/libgoffice-0.6/goffice/utils/go-line.h +include/libgoffice-0.6/goffice/utils/go-locale.h +include/libgoffice-0.6/goffice/utils/go-marker.h +include/libgoffice-0.6/goffice/utils/go-pango-extras.h +include/libgoffice-0.6/goffice/utils/go-path.h +include/libgoffice-0.6/goffice/utils/go-pattern.h +include/libgoffice-0.6/goffice/utils/go-undo.h +include/libgoffice-0.6/goffice/utils/go-units.h +include/libgoffice-0.6/goffice/utils/goffice-utils.h +include/libgoffice-0.6/goffice/utils/regutf8.h +lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.a +lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.la +lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so +lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-barcol-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-minmax-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.a +lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.la +lib/goffice/%%VERSION%%/plugins/plot_boxes/boxplot.so +lib/goffice/%%VERSION%%/plugins/plot_boxes/gog-boxplot-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_boxes/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_boxes/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-series.glade +lib/goffice/%%VERSION%%/plugins/plot_pie/gog-ring-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_pie/pie.a +lib/goffice/%%VERSION%%/plugins/plot_pie/pie.la +lib/goffice/%%VERSION%%/plugins/plot_pie/pie.so +lib/goffice/%%VERSION%%/plugins/plot_pie/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_pie/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_radar/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_radar/radar.a +lib/goffice/%%VERSION%%/plugins/plot_radar/radar.la +lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so +lib/goffice/%%VERSION%%/plugins/plot_surface/gog-contour-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_surface/surface.a +lib/goffice/%%VERSION%%/plugins/plot_surface/surface.la +lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so +lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-color-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.glade +lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml +lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml +lib/goffice/%%VERSION%%/plugins/plot_xy/xy.a +lib/goffice/%%VERSION%%/plugins/plot_xy/xy.la +lib/goffice/%%VERSION%%/plugins/plot_xy/xy.so +lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.a +lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.la +lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.so +lib/goffice/%%VERSION%%/plugins/reg_linear/plugin.xml +lib/goffice/%%VERSION%%/plugins/reg_linear/reg-types.xml +lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.a +lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.la +lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so +lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml +lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml +lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.glade +lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.glade +lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml +lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.a +lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.la +lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so +lib/goffice/%%VERSION%%/plugins/smoothing/types.xml +lib/libgoffice-0.6.a +lib/libgoffice-0.6.la +lib/libgoffice-0.6.so +lib/libgoffice-0.6.so.6 +libdata/pkgconfig/libgoffice-0.6.pc +share/doc/goffice-0.6/GOComboBox.html +share/doc/goffice-0.6/GOComponent.html +share/doc/goffice-0.6/GOOptionMenu.html +share/doc/goffice-0.6/GOPalette.html +share/doc/goffice-0.6/GOPluginLoader.html +share/doc/goffice-0.6/GOSelector.html +share/doc/goffice-0.6/GOUndoUnary.html +share/doc/goffice-0.6/GogDataAllocator.html +share/doc/goffice-0.6/GogDataset.html +share/doc/goffice-0.6/GogObject.html +share/doc/goffice-0.6/GogOutlinedView.html +share/doc/goffice-0.6/GogRegCurve.html +share/doc/goffice-0.6/GogSmoothedCurve.html +share/doc/goffice-0.6/GogStyledObject.html +share/doc/goffice-0.6/GogView.html +share/doc/goffice-0.6/ch01.html +share/doc/goffice-0.6/ch02.html +share/doc/goffice-0.6/ch03.html +share/doc/goffice-0.6/ch04.html +share/doc/goffice-0.6/ch05.html +share/doc/goffice-0.6/ch06.html +share/doc/goffice-0.6/ch07.html +share/doc/goffice-0.6/ch08.html +share/doc/goffice-0.6/ch09.html +share/doc/goffice-0.6/ch10.html +share/doc/goffice-0.6/ch11.html +share/doc/goffice-0.6/ch12.html +share/doc/goffice-0.6/ch13.html +share/doc/goffice-0.6/goffice-0.6.devhelp +share/doc/goffice-0.6/goffice-0.6.devhelp2 +share/doc/goffice-0.6/goffice-06-go-cairo.html +share/doc/goffice-0.6/goffice-06-go-charmap-sel.html +share/doc/goffice-0.6/goffice-06-go-cmd-context.html +share/doc/goffice-0.6/goffice-06-go-color.html +share/doc/goffice-0.6/goffice-06-go-combo-color.html +share/doc/goffice-0.6/goffice-06-go-combo-pixmaps.html +share/doc/goffice-0.6/goffice-06-go-combo-text.html +share/doc/goffice-0.6/goffice-06-go-complex.html +share/doc/goffice-0.6/goffice-06-go-component-factory.html +share/doc/goffice-0.6/goffice-06-go-data.html +share/doc/goffice-0.6/goffice-06-go-doc-control.html +share/doc/goffice-0.6/goffice-06-go-doc.html +share/doc/goffice-0.6/goffice-06-go-fft.html +share/doc/goffice-0.6/goffice-06-go-file.html +share/doc/goffice-0.6/goffice-06-go-font-sel.html +share/doc/goffice-0.6/goffice-06-go-font.html +share/doc/goffice-0.6/goffice-06-go-format-sel.html +share/doc/goffice-0.6/goffice-06-go-format.html +share/doc/goffice-0.6/goffice-06-go-geometry.html +share/doc/goffice-0.6/goffice-06-go-glib-extras.html +share/doc/goffice-0.6/goffice-06-go-gradient.html +share/doc/goffice-0.6/goffice-06-go-libxml-extras.html +share/doc/goffice-0.6/goffice-06-go-line.html +share/doc/goffice-0.6/goffice-06-go-locale-sel.html +share/doc/goffice-0.6/goffice-06-go-marker.html +share/doc/goffice-0.6/goffice-06-go-math.html +share/doc/goffice-0.6/goffice-06-go-path.html +share/doc/goffice-0.6/goffice-06-go-pattern.html +share/doc/goffice-0.6/goffice-06-go-plugin-loader-module.html +share/doc/goffice-0.6/goffice-06-go-plugin-service.html +share/doc/goffice-0.6/goffice-06-go-plugin.html +share/doc/goffice-0.6/goffice-06-go-regression.html +share/doc/goffice-0.6/goffice-06-go-rotation-sel.html +share/doc/goffice-0.6/goffice-06-go-units.html +share/doc/goffice-0.6/goffice-06-gog-axis-line.html +share/doc/goffice-0.6/goffice-06-gog-axis.html +share/doc/goffice-0.6/goffice-06-gog-chart-map.html +share/doc/goffice-0.6/goffice-06-gog-chart.html +share/doc/goffice-0.6/goffice-06-gog-control-foocanvas.html +share/doc/goffice-0.6/goffice-06-gog-error-bar.html +share/doc/goffice-0.6/goffice-06-gog-graph.html +share/doc/goffice-0.6/goffice-06-gog-grid-line.html +share/doc/goffice-0.6/goffice-06-gog-grid.html +share/doc/goffice-0.6/goffice-06-gog-guru.html +share/doc/goffice-0.6/goffice-06-gog-label.html +share/doc/goffice-0.6/goffice-06-gog-legend.html +share/doc/goffice-0.6/goffice-06-gog-plot-engine.html +share/doc/goffice-0.6/goffice-06-gog-plot.html +share/doc/goffice-0.6/goffice-06-gog-renderer.html +share/doc/goffice-0.6/goffice-06-gog-series-lines.html +share/doc/goffice-0.6/goffice-06-gog-series.html +share/doc/goffice-0.6/goffice-06-gog-style.html +share/doc/goffice-0.6/goffice-06-gog-theme.html +share/doc/goffice-0.6/goffice-06-gog-trend-line.html +share/doc/goffice-0.6/home.png +share/doc/goffice-0.6/index.html +share/doc/goffice-0.6/index.sgml +share/doc/goffice-0.6/left.png +share/doc/goffice-0.6/pt01.html +share/doc/goffice-0.6/pt02.html +share/doc/goffice-0.6/pt03.html +share/doc/goffice-0.6/right.png +share/doc/goffice-0.6/style.css +share/doc/goffice-0.6/up.png +%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade +%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade +%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade +%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade +%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade +%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade +%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-series-prefs.glade +%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade +%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml +share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ar/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/oc/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/zh_HK/LC_MESSAGES/goffice-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo +share/pixmaps/goffice/%%VERSION%%/area.xpm +share/pixmaps/goffice/%%VERSION%%/bar-hboth.png +share/pixmaps/goffice/%%VERSION%%/bar-hminus.png +share/pixmaps/goffice/%%VERSION%%/bar-hplus.png +share/pixmaps/goffice/%%VERSION%%/bar-none.png +share/pixmaps/goffice/%%VERSION%%/bar-vboth.png +share/pixmaps/goffice/%%VERSION%%/bar-vminus.png +share/pixmaps/goffice/%%VERSION%%/bar-vplus.png +share/pixmaps/goffice/%%VERSION%%/bar.xpm +share/pixmaps/goffice/%%VERSION%%/boxplot.xpm +share/pixmaps/goffice/%%VERSION%%/bubble.xpm +share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png +share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png +share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png +share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png +share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png +share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png +share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png +share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png +share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png +share/pixmaps/goffice/%%VERSION%%/chart_surface_2_1.png +share/pixmaps/goffice/%%VERSION%%/color.xpm +share/pixmaps/goffice/%%VERSION%%/column.xpm +share/pixmaps/goffice/%%VERSION%%/doughnut.xpm +share/pixmaps/goffice/%%VERSION%%/dropbar.xpm +share/pixmaps/goffice/%%VERSION%%/hist.xpm +share/pixmaps/goffice/%%VERSION%%/linegraph.xpm +share/pixmaps/goffice/%%VERSION%%/minmax.xpm +share/pixmaps/goffice/%%VERSION%%/pie.xpm +share/pixmaps/goffice/%%VERSION%%/polar.png +share/pixmaps/goffice/%%VERSION%%/radar.xpm +share/pixmaps/goffice/%%VERSION%%/scatter.xpm +share/pixmaps/goffice/%%VERSION%%/stock.xpm +share/pixmaps/goffice/%%VERSION%%/surface.xpm +@dirrm share/pixmaps/goffice/%%VERSION%% +@dirrm share/pixmaps/goffice +@dirrm %%DATADIR%%/%%VERSION%%/patterns +@dirrm %%DATADIR%%/%%VERSION%%/glade +@dirrm %%DATADIR%%/%%VERSION%% +@dirrm %%DATADIR%% +@dirrm share/doc/goffice-0.6 +@dirrm lib/goffice/%%VERSION%%/plugins/smoothing +@dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit +@dirrm lib/goffice/%%VERSION%%/plugins/reg_linear +@dirrm lib/goffice/%%VERSION%%/plugins/plot_xy +@dirrm lib/goffice/%%VERSION%%/plugins/plot_surface +@dirrm lib/goffice/%%VERSION%%/plugins/plot_radar +@dirrm lib/goffice/%%VERSION%%/plugins/plot_pie +@dirrm lib/goffice/%%VERSION%%/plugins/plot_boxes +@dirrm lib/goffice/%%VERSION%%/plugins/plot_barcol +@dirrm lib/goffice/%%VERSION%%/plugins +@dirrm lib/goffice/%%VERSION%% +@dirrmtry lib/goffice +@dirrm include/libgoffice-0.6/goffice/utils +@dirrm include/libgoffice-0.6/goffice/ms-compat +@dirrm include/libgoffice-0.6/goffice/math +@dirrm include/libgoffice-0.6/goffice/gtk +@dirrm include/libgoffice-0.6/goffice/graph +@dirrm include/libgoffice-0.6/goffice/drawing +@dirrm include/libgoffice-0.6/goffice/data +@dirrm include/libgoffice-0.6/goffice/cut-n-paste/foocanvas +@dirrm include/libgoffice-0.6/goffice/cut-n-paste +@dirrm include/libgoffice-0.6/goffice/component +@dirrm include/libgoffice-0.6/goffice/app +@dirrm include/libgoffice-0.6/goffice +@dirrm include/libgoffice-0.6 +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile index 804e06b93549..77a20974ca62 100644 --- a/devel/gvfs/Makefile +++ b/devel/gvfs/Makefile @@ -3,13 +3,14 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gvfs/Makefile,v 1.21 2008/03/18 16:16:48 mezz Exp $ +# $MCom: ports/devel/gvfs/Makefile,v 1.37 2009/01/10 01:59:21 mezz Exp $ # PORTNAME= gvfs -PORTVERSION= 0.2.5 +PORTVERSION= 1.0.3 CATEGORIES= devel gnome MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME virtual file system diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo index f9834de5f3b7..a0397c2d0987 100644 --- a/devel/gvfs/distinfo +++ b/devel/gvfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gvfs-0.2.5.tar.bz2) = 01676053d9481022ade9a5274576541b -SHA256 (gvfs-0.2.5.tar.bz2) = f8bb3d32b1fe797190b9d8f2a6b0cdf91e897326a26cf8d9583e41f0d3aae86b -SIZE (gvfs-0.2.5.tar.bz2) = 826404 +MD5 (gnome2/gvfs-1.0.3.tar.bz2) = a41e8b7d99e390cef8312f7ce5f312a5 +SHA256 (gnome2/gvfs-1.0.3.tar.bz2) = 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd +SIZE (gnome2/gvfs-1.0.3.tar.bz2) = 920742 diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in index 7832811c4608..658cccd6ad11 100644 --- a/devel/gvfs/files/patch-Makefile.in +++ b/devel/gvfs/files/patch-Makefile.in @@ -1,11 +1,10 @@ ---- Makefile.in.orig 2008-02-11 20:04:47.000000000 -0500 -+++ Makefile.in 2008-02-11 20:05:02.000000000 -0500 -@@ -60,7 +60,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re - distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = common client daemon gconf po programs test hal -+DIST_SUBDIRS = common client daemon gconf po programs hal - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) +--- Makefile.in.orig 2008-07-22 23:17:58.000000000 -0400 ++++ Makefile.in 2008-07-22 23:18:24.000000000 -0400 +@@ -269,7 +269,6 @@ SUBDIRS = \ + gconf \ + po \ + programs \ +- test \ + $(NULL) + + EXTRA_DIST = \ diff --git a/devel/gvfs/files/patch-hal_ghalvolume.c b/devel/gvfs/files/patch-hal_ghalvolume.c deleted file mode 100644 index 519718969441..000000000000 --- a/devel/gvfs/files/patch-hal_ghalvolume.c +++ /dev/null @@ -1,14 +0,0 @@ ---- hal/ghalvolume.c.orig 2008-02-25 16:51:39.000000000 -0500 -+++ hal/ghalvolume.c 2008-02-25 16:52:00.000000000 -0500 -@@ -550,7 +550,11 @@ g_hal_volume_new (GVolumeMonitor *volu - return NULL; - - /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */ -+#ifdef __FreeBSD__ -+ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file"); -+#else - device_path = hal_device_get_property_string (drive_device, "linux.device_file"); -+#endif - if (strlen (device_path) == 0) - device_path = NULL; - diff --git a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c new file mode 100644 index 000000000000..6686b28aebb7 --- /dev/null +++ b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c @@ -0,0 +1,14 @@ +--- monitor/gphoto2/ggphoto2volume.c.orig 2008-07-22 09:29:19.000000000 -0400 ++++ monitor/gphoto2/ggphoto2volume.c 2008-07-22 23:22:30.000000000 -0400 +@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor * + return NULL; + + /* TODO: other OS'es? Will address this with DK aka HAL 2.0 */ ++#ifdef __FreeBSD__ ++ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file"); ++#else + device_path = hal_device_get_property_string (drive_device, "linux.device_file"); ++#endif + if (strlen (device_path) == 0) + device_path = NULL; + diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist index a9b1733da210..8670f6588266 100644 --- a/devel/gvfs/pkg-plist +++ b/devel/gvfs/pkg-plist @@ -19,14 +19,16 @@ include/gvfs-client/gvfs/gvfsurimapper.h include/gvfs-client/gvfs/gvfsuriutils.h lib/gio/modules/libgiogconf.la lib/gio/modules/libgiogconf.so -lib/gio/modules/libgiohal-volume-monitor.la -lib/gio/modules/libgiohal-volume-monitor.so +lib/gio/modules/libgioremote-volume-monitor.la +lib/gio/modules/libgioremote-volume-monitor.so lib/gio/modules/libgvfsdbus.la lib/gio/modules/libgvfsdbus.so lib/libgvfscommon.la lib/libgvfscommon.so lib/libgvfscommon.so.0 %%FUSE%%libexec/gvfs-fuse-daemon +%%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor +libexec/gvfs-hal-volume-monitor libexec/gvfsd %%ARCHIVE%%libexec/gvfsd-archive libexec/gvfsd-burn @@ -44,6 +46,8 @@ libexec/gvfsd-sftp %%SMB%%libexec/gvfsd-smb-browse libexec/gvfsd-trash share/dbus-1/services/gvfs-daemon.service +%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service +share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service %%ARCHIVE%%share/gvfs/mounts/archive.mount share/gvfs/mounts/burn.mount %%CDDA%%share/gvfs/mounts/cdda.mount @@ -59,6 +63,8 @@ share/gvfs/mounts/sftp.mount %%SMB%%share/gvfs/mounts/smb-browse.mount %%SMB%%share/gvfs/mounts/smb.mount share/gvfs/mounts/trash.mount +%%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor +share/gvfs/remote-volume-monitors/hal.monitor share/locale/ar/LC_MESSAGES/gvfs.mo share/locale/be@latin/LC_MESSAGES/gvfs.mo share/locale/bg/LC_MESSAGES/gvfs.mo @@ -74,12 +80,15 @@ share/locale/et/LC_MESSAGES/gvfs.mo share/locale/eu/LC_MESSAGES/gvfs.mo share/locale/fi/LC_MESSAGES/gvfs.mo share/locale/fr/LC_MESSAGES/gvfs.mo +share/locale/ga/LC_MESSAGES/gvfs.mo share/locale/gl/LC_MESSAGES/gvfs.mo +share/locale/gu/LC_MESSAGES/gvfs.mo share/locale/he/LC_MESSAGES/gvfs.mo share/locale/hi/LC_MESSAGES/gvfs.mo share/locale/hu/LC_MESSAGES/gvfs.mo share/locale/it/LC_MESSAGES/gvfs.mo share/locale/ja/LC_MESSAGES/gvfs.mo +share/locale/kn/LC_MESSAGES/gvfs.mo share/locale/ko/LC_MESSAGES/gvfs.mo share/locale/ku/LC_MESSAGES/gvfs.mo share/locale/lt/LC_MESSAGES/gvfs.mo @@ -96,8 +105,12 @@ share/locale/pt_BR/LC_MESSAGES/gvfs.mo share/locale/ru/LC_MESSAGES/gvfs.mo share/locale/sk/LC_MESSAGES/gvfs.mo share/locale/sl/LC_MESSAGES/gvfs.mo +share/locale/sq/LC_MESSAGES/gvfs.mo +share/locale/sr/LC_MESSAGES/gvfs.mo +share/locale/sr@latin/LC_MESSAGES/gvfs.mo share/locale/sv/LC_MESSAGES/gvfs.mo share/locale/ta/LC_MESSAGES/gvfs.mo +share/locale/te/LC_MESSAGES/gvfs.mo share/locale/th/LC_MESSAGES/gvfs.mo share/locale/tr/LC_MESSAGES/gvfs.mo share/locale/uk/LC_MESSAGES/gvfs.mo @@ -105,6 +118,7 @@ share/locale/vi/LC_MESSAGES/gvfs.mo share/locale/zh_CN/LC_MESSAGES/gvfs.mo share/locale/zh_HK/LC_MESSAGES/gvfs.mo share/locale/zh_TW/LC_MESSAGES/gvfs.mo +@dirrm share/gvfs/remote-volume-monitors @dirrm share/gvfs/mounts @dirrm share/gvfs @dirrm include/gvfs-client/gvfs @@ -112,6 +126,10 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo @dirrmtry etc/profile.d @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@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/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/ku/LC_MESSAGES diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 119739295882..e55b9bb6d1ae 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libbonobo/Makefile,v 1.71 2008/03/10 16:30:35 ahze Exp $ +# $MCom: ports/devel/libbonobo/Makefile,v 1.76 2008/09/22 15:01:51 kwm Exp $ # PORTNAME= libbonobo -PORTVERSION= 2.22.0 -PORTREVISION?= 1 +PORTVERSION= 2.24.0 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,7 +21,8 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_GMAKE= yes USE_BISON= build diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 8fdd99c40ea0..5ab03dda7589 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libbonobo-2.22.0.tar.bz2) = 998a576ad26784ac87eab99e96013527 -SHA256 (gnome2/libbonobo-2.22.0.tar.bz2) = 5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4 -SIZE (gnome2/libbonobo-2.22.0.tar.bz2) = 1445318 +MD5 (gnome2/libbonobo-2.24.0.tar.bz2) = b9dd7fcd377945b227db393ac4fa3c37 +SHA256 (gnome2/libbonobo-2.24.0.tar.bz2) = bc851f032359f2c27d8980d8b0c6ba0e40e06c0c501ed9b897c7dd1723b5ef55 +SIZE (gnome2/libbonobo-2.24.0.tar.bz2) = 1455370 diff --git a/devel/libbonobo/files/patch-activation-server_object-directory-corba.c b/devel/libbonobo/files/patch-activation-server_object-directory-corba.c deleted file mode 100644 index 3fa67848dfc8..000000000000 --- a/devel/libbonobo/files/patch-activation-server_object-directory-corba.c +++ /dev/null @@ -1,15 +0,0 @@ ---- activation-server/object-directory-corba.c.orig Mon Aug 14 14:27:54 2006 -+++ activation-server/object-directory-corba.c Thu Oct 26 09:25:50 2006 -@@ -732,8 +732,10 @@ - g_object_set_data ( - G_OBJECT (cnx), "object_count", GUINT_TO_POINTER (1)); - -- ORBit_small_listen_for_broken -- (object, G_CALLBACK (active_server_cnx_broken), NULL); -+ g_signal_connect ( -+ cnx, "broken", -+ G_CALLBACK (active_server_cnx_broken), -+ NULL); - } - } else - g_assert (!strcmp (iid, NAMING_CONTEXT_IID) || diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index 1cbf066c87d1..6242f7f60d4c 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -137,6 +137,7 @@ share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo share/locale/li/LC_MESSAGES/libbonobo-2.0.mo share/locale/lt/LC_MESSAGES/libbonobo-2.0.mo share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo +share/locale/mai/LC_MESSAGES/libbonobo-2.0.mo share/locale/mg/LC_MESSAGES/libbonobo-2.0.mo share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo @@ -160,9 +161,10 @@ share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo share/locale/sq/LC_MESSAGES/libbonobo-2.0.mo share/locale/sr/LC_MESSAGES/libbonobo-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/libbonobo-2.0.mo +share/locale/sr@latin/LC_MESSAGES/libbonobo-2.0.mo share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo +share/locale/te/LC_MESSAGES/libbonobo-2.0.mo share/locale/th/LC_MESSAGES/libbonobo-2.0.mo share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo @@ -192,6 +194,10 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@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/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @@ -200,6 +206,8 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.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 diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile index 1bc38eda5677..9ea87736f49c 100644 --- a/devel/libglademm24/Makefile +++ b/devel/libglademm24/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/libglademm24/Makefile,v 1.8 2006/08/19 19:06:16 mezz Exp $ +# $MCom: ports/devel/libglademm24/Makefile,v 1.10 2008/09/22 11:42:53 kwm Exp $ # PORTNAME= libglademm -PORTVERSION= 2.6.6 -PORTREVISION= 1 +PORTVERSION= 2.6.7 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/devel/libglademm24/distinfo b/devel/libglademm24/distinfo index a629bdb3f498..eebff7ac86f0 100644 --- a/devel/libglademm24/distinfo +++ b/devel/libglademm24/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libglademm-2.6.6.tar.bz2) = c4b2440d5e816ff4d692a246bce55dfb -SHA256 (gnome2/libglademm-2.6.6.tar.bz2) = ff3928acea466b3cda3739d3a67748cb942948da853cb114d1379933224b0e60 -SIZE (gnome2/libglademm-2.6.6.tar.bz2) = 333112 +MD5 (gnome2/libglademm-2.6.7.tar.bz2) = f9ca5b67f6c551ea98790ab5f21c19d0 +SHA256 (gnome2/libglademm-2.6.7.tar.bz2) = 38543c15acf727434341cc08c2b003d24f36abc22380937707fc2c5c687a2bc3 +SIZE (gnome2/libglademm-2.6.7.tar.bz2) = 326385 diff --git a/devel/libglademm24/pkg-plist b/devel/libglademm24/pkg-plist index 4be2cb82e73f..1976033ee91b 100644 --- a/devel/libglademm24/pkg-plist +++ b/devel/libglademm24/pkg-plist @@ -15,17 +15,17 @@ libdata/pkgconfig/libglademm-%%API_VERSION%%.pc %%PORTDOCS%%share/devhelp/books/libglademm-%%API_VERSION%%/libglademm-%%API_VERSION%%.devhelp %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/annotated.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Exception.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Exception__inherit__graph.png +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Exception__inherit__graph.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Object.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Object__inherit__graph.png +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGlib_1_1Object__inherit__graph.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1VariablesMap-members.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1VariablesMap.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml-members.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError-members.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError__inherit__graph.png -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml__inherit__graph.png +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1XmlError__inherit__graph.dot +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classGnome_1_1Glade_1_1Xml__inherit__graph.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/classes.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.css %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/doxygen.png @@ -36,12 +36,9 @@ libdata/pkgconfig/libglademm-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/functions_vars.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/graph_legend.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/graph_legend.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/graph_legend.png %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/hierarchy.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/index.html -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__0.png -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__1.png -%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__2.png +%%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherit__graph__0.dot %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/inherits.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/init_8h.html %%PORTDOCS%%share/doc/gnomemm-2.6/libglademm-%%API_VERSION%%/docs/reference/html/namespaceGlib.html diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 8e0763309d9b..c56bb636574e 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -3,10 +3,10 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.10 2006/03/05 21:26:56 marcus Exp $ +# $MCom: ports/devel/libgsf-gnome/Makefile,v 1.12 2008/09/09 00:08:35 kwm Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel gnome PKGNAMESUFFIX= -gnome @@ -21,7 +21,7 @@ PLIST= ${.CURDIR}/pkg-plist USE_GNOME= gnomehack libgsf gnomevfs2 libbonobo ltverhack intlhack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/gsf \ - --with-bz2 --with-gnome --without-gvfs + --with-bz2 --with-gnome-vfs --with-gio CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lgsf-1" diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index e1960df0f07a..147844c249a6 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -3,15 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgsf/Makefile,v 1.27 2006/10/04 00:03:42 ahze Exp $ +# $MCom: ports/devel/libgsf/Makefile,v 1.33 2009/01/08 01:28:46 marcus Exp $ # PORTNAME= libgsf -PORTVERSION= 1.14.8 -PORTREVISION?= 2 +PORTVERSION= 1.14.11 +PORTREVISION?= 0 CATEGORIES?= devel MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -27,13 +26,14 @@ USE_GETTEXT= yes USE_LDCONFIG= yes USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 gconf2 ltverhack intlhack USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS?=--without-gnome --without-python --without-gvfs +CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \ + --without-bonobo CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" .if !defined(GSF_SLAVE) GCONF_SCHEMAS= gsf-office-thumbnailer.schemas -MAN1= gsf.1 gsf-office-thumbnailer.1 +MAN1= gsf.1 gsf-office-thumbnailer.1 gsf-vba-dump.1 .endif .include <bsd.port.mk> diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 3b84d9be47b2..d56c8857da8e 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgsf-1.14.8.tar.bz2) = 09e4b6639be79fa888cabc751f73674f -SHA256 (gnome2/libgsf-1.14.8.tar.bz2) = d5f635ea86f8417dd777c32bcf7ef86cf3af3912f34ae21db9933a0e48e54748 -SIZE (gnome2/libgsf-1.14.8.tar.bz2) = 632363 +MD5 (gnome2/libgsf-1.14.11.tar.bz2) = 86bec0012435fbafe02a6e4c88bdf9ba +SHA256 (gnome2/libgsf-1.14.11.tar.bz2) = ceb5fc6538d5998d83adf3fdf04f1dd344a5d0803c87593fadcd02db7ceabfcf +SIZE (gnome2/libgsf-1.14.11.tar.bz2) = 637329 diff --git a/devel/libgsf/files/patch-gsf-gnome-Makefile.in b/devel/libgsf/files/patch-gsf-gnome-Makefile.in index c182f45cccf8..4ef836e0b522 100644 --- a/devel/libgsf/files/patch-gsf-gnome-Makefile.in +++ b/devel/libgsf/files/patch-gsf-gnome-Makefile.in @@ -1,6 +1,6 @@ ---- gsf-gnome/Makefile.in.orig Tue Jun 19 00:39:37 2007 -+++ gsf-gnome/Makefile.in Tue Jun 19 00:41:22 2007 -@@ -66,9 +66,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" +--- gsf-gnome/Makefile.in.orig 2008-10-19 22:08:05.000000000 -0500 ++++ gsf-gnome/Makefile.in 2008-10-19 22:12:54.000000000 -0500 +@@ -66,9 +66,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -11,17 +11,16 @@ am__libgsf_gnome_1_la_SOURCES_DIST = gsf-input-gnomevfs.c \ gsf-output-gnomevfs.c gsf-input-bonobo.c gsf-output-bonobo.c \ gsf-shared-bonobo-stream.c -@@ -309,19 +307,21 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -298,18 +296,20 @@ + top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_GNOME_CFLAGS) @WITH_LIBGSF_GNOME_TRUE@lib_LTLIBRARIES = libgsf-gnome-1.la -@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_GNOME_LIBS) +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LIBADD = $(LIBGSF_GNOME_LIBS) @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_LDFLAGS = -version-info \ @WITH_LIBGSF_GNOME_TRUE@ $(VERSION_INFO) $(am__append_1) - @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = \ - @WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.c \ - @WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.c $(am__append_2) + @WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_la_SOURCES = $(am__append_2) \ + @WITH_LIBGSF_GNOME_TRUE@ $(am__append_3) -libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome -libgsf_gnome_1_include_HEADERS = \ - gsf-input-gnomevfs.h \ @@ -33,11 +32,11 @@ +@WITH_LIBGSF_GNOME_FALSE@libgsf_gnome_1_include_HEADERS = +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome +@WITH_LIBGSF_GNOME_TRUE@libgsf_gnome_1_include_HEADERS = \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ -+@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-gnomevfs.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-input-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-output-bonobo.h \ ++@WITH_LIBGSF_GNOME_TRUE@ gsf-shared-bonobo-stream.h all: all-am diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index a5ba6d370bef..99a0e886b406 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,8 +1,6 @@ bin/gsf bin/gsf-office-thumbnailer bin/gsf-vba-dump -include/libgsf-1/gsf-gvfs/gsf-input-gvfs.h -include/libgsf-1/gsf-gvfs/gsf-output-gvfs.h include/libgsf-1/gsf/gsf-blob.h include/libgsf-1/gsf/gsf-clip-data.h include/libgsf-1/gsf/gsf-doc-meta-data.h @@ -12,9 +10,11 @@ include/libgsf-1/gsf/gsf-infile-impl.h include/libgsf-1/gsf/gsf-infile-msole.h include/libgsf-1/gsf/gsf-infile-msvba.h include/libgsf-1/gsf/gsf-infile-stdio.h +include/libgsf-1/gsf/gsf-infile-tar.h include/libgsf-1/gsf/gsf-infile-zip.h include/libgsf-1/gsf/gsf-infile.h include/libgsf-1/gsf/gsf-input-bzip.h +include/libgsf-1/gsf/gsf-input-gio.h include/libgsf-1/gsf/gsf-input-gzip.h include/libgsf-1/gsf/gsf-input-http.h include/libgsf-1/gsf/gsf-input-impl.h @@ -36,6 +36,7 @@ include/libgsf-1/gsf/gsf-outfile-zip.h include/libgsf-1/gsf/gsf-outfile.h include/libgsf-1/gsf/gsf-output-bzip.h include/libgsf-1/gsf/gsf-output-csv.h +include/libgsf-1/gsf/gsf-output-gio.h include/libgsf-1/gsf/gsf-output-gzip.h include/libgsf-1/gsf/gsf-output-iconv.h include/libgsf-1/gsf/gsf-output-impl.h @@ -43,6 +44,7 @@ include/libgsf-1/gsf/gsf-output-iochannel.h include/libgsf-1/gsf/gsf-output-memory.h include/libgsf-1/gsf/gsf-output-stdio.h include/libgsf-1/gsf/gsf-output.h +include/libgsf-1/gsf/gsf-shared-memory.h include/libgsf-1/gsf/gsf-structured-blob.h include/libgsf-1/gsf/gsf-timestamp.h include/libgsf-1/gsf/gsf-utils.h @@ -57,6 +59,7 @@ share/doc/gsf/api.html share/doc/gsf/dependencies.html share/doc/gsf/gsf-Bononbo.html share/doc/gsf/gsf-Compression.html +share/doc/gsf/gsf-GIO.html share/doc/gsf/gsf-GIOChannel.html share/doc/gsf/gsf-GnomeVFS.html share/doc/gsf/gsf-Infile-reading-structed-files.html @@ -91,15 +94,15 @@ share/doc/gsf/sources.html share/doc/gsf/style.css share/doc/gsf/up.png share/locale/es/LC_MESSAGES/libgsf.mo +share/locale/nb/LC_MESSAGES/libgsf.mo share/locale/oc/LC_MESSAGES/libgsf.mo share/locale/sv/LC_MESSAGES/libgsf.mo share/locale/zh_HK/LC_MESSAGES/libgsf.mo share/locale/zh_TW/LC_MESSAGES/libgsf.mo +@dirrm share/doc/gsf +@dirrm include/libgsf-1/gsf +@dirrm include/libgsf-1 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc -@dirrm share/doc/gsf -@dirrm include/libgsf-1/gsf-gvfs -@dirrm include/libgsf-1/gsf -@dirrm include/libgsf-1 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 1c47ecf8168d..6c7eb0d77fa3 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgtop/Makefile,v 1.34 2008/03/10 21:59:17 mezz Exp $ +# $MCom: ports/devel/libgtop/Makefile,v 1.45 2009/01/10 01:59:21 mezz Exp $ # PORTNAME= libgtop -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.0 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index b553cb38b64b..baa6eea845a3 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgtop-2.22.3.tar.bz2) = 57764ad246ceb959f601505aa2364f1f -SHA256 (gnome2/libgtop-2.22.3.tar.bz2) = d6d5a6e4c0c2f956c8b8e876cf3a5213d5364d652d7d14134cb608ad5ae0329a -SIZE (gnome2/libgtop-2.22.3.tar.bz2) = 776327 +MD5 (gnome2/libgtop-2.24.0.tar.bz2) = f0e3584b9157d3425184a9e21e3ac482 +SHA256 (gnome2/libgtop-2.24.0.tar.bz2) = af9643abf15887c9cb501a4dcc6f432ec0896b7087ef8739526f284ed1461a18 +SIZE (gnome2/libgtop-2.24.0.tar.bz2) = 775351 diff --git a/devel/libgtop/files/patch-configure b/devel/libgtop/files/patch-configure index baf610abc525..6f9d64a4b82f 100644 --- a/devel/libgtop/files/patch-configure +++ b/devel/libgtop/files/patch-configure @@ -1,10 +1,10 @@ ---- configure.orig 2008-12-06 16:04:20.000000000 -0500 -+++ configure 2008-12-06 16:04:34.000000000 -0500 +--- configure.orig 2008-12-07 00:14:33.000000000 -0500 ++++ configure 2008-12-07 00:14:54.000000000 -0500 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.61 for libgtop 2.22.3. -+# Generated by GNU Autoconf 2.62 for libgtop 2.22.3. +-# Generated by GNU Autoconf 2.61 for libgtop 2.24.0. ++# Generated by GNU Autoconf 2.62 for libgtop 2.24.0. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop>. # @@ -610,7 +610,7 @@ @@ -1691,10 +1785,10 @@ test -n "$ac_init_help" && exit $ac_stat if $ac_init_version; then cat <<\_ACEOF - libgtop configure 2.22.3 + libgtop configure 2.24.0 -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.62 @@ -623,7 +623,7 @@ @@ -1705,7 +1799,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. - It was created by libgtop $as_me 2.22.3, which was + It was created by libgtop $as_me 2.24.0, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was @@ -7833,16 +7833,7 @@ case "$host_os" in linux*) -@@ -21523,6 +21766,8 @@ echo $ECHO_N "checking for libgtop sysde - libgtop_sysdeps_dir=freebsd - libgtop_use_machine_h=yes - libgtop_need_server=yes -+ libgtop_sysdeps_private_mountlist=yes -+ libgtop_sysdeps_private_fsusage=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2' - ;; - solaris*) -@@ -21576,8 +21821,8 @@ echo $ECHO_N "checking for libgtop sysde +@@ -21578,8 +21821,8 @@ echo $ECHO_N "checking for libgtop sysde test -z "$libgtop_postinstall" && libgtop_postinstall=: @@ -7853,7 +7844,7 @@ -@@ -21587,10 +21832,10 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6 +@@ -21589,10 +21832,10 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6 *bsd*) case "$host_os" in *kfreebsd*) @@ -7867,7 +7858,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lkvm -lfreebsd -lbsd $LIBS" -@@ -21622,32 +21867,36 @@ case "(($ac_try" in +@@ -21624,32 +21867,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7911,7 +7902,7 @@ if test $ac_cv_lib_kvm_kvm_open = yes; then KVM_LIBS="-lkvm -lfreebsd -lbsd" else -@@ -21655,10 +21904,10 @@ else +@@ -21657,10 +21904,10 @@ else fi ;; *) @@ -7925,7 +7916,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lkvm $LIBS" -@@ -21690,32 +21939,36 @@ case "(($ac_try" in +@@ -21692,32 +21939,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7969,7 +7960,7 @@ if test $ac_cv_lib_kvm_kvm_open = yes; then KVM_LIBS=-lkvm else -@@ -21735,6 +21988,82 @@ fi +@@ -21737,6 +21988,82 @@ fi if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat" fi @@ -8052,7 +8043,7 @@ ;; esac -@@ -21743,20 +22072,21 @@ fi +@@ -21745,20 +22072,21 @@ fi for ac_header in net/if_var.h do @@ -8083,7 +8074,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21772,32 +22102,33 @@ case "(($ac_try" in +@@ -21774,32 +22102,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8124,7 +8115,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21811,51 +22142,52 @@ case "(($ac_try" in +@@ -21813,51 +22142,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8198,7 +8189,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -21864,29 +22196,31 @@ _ASBOX +@@ -21866,29 +22196,31 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -8240,7 +8231,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -21929,36 +22263,37 @@ case "(($ac_try" in +@@ -21931,36 +22263,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8285,7 +8276,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22003,28 +22338,29 @@ case "(($ac_try" in +@@ -22005,28 +22338,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8320,7 +8311,7 @@ if test x$have_i4b_acct = xyes ; then cat >>confdefs.h <<\_ACEOF -@@ -22032,21 +22368,21 @@ cat >>confdefs.h <<\_ACEOF +@@ -22034,21 +22368,21 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else @@ -8347,7 +8338,7 @@ else msginfo_needs= for def in nothing KERNEL _KERNEL; do -@@ -22071,13 +22407,14 @@ case "(($ac_try" in +@@ -22073,13 +22407,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8364,7 +8355,7 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err -@@ -22100,7 +22437,7 @@ _ACEOF +@@ -22102,7 +22437,7 @@ _ACEOF else @@ -8373,7 +8364,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 -@@ -22112,11 +22449,11 @@ rm -f core conftest.err conftest.$ac_obj +@@ -22114,11 +22449,11 @@ rm -f core conftest.err conftest.$ac_obj fi @@ -8389,7 +8380,7 @@ { (exit 1); exit 1; }; } fi ;; -@@ -22132,20 +22469,21 @@ echo "$as_me: error: Could not find the +@@ -22134,20 +22469,21 @@ echo "$as_me: error: Could not find the for ac_header in linux/version.h do @@ -8420,7 +8411,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22161,32 +22499,33 @@ case "(($ac_try" in +@@ -22163,32 +22499,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8461,7 +8452,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22200,51 +22539,52 @@ case "(($ac_try" in +@@ -22202,51 +22539,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8535,7 +8526,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22253,21 +22593,23 @@ _ASBOX +@@ -22255,21 +22593,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -8567,7 +8558,7 @@ _ACEOF have_linux_version_h=yes else -@@ -22286,15 +22628,15 @@ done +@@ -22288,15 +22628,15 @@ done os_version_code=`echo "$os_version_expr" | dc` fi @@ -8587,7 +8578,7 @@ ;; solaris*) os_major_version=`uname -r | sed 's/\([0-9]*\).\([0-9]*\)\.*\([0-9]*\)/\1/'` -@@ -22304,27 +22646,27 @@ echo "${ECHO_T}$os_version_code" >&6; } +@@ -22306,27 +22646,27 @@ echo "${ECHO_T}$os_version_code" >&6; } os_version_expr="$os_major_version 10000 * $os_minor_version 100 * + $os_micro_version + p q" os_version_code=`echo "$os_version_expr" | dc` @@ -8628,7 +8619,7 @@ if test x$libgtop_need_server = xyes ; then -@@ -22377,20 +22719,21 @@ fi +@@ -22379,20 +22719,21 @@ fi for ac_header in sys/bitypes.h do @@ -8659,7 +8650,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22406,32 +22749,33 @@ case "(($ac_try" in +@@ -22408,32 +22749,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8700,7 +8691,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22445,51 +22789,52 @@ case "(($ac_try" in +@@ -22447,51 +22789,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8774,7 +8765,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22498,21 +22843,23 @@ _ASBOX +@@ -22500,21 +22843,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -8806,7 +8797,7 @@ _ACEOF fi -@@ -22529,10 +22876,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != +@@ -22531,10 +22876,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -8820,7 +8811,7 @@ else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -22547,7 +22894,7 @@ do +@@ -22549,7 +22894,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -8829,7 +8820,7 @@ break 2 fi done -@@ -22559,11 +22906,11 @@ esac +@@ -22561,11 +22906,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -8845,7 +8836,7 @@ fi -@@ -22572,10 +22919,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the +@@ -22574,10 +22919,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -8859,7 +8850,7 @@ else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -22590,7 +22937,7 @@ do +@@ -22592,7 +22937,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" @@ -8868,7 +8859,7 @@ break 2 fi done -@@ -22602,11 +22949,11 @@ esac +@@ -22604,11 +22949,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -8884,7 +8875,7 @@ fi if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -22614,10 +22961,10 @@ fi +@@ -22616,10 +22961,10 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -8897,7 +8888,7 @@ whose name does not start with the host triplet. If you think this configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; -@@ -22631,32 +22978,32 @@ fi +@@ -22633,32 +22978,32 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -8940,7 +8931,7 @@ (exit $ac_status); }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` else -@@ -22671,10 +23018,10 @@ if test -n "$PKG_CONFIG"; then +@@ -22673,10 +23018,10 @@ if test -n "$PKG_CONFIG"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" else if test -n "$PKG_CONFIG" && \ @@ -8953,7 +8944,7 @@ (exit $ac_status); }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` else -@@ -22702,7 +23049,7 @@ fi +@@ -22704,7 +23049,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 @@ -8962,7 +8953,7 @@ $GLIB_PKG_ERRORS -@@ -22713,7 +23060,7 @@ Alternatively, you may set the environme +@@ -22715,7 +23060,7 @@ Alternatively, you may set the environme and GLIB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 @@ -8971,7 +8962,7 @@ $GLIB_PKG_ERRORS -@@ -22726,7 +23073,7 @@ See the pkg-config man page for more det +@@ -22728,7 +23073,7 @@ See the pkg-config man page for more det " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then @@ -8980,7 +8971,7 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22736,7 +23083,7 @@ See the pkg-config man page for more det +@@ -22738,7 +23083,7 @@ See the pkg-config man page for more det To get pkg-config, see <http://pkg-config.freedesktop.org/>. See \`config.log' for more details." >&5 @@ -8989,7 +8980,7 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22750,25 +23097,25 @@ See \`config.log' for more details." >&2 +@@ -22752,25 +23097,25 @@ See \`config.log' for more details." >&2 else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS @@ -9024,7 +9015,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22784,32 +23131,33 @@ case "(($ac_try" in +@@ -22786,32 +23131,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9065,7 +9056,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22823,51 +23171,52 @@ case "(($ac_try" in +@@ -22825,51 +23171,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9139,7 +9130,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -22876,15 +23225,15 @@ _ASBOX +@@ -22878,15 +23225,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -9160,7 +9151,7 @@ fi if test $ac_cv_header_ifaddrs_h = yes; then -@@ -22902,10 +23251,10 @@ _ACEOF +@@ -22904,10 +23251,10 @@ _ACEOF fi @@ -9174,7 +9165,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22977,20 +23326,21 @@ case "(($ac_try" in +@@ -22979,20 +23326,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9199,7 +9190,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_const=no -@@ -22998,20 +23348,20 @@ fi +@@ -23000,20 +23348,20 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9226,7 +9217,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do -@@ -23034,20 +23384,21 @@ case "(($ac_try" in +@@ -23036,20 +23384,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9251,7 +9242,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 -@@ -23058,8 +23409,8 @@ rm -f core conftest.err conftest.$ac_obj +@@ -23060,8 +23409,8 @@ rm -f core conftest.err conftest.$ac_obj done fi @@ -9262,7 +9253,7 @@ case $ac_cv_c_inline in -@@ -23077,26 +23428,58 @@ _ACEOF +@@ -23079,26 +23428,58 @@ _ACEOF ;; esac @@ -9329,7 +9320,7 @@ ; return 0; } -@@ -23107,29 +23490,38 @@ case "(($ac_try" in +@@ -23109,29 +23490,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9375,7 +9366,7 @@ if test $ac_cv_type_off_t = yes; then : else -@@ -23140,26 +23532,58 @@ _ACEOF +@@ -23142,26 +23532,58 @@ _ACEOF fi @@ -9442,7 +9433,7 @@ ; return 0; } -@@ -23170,29 +23594,38 @@ case "(($ac_try" in +@@ -23172,29 +23594,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9488,7 +9479,7 @@ if test $ac_cv_type_pid_t = yes; then : else -@@ -23203,26 +23636,58 @@ _ACEOF +@@ -23205,26 +23636,58 @@ _ACEOF fi @@ -9555,7 +9546,7 @@ ; return 0; } -@@ -23233,29 +23698,38 @@ case "(($ac_try" in +@@ -23235,29 +23698,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9601,7 +9592,7 @@ if test $ac_cv_type_size_t = yes; then : else -@@ -23266,10 +23740,10 @@ _ACEOF +@@ -23268,10 +23740,10 @@ _ACEOF fi @@ -9615,7 +9606,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23294,20 +23768,21 @@ case "(($ac_try" in +@@ -23296,20 +23768,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9640,7 +9631,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -@@ -23333,20 +23808,21 @@ case "(($ac_try" in +@@ -23335,20 +23808,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9665,7 +9656,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_member_struct_stat_st_rdev=no -@@ -23357,8 +23833,8 @@ fi +@@ -23359,8 +23833,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9676,7 +9667,7 @@ if test $ac_cv_member_struct_stat_st_rdev = yes; then cat >>confdefs.h <<_ACEOF -@@ -23373,10 +23849,10 @@ _ACEOF +@@ -23375,10 +23849,10 @@ _ACEOF fi @@ -9690,7 +9681,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23403,20 +23879,21 @@ case "(($ac_try" in +@@ -23405,20 +23879,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9715,7 +9706,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_time=no -@@ -23424,8 +23901,8 @@ fi +@@ -23426,8 +23901,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9726,7 +9717,7 @@ if test $ac_cv_header_time = yes; then cat >>confdefs.h <<\_ACEOF -@@ -23434,10 +23911,10 @@ _ACEOF +@@ -23436,10 +23911,10 @@ _ACEOF fi @@ -9740,7 +9731,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23453,7 +23930,7 @@ main () +@@ -23455,7 +23930,7 @@ main () { struct tm tm; int *p = &tm.tm_sec; @@ -9749,7 +9740,7 @@ ; return 0; } -@@ -23464,20 +23941,21 @@ case "(($ac_try" in +@@ -23466,20 +23941,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9774,7 +9765,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_struct_tm=sys/time.h -@@ -23485,8 +23963,8 @@ fi +@@ -23487,8 +23963,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9785,7 +9776,7 @@ if test $ac_cv_struct_tm = sys/time.h; then cat >>confdefs.h <<\_ACEOF -@@ -23495,10 +23973,10 @@ _ACEOF +@@ -23497,10 +23973,10 @@ _ACEOF fi @@ -9799,7 +9790,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23518,8 +23996,8 @@ fi +@@ -23520,8 +23996,8 @@ fi rm -f conftest* fi @@ -9810,7 +9801,7 @@ if test $ac_cv_type_uid_t = no; then cat >>confdefs.h <<\_ACEOF -@@ -23534,26 +24012,58 @@ _ACEOF +@@ -23536,26 +24012,58 @@ _ACEOF fi @@ -9877,7 +9868,7 @@ ; return 0; } -@@ -23564,29 +24074,38 @@ case "(($ac_try" in +@@ -23566,29 +24074,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9897,20 +9888,20 @@ } && test -s conftest.$ac_objext; then - ac_cv_type_ssize_t=yes + : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_type_ssize_t=yes -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_ssize_t=no ++ ac_cv_type_ssize_t=yes ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ + fi @@ -9923,7 +9914,7 @@ if test $ac_cv_type_ssize_t = yes; then : else -@@ -23600,20 +24119,21 @@ fi +@@ -23602,20 +24119,21 @@ fi for ac_header in memory.h do @@ -9954,7 +9945,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23629,32 +24149,33 @@ case "(($ac_try" in +@@ -23631,32 +24149,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9995,7 +9986,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23668,51 +24189,52 @@ case "(($ac_try" in +@@ -23670,51 +24189,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10069,7 +10060,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -23721,21 +24243,23 @@ _ASBOX +@@ -23723,21 +24243,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -10101,7 +10092,7 @@ _ACEOF fi -@@ -23746,20 +24270,21 @@ done +@@ -23748,20 +24270,21 @@ done for ac_header in string.h strings.h do @@ -10132,7 +10123,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23775,32 +24300,33 @@ case "(($ac_try" in +@@ -23777,32 +24300,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10173,7 +10164,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23814,51 +24340,52 @@ case "(($ac_try" in +@@ -23816,51 +24340,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10247,7 +10238,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -23867,21 +24394,23 @@ _ASBOX +@@ -23869,21 +24394,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -10279,7 +10270,7 @@ _ACEOF break fi -@@ -23891,11 +24420,11 @@ done +@@ -23893,11 +24420,11 @@ done for ac_func in strerror do @@ -10295,7 +10286,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23948,35 +24477,41 @@ case "(($ac_try" in +@@ -23950,35 +24477,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10347,7 +10338,7 @@ _ACEOF else -@@ -23995,11 +24530,11 @@ DL_LIB= +@@ -23997,11 +24530,11 @@ DL_LIB= for ac_func in dlopen do @@ -10363,7 +10354,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24052,43 +24587,49 @@ case "(($ac_try" in +@@ -24054,43 +24587,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10426,7 +10417,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -@@ -24120,40 +24661,44 @@ case "(($ac_try" in +@@ -24122,40 +24661,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10481,7 +10472,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -@@ -24185,32 +24730,36 @@ case "(($ac_try" in +@@ -24187,32 +24730,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10525,7 +10516,7 @@ if test $ac_cv_lib_dld_shl_load = yes; then DL_LIB="-ldld" else -@@ -24218,11 +24767,11 @@ else +@@ -24220,11 +24767,11 @@ else for ac_func in dlopen do @@ -10541,7 +10532,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24275,35 +24824,41 @@ case "(($ac_try" in +@@ -24277,35 +24824,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10593,7 +10584,7 @@ _ACEOF DL_LIB="" else -@@ -24326,11 +24881,11 @@ LIBS="$LIBS $DL_LIB" +@@ -24328,11 +24881,11 @@ LIBS="$LIBS $DL_LIB" for ac_func in dlerror do @@ -10609,7 +10600,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24383,35 +24938,41 @@ case "(($ac_try" in +@@ -24385,35 +24938,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10661,7 +10652,7 @@ _ACEOF fi -@@ -24421,17 +24982,17 @@ LIBS="$oLIBS" +@@ -24423,17 +24982,17 @@ LIBS="$oLIBS" if test "${ac_cv_header_linux_isdn_h+set}" = set; then @@ -10686,7 +10677,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24447,32 +25008,33 @@ case "(($ac_try" in +@@ -24449,32 +25008,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10727,7 +10718,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24486,51 +25048,52 @@ case "(($ac_try" in +@@ -24488,51 +25048,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10801,7 +10792,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -24539,15 +25102,15 @@ _ASBOX +@@ -24541,15 +25102,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -10822,7 +10813,7 @@ fi if test $ac_cv_header_linux_isdn_h = yes; then -@@ -24565,10 +25128,10 @@ _ACEOF +@@ -24567,10 +25128,10 @@ _ACEOF fi @@ -10836,7 +10827,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lperfstat $LIBS" -@@ -24600,32 +25163,36 @@ case "(($ac_try" in +@@ -24602,32 +25163,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10880,7 +10871,7 @@ if test $ac_cv_lib_perfstat_vmgetinfo = yes; then cat >>confdefs.h <<\_ACEOF -@@ -24638,10 +25205,10 @@ fi +@@ -24640,10 +25205,10 @@ fi case "$host_os" in solaris*) @@ -10894,7 +10885,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lkstat $LIBS" -@@ -24673,32 +25240,36 @@ case "(($ac_try" in +@@ -24675,32 +25240,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10938,7 +10929,7 @@ if test $ac_cv_lib_kstat_kstat_open = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKSTAT 1 -@@ -24712,11 +25283,11 @@ fi +@@ -24714,11 +25283,11 @@ fi for ac_func in getloadavg swapctl do @@ -10954,7 +10945,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24769,35 +25340,41 @@ case "(($ac_try" in +@@ -24771,35 +25340,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11006,7 +10997,7 @@ _ACEOF fi -@@ -24807,20 +25384,21 @@ done +@@ -24809,20 +25384,21 @@ done for ac_header in procfs.h sys/procfs.h do @@ -11037,7 +11028,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24836,32 +25414,33 @@ case "(($ac_try" in +@@ -24838,32 +25414,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11078,7 +11069,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24875,51 +25454,52 @@ case "(($ac_try" in +@@ -24877,51 +25454,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11152,7 +11143,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -24928,21 +25508,23 @@ _ASBOX +@@ -24930,21 +25508,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -11184,7 +11175,7 @@ _ACEOF break fi -@@ -24953,10 +25535,10 @@ done +@@ -24955,10 +25535,10 @@ done case $host_os in solaris[8-9] | solaris2.[0-9].*) @@ -11198,7 +11189,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lkvm $LIBS" -@@ -24988,41 +25570,45 @@ case "(($ac_try" in +@@ -24990,41 +25570,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11254,7 +11245,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkvm -lelf $LIBS" -@@ -25047,26 +25633,30 @@ case "(($ac_try" in +@@ -25049,26 +25633,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11290,7 +11281,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" -@@ -25074,12 +25664,12 @@ rm -f core conftest.err conftest.$ac_obj +@@ -25076,12 +25664,12 @@ rm -f core conftest.err conftest.$ac_obj fi if test "$ac_cv_lib_kvm_with_elf" = "yes"; then @@ -11307,7 +11298,7 @@ fi fi -@@ -25090,10 +25680,10 @@ fi +@@ -25092,10 +25680,10 @@ fi esac @@ -11321,7 +11312,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmach $LIBS" -@@ -25125,32 +25715,36 @@ case "(($ac_try" in +@@ -25127,32 +25715,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11365,7 +11356,7 @@ if test $ac_cv_lib_mach_vm_statistics = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMACH 1 -@@ -25163,10 +25757,10 @@ fi +@@ -25165,10 +25757,10 @@ fi saved_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -D_GNU_SOURCE" @@ -11379,7 +11370,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25209,20 +25803,21 @@ case "(($ac_try" in +@@ -25211,20 +25803,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11404,7 +11395,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "gcc_cv_decl_needed_program_invocation_name=yes" -@@ -25232,8 +25827,8 @@ rm -f core conftest.err conftest.$ac_obj +@@ -25234,8 +25827,8 @@ rm -f core conftest.err conftest.$ac_obj fi if eval "test \"`echo '$gcc_cv_decl_needed_'program_invocation_name`\" = yes"; then @@ -11415,7 +11406,7 @@ gcc_need_declarations="$gcc_need_declarations program_invocation_name" gcc_tr_decl=NEED_DECLARATION_`echo program_invocation_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -@@ -25242,17 +25837,17 @@ cat >>confdefs.h <<_ACEOF +@@ -25244,17 +25837,17 @@ cat >>confdefs.h <<_ACEOF _ACEOF else @@ -11438,7 +11429,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25305,44 +25900,48 @@ case "(($ac_try" in +@@ -25307,44 +25900,48 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11501,7 +11492,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25358,32 +25957,33 @@ case "(($ac_try" in +@@ -25360,32 +25957,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11542,7 +11533,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25397,51 +25997,52 @@ case "(($ac_try" in +@@ -25399,51 +25997,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11616,7 +11607,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -25450,30 +26051,30 @@ _ASBOX +@@ -25452,30 +26051,30 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -11659,7 +11650,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25489,32 +26090,33 @@ case "(($ac_try" in +@@ -25491,32 +26090,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11700,7 +11691,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25528,51 +26130,52 @@ case "(($ac_try" in +@@ -25530,51 +26130,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11774,7 +11765,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -25581,15 +26184,15 @@ _ASBOX +@@ -25583,15 +26184,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -11795,7 +11786,7 @@ fi if test $ac_cv_header_arpa_inet_h = yes; then -@@ -25599,8 +26202,8 @@ cat >>confdefs.h <<\_ACEOF +@@ -25601,8 +26202,8 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKETS 1 _ACEOF @@ -11806,7 +11797,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25626,32 +26229,36 @@ case "(($ac_try" in +@@ -25628,32 +26229,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11852,7 +11843,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -@@ -25665,10 +26272,10 @@ fi +@@ -25667,10 +26272,10 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! @@ -11866,7 +11857,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25692,31 +26299,35 @@ case "(($ac_try" in +@@ -25694,31 +26299,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11909,7 +11900,7 @@ if test $ac_cv_working_alloca_h = yes; then cat >>confdefs.h <<\_ACEOF -@@ -25725,10 +26336,10 @@ _ACEOF +@@ -25727,10 +26336,10 @@ _ACEOF fi @@ -11923,7 +11914,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25772,31 +26383,35 @@ case "(($ac_try" in +@@ -25774,31 +26383,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11966,7 +11957,7 @@ if test $ac_cv_func_alloca_works = yes; then -@@ -25817,10 +26432,10 @@ cat >>confdefs.h <<\_ACEOF +@@ -25819,10 +26432,10 @@ cat >>confdefs.h <<\_ACEOF _ACEOF @@ -11980,7 +11971,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25844,15 +26459,15 @@ fi +@@ -25846,15 +26459,15 @@ fi rm -f conftest* fi @@ -12002,7 +11993,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25905,33 +26520,39 @@ case "(($ac_try" in +@@ -25907,33 +26520,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12051,7 +12042,7 @@ cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -@@ -25943,10 +26564,10 @@ fi +@@ -25945,10 +26564,10 @@ fi done fi @@ -12065,7 +12056,7 @@ else if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 -@@ -25984,36 +26605,39 @@ case "(($ac_try" in +@@ -25986,36 +26605,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12113,7 +12104,7 @@ cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -@@ -26026,20 +26650,21 @@ fi +@@ -26028,20 +26650,21 @@ fi for ac_header in stdlib.h unistd.h do @@ -12144,7 +12135,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26055,32 +26680,33 @@ case "(($ac_try" in +@@ -26057,32 +26680,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12185,7 +12176,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26094,51 +26720,52 @@ case "(($ac_try" in +@@ -26096,51 +26720,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12259,7 +12250,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -26147,21 +26774,23 @@ _ASBOX +@@ -26149,21 +26774,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -12291,7 +12282,7 @@ _ACEOF fi -@@ -26171,11 +26800,11 @@ done +@@ -26173,11 +26800,11 @@ done for ac_func in getpagesize do @@ -12307,7 +12298,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26228,44 +26857,50 @@ case "(($ac_try" in +@@ -26230,44 +26857,50 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12371,7 +12362,7 @@ else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no -@@ -26409,36 +27044,39 @@ case "(($ac_try" in +@@ -26411,36 +27044,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12419,7 +12410,7 @@ if test $ac_cv_func_mmap_fixed_mapped = yes; then cat >>confdefs.h <<\_ACEOF -@@ -26448,10 +27086,10 @@ _ACEOF +@@ -26450,10 +27086,10 @@ _ACEOF fi rm -f conftest.mmap @@ -12433,7 +12424,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26476,20 +27114,21 @@ case "(($ac_try" in +@@ -26478,20 +27114,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12458,7 +12449,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void -@@ -26497,8 +27136,8 @@ fi +@@ -26499,8 +27136,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -12469,7 +12460,7 @@ cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -26508,11 +27147,11 @@ _ACEOF +@@ -26510,11 +27147,11 @@ _ACEOF for ac_func in strftime do @@ -12485,7 +12476,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26565,43 +27204,49 @@ case "(($ac_try" in +@@ -26567,43 +27204,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12548,7 +12539,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -26633,32 +27278,36 @@ case "(($ac_try" in +@@ -26635,32 +27278,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12592,7 +12583,7 @@ if test $ac_cv_lib_intl_strftime = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRFTIME 1 -@@ -26679,11 +27328,11 @@ done +@@ -26681,11 +27328,11 @@ done for ac_func in getcwd gettimeofday getwd putenv strdup strtoul uname do @@ -12608,7 +12599,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26736,35 +27385,41 @@ case "(($ac_try" in +@@ -26738,35 +27385,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12660,7 +12651,7 @@ _ACEOF fi -@@ -26774,8 +27429,8 @@ done +@@ -26776,8 +27429,8 @@ done case "$am__api_version" in 1.01234) @@ -12671,7 +12662,7 @@ { (exit 1); exit 1; }; } ;; *) -@@ -26783,27 +27438,27 @@ echo "$as_me: error: Automake 1.5 or new +@@ -26785,27 +27438,27 @@ echo "$as_me: error: Automake 1.5 or new esac if test -n "0.35.0"; then @@ -12708,7 +12699,7 @@ else case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) -@@ -26818,7 +27473,7 @@ do +@@ -26820,7 +27473,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" @@ -12717,7 +12708,7 @@ break 2 fi done -@@ -26830,20 +27485,20 @@ esac +@@ -26832,20 +27485,20 @@ esac fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then @@ -12745,7 +12736,7 @@ else case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) -@@ -26858,7 +27513,7 @@ do +@@ -26860,7 +27513,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" @@ -12754,7 +12745,7 @@ break 2 fi done -@@ -26870,20 +27525,20 @@ esac +@@ -26872,20 +27525,20 @@ esac fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then @@ -12782,7 +12773,7 @@ else case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) -@@ -26898,7 +27553,7 @@ do +@@ -26900,7 +27553,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" @@ -12791,7 +12782,7 @@ break 2 fi done -@@ -26910,17 +27565,17 @@ esac +@@ -26912,17 +27565,17 @@ esac fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then @@ -12815,7 +12806,7 @@ { (exit 1); exit 1; }; } fi -@@ -26967,10 +27622,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %. +@@ -26969,10 +27622,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %. # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 @@ -12829,7 +12820,7 @@ else case $XGETTEXT in [\\/]* | ?:[\\/]*) -@@ -26985,7 +27640,7 @@ do +@@ -26987,7 +27640,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" @@ -12838,7 +12829,7 @@ break 2 fi done -@@ -26997,20 +27652,20 @@ esac +@@ -26999,20 +27652,20 @@ esac fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then @@ -12866,7 +12857,7 @@ else case $MSGMERGE in [\\/]* | ?:[\\/]*) -@@ -27025,7 +27680,7 @@ do +@@ -27027,7 +27680,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" @@ -12875,7 +12866,7 @@ break 2 fi done -@@ -27037,20 +27692,20 @@ esac +@@ -27039,20 +27692,20 @@ esac fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then @@ -12903,7 +12894,7 @@ else case $MSGFMT in [\\/]* | ?:[\\/]*) -@@ -27065,7 +27720,7 @@ do +@@ -27067,7 +27720,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" @@ -12912,7 +12903,7 @@ break 2 fi done -@@ -27077,34 +27732,34 @@ esac +@@ -27079,34 +27732,34 @@ esac fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then @@ -12958,7 +12949,7 @@ else case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) -@@ -27119,7 +27774,7 @@ do +@@ -27121,7 +27774,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" @@ -12967,7 +12958,7 @@ break 2 fi done -@@ -27131,33 +27786,33 @@ esac +@@ -27133,33 +27786,33 @@ esac fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then @@ -13015,7 +13006,7 @@ { (exit 1); exit 1; }; } fi fi -@@ -27190,29 +27845,32 @@ case "(($ac_try" in +@@ -27192,29 +27845,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13056,7 +13047,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27265,44 +27923,49 @@ case "(($ac_try" in +@@ -27267,44 +27923,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13115,7 +13106,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -@@ -27324,20 +27987,21 @@ _ACEOF +@@ -27326,20 +27987,21 @@ _ACEOF for ac_header in locale.h do @@ -13146,7 +13137,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27353,32 +28017,33 @@ case "(($ac_try" in +@@ -27355,32 +28017,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13187,7 +13178,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27392,51 +28057,52 @@ case "(($ac_try" in +@@ -27394,51 +28057,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13261,7 +13252,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -27445,21 +28111,23 @@ _ASBOX +@@ -27447,21 +28111,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -13293,7 +13284,7 @@ _ACEOF fi -@@ -27467,10 +28135,10 @@ fi +@@ -27469,10 +28135,10 @@ fi done if test $ac_cv_header_locale_h = yes; then @@ -13307,7 +13298,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27493,31 +28161,35 @@ case "(($ac_try" in +@@ -27495,31 +28161,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13350,7 +13341,7 @@ if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF -@@ -27536,17 +28208,17 @@ _ACEOF +@@ -27538,17 +28208,17 @@ _ACEOF INTLLIBS= if test "${ac_cv_header_libintl_h+set}" = set; then @@ -13375,7 +13366,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27562,32 +28234,33 @@ case "(($ac_try" in +@@ -27564,32 +28234,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13416,7 +13407,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27601,51 +28274,52 @@ case "(($ac_try" in +@@ -27603,51 +28274,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13490,7 +13481,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -27654,15 +28328,15 @@ _ASBOX +@@ -27656,15 +28328,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -13511,7 +13502,7 @@ fi if test $ac_cv_header_libintl_h = yes; then -@@ -27672,10 +28346,10 @@ if test $ac_cv_header_libintl_h = yes; t +@@ -27674,10 +28346,10 @@ if test $ac_cv_header_libintl_h = yes; t # # First check in libc # @@ -13525,7 +13516,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27700,38 +28374,42 @@ case "(($ac_try" in +@@ -27702,38 +28374,42 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13578,7 +13569,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27756,43 +28434,47 @@ case "(($ac_try" in +@@ -27758,43 +28434,47 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13637,7 +13628,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27845,35 +28527,41 @@ case "(($ac_try" in +@@ -27847,35 +28527,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13689,7 +13680,7 @@ _ACEOF fi -@@ -27888,10 +28576,10 @@ done +@@ -27890,10 +28576,10 @@ done || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then @@ -13703,7 +13694,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -27923,37 +28611,41 @@ case "(($ac_try" in +@@ -27925,37 +28611,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13755,7 +13746,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -27985,37 +28677,41 @@ case "(($ac_try" in +@@ -27987,37 +28677,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13807,7 +13798,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -28047,32 +28743,36 @@ case "(($ac_try" in +@@ -28049,32 +28743,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13851,7 +13842,7 @@ if test $ac_cv_lib_intl_dgettext = yes; then gt_cv_func_dgettext_libintl=yes fi -@@ -28083,14 +28783,14 @@ fi +@@ -28085,14 +28783,14 @@ fi if test "$gt_cv_func_dgettext_libintl" != "yes" ; then @@ -13873,7 +13864,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -28122,37 +28822,41 @@ case "(($ac_try" in +@@ -28124,37 +28822,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13925,7 +13916,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -28184,32 +28888,36 @@ case "(($ac_try" in +@@ -28186,32 +28888,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13969,7 +13960,7 @@ if test $ac_cv_lib_intl_dcgettext = yes; then gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv -@@ -28235,11 +28943,11 @@ fi +@@ -28237,11 +28943,11 @@ fi for ac_func in bind_textdomain_codeset do @@ -13985,7 +13976,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -28292,35 +29000,41 @@ case "(($ac_try" in +@@ -28294,35 +29000,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14037,7 +14028,7 @@ _ACEOF fi -@@ -28356,10 +29070,10 @@ _ACEOF +@@ -28358,10 +29070,10 @@ _ACEOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -14051,7 +14042,7 @@ else case "$MSGFMT" in /*) -@@ -28383,11 +29097,11 @@ esac +@@ -28385,11 +29097,11 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then @@ -14067,7 +14058,7 @@ fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" -@@ -28395,11 +29109,11 @@ fi +@@ -28397,11 +29109,11 @@ fi for ac_func in dcgettext do @@ -14083,7 +14074,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -28452,43 +29166,49 @@ case "(($ac_try" in +@@ -28454,43 +29166,49 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14145,7 +14136,7 @@ cat >conftest.foo <<_ACEOF msgid "" -@@ -28502,25 +29222,25 @@ msgstr "" +@@ -28504,25 +29222,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" _ACEOF @@ -14180,7 +14171,7 @@ else case $GMSGFMT in [\\/]* | ?:[\\/]*) -@@ -28535,7 +29255,7 @@ do +@@ -28537,7 +29255,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" @@ -14189,7 +14180,7 @@ break 2 fi done -@@ -28548,20 +29268,20 @@ esac +@@ -28550,20 +29268,20 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -14217,7 +14208,7 @@ else case "$XGETTEXT" in /*) -@@ -28585,11 +29305,11 @@ esac +@@ -28587,11 +29305,11 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -14233,7 +14224,7 @@ fi cat >conftest.$ac_ext <<_ACEOF -@@ -28614,30 +29334,33 @@ case "(($ac_try" in +@@ -28616,30 +29334,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14275,7 +14266,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -28690,47 +29413,52 @@ case "(($ac_try" in +@@ -28692,47 +29413,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14337,7 +14328,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" -@@ -28756,8 +29484,8 @@ _ACEOF +@@ -28758,8 +29484,8 @@ _ACEOF if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else @@ -14348,7 +14339,7 @@ XGETTEXT=":" fi fi -@@ -28789,8 +29517,8 @@ echo "${ECHO_T}found xgettext program is +@@ -28791,8 +29517,8 @@ echo "${ECHO_T}found xgettext program is if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -14359,7 +14350,7 @@ NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no -@@ -28814,8 +29542,8 @@ echo $ECHO_N "checking for catalogs to b +@@ -28816,8 +29542,8 @@ echo $ECHO_N "checking for catalogs to b fi done LINGUAS=$NEW_LINGUAS @@ -14370,7 +14361,7 @@ fi if test -n "$LINGUAS"; then -@@ -28853,7 +29581,7 @@ test "x$prefix" = xNONE && prefix=$ac_de +@@ -28855,7 +29581,7 @@ test "x$prefix" = xNONE && prefix=$ac_de test "x$exec_prefix" = xNONE && exec_prefix=$prefix datarootdir=`eval echo "${datarootdir}"` if test "x$CATOBJEXT" = "x.mo" ; then @@ -14379,7 +14370,7 @@ else localedir=`eval echo "${datadir}/locale"` fi -@@ -28867,8 +29595,8 @@ _ACEOF +@@ -28869,8 +29595,8 @@ _ACEOF @@ -14390,7 +14381,7 @@ # Check whether --with-x was given. -@@ -28882,11 +29610,11 @@ if test "x$with_x" = xno; then +@@ -28884,11 +29610,11 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( @@ -14405,7 +14396,7 @@ else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -@@ -28907,7 +29635,7 @@ _ACEOF +@@ -28909,7 +29635,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. @@ -14414,7 +14405,7 @@ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break -@@ -28982,13 +29710,14 @@ case "(($ac_try" in +@@ -28984,13 +29710,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14431,7 +14422,7 @@ (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -28996,7 +29725,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -28998,7 +29725,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec # We can compile using X headers with no special include directory. ac_x_includes= else @@ -14440,7 +14431,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do -@@ -29037,30 +29766,33 @@ case "(($ac_try" in +@@ -29039,30 +29766,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14481,7 +14472,7 @@ if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 -@@ -29069,6 +29801,7 @@ do +@@ -29071,6 +29801,7 @@ do done fi @@ -14489,7 +14480,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -@@ -29091,8 +29824,8 @@ fi +@@ -29093,8 +29824,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then @@ -14500,7 +14491,7 @@ no_x=yes else # If each of the values was on the command line, it overrides each guess. -@@ -29102,8 +29835,8 @@ else +@@ -29104,8 +29835,8 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" @@ -14511,7 +14502,7 @@ fi if test "$no_x" = yes; then -@@ -29124,8 +29857,8 @@ else +@@ -29126,8 +29857,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . @@ -14522,7 +14513,7 @@ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes -@@ -29150,23 +29883,26 @@ case "(($ac_try" in +@@ -29152,23 +29883,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14556,7 +14547,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$ac_xsave_LIBS -R $x_libraries" -@@ -29191,33 +29927,38 @@ case "(($ac_try" in +@@ -29193,33 +29927,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14604,7 +14595,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag -@@ -29263,27 +30004,30 @@ case "(($ac_try" in +@@ -29265,27 +30004,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14643,7 +14634,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -@@ -29315,41 +30059,45 @@ case "(($ac_try" in +@@ -29317,41 +30059,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14699,7 +14690,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -@@ -29381,32 +30129,36 @@ case "(($ac_try" in +@@ -29383,32 +30129,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14743,7 +14734,7 @@ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi -@@ -29414,6 +30166,7 @@ fi +@@ -29416,6 +30166,7 @@ fi fi fi @@ -14751,7 +14742,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" -@@ -29426,10 +30179,10 @@ rm -f core conftest.err conftest.$ac_obj +@@ -29428,10 +30179,10 @@ rm -f core conftest.err conftest.$ac_obj # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. @@ -14765,7 +14756,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29482,37 +30235,41 @@ case "(($ac_try" in +@@ -29484,37 +30235,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14817,7 +14808,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -@@ -29544,41 +30301,45 @@ case "(($ac_try" in +@@ -29546,41 +30301,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14873,7 +14864,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -@@ -29610,32 +30371,36 @@ case "(($ac_try" in +@@ -29612,32 +30371,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14917,7 +14908,7 @@ if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -@@ -29650,10 +30415,10 @@ fi +@@ -29652,10 +30415,10 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. @@ -14931,7 +14922,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29706,37 +30471,41 @@ case "(($ac_try" in +@@ -29708,37 +30471,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14983,7 +14974,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -@@ -29768,32 +30537,36 @@ case "(($ac_try" in +@@ -29770,32 +30537,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15027,7 +15018,7 @@ if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi -@@ -29801,10 +30574,10 @@ fi +@@ -29803,10 +30574,10 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. @@ -15041,7 +15032,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29857,37 +30630,41 @@ case "(($ac_try" in +@@ -29859,37 +30630,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15093,7 +15084,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -@@ -29919,32 +30696,36 @@ case "(($ac_try" in +@@ -29921,32 +30696,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15137,7 +15128,7 @@ if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi -@@ -29952,10 +30733,10 @@ fi +@@ -29954,10 +30733,10 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. @@ -15151,7 +15142,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30008,37 +30789,41 @@ case "(($ac_try" in +@@ -30010,37 +30789,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15203,7 +15194,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -@@ -30070,32 +30855,36 @@ case "(($ac_try" in +@@ -30072,32 +30855,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15247,7 +15238,7 @@ if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi -@@ -30112,10 +30901,10 @@ fi +@@ -30114,10 +30901,10 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry @@ -15261,7 +15252,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -@@ -30147,32 +30936,36 @@ case "(($ac_try" in +@@ -30149,32 +30936,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15305,7 +15296,7 @@ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi -@@ -30182,10 +30975,10 @@ fi +@@ -30184,10 +30975,10 @@ fi fi @@ -15319,7 +15310,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30238,39 +31031,43 @@ case "(($ac_try" in +@@ -30240,39 +31031,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15373,7 +15364,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -@@ -30302,32 +31099,36 @@ case "(($ac_try" in +@@ -30304,32 +31099,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15417,7 +15408,7 @@ if test $ac_cv_lib_nsl_gethostbyname = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 -@@ -30339,10 +31140,10 @@ fi +@@ -30341,10 +31140,10 @@ fi fi @@ -15431,7 +15422,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30395,39 +31196,43 @@ case "(($ac_try" in +@@ -30397,39 +31196,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15485,7 +15476,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -@@ -30459,32 +31264,36 @@ case "(($ac_try" in +@@ -30461,32 +31264,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15529,7 +15520,7 @@ if test $ac_cv_lib_socket_connect = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 -@@ -30496,10 +31305,10 @@ fi +@@ -30498,10 +31305,10 @@ fi fi @@ -15543,7 +15534,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -30552,39 +31361,43 @@ case "(($ac_try" in +@@ -30554,39 +31361,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15597,7 +15588,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -@@ -30616,32 +31429,36 @@ case "(($ac_try" in +@@ -30618,32 +31429,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15641,7 +15632,7 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBRESOLV 1 -@@ -30658,17 +31475,17 @@ fi +@@ -30660,17 +31475,17 @@ fi saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" test -z "$with_xauth" && { if test "${ac_cv_header_X11_Xauth_h+set}" = set; then @@ -15666,7 +15657,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30684,32 +31501,33 @@ case "(($ac_try" in +@@ -30686,32 +31501,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15707,7 +15698,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30723,51 +31541,52 @@ case "(($ac_try" in +@@ -30725,51 +31541,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15781,7 +15772,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -30776,15 +31595,15 @@ _ASBOX +@@ -30778,15 +31595,15 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -15802,7 +15793,7 @@ fi if test $ac_cv_header_X11_Xauth_h = yes; then -@@ -30794,10 +31613,10 @@ else +@@ -30796,10 +31613,10 @@ else fi } @@ -15816,7 +15807,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXau $X_LIBS $LIBS" -@@ -30829,32 +31648,36 @@ case "(($ac_try" in +@@ -30831,32 +31648,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15860,7 +15851,7 @@ if test $ac_cv_lib_Xau_XauGetAuthByAddr = yes; then : else -@@ -30894,20 +31717,21 @@ for ac_header in fcntl.h sys/param.h sys +@@ -30896,20 +31717,21 @@ for ac_header in fcntl.h sys/param.h sys mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \ sys/filsys.h sys/fs_types.h sys/fs/s5param.h do @@ -15891,7 +15882,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30923,32 +31747,33 @@ case "(($ac_try" in +@@ -30925,32 +31747,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15932,7 +15923,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -30962,51 +31787,52 @@ case "(($ac_try" in +@@ -30964,51 +31787,52 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16006,7 +15997,7 @@ ( cat <<\_ASBOX ## ---------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop ## -@@ -31015,21 +31841,23 @@ _ASBOX +@@ -31017,21 +31841,23 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -16038,7 +16029,7 @@ _ACEOF fi -@@ -31059,11 +31887,11 @@ for ac_func in bcopy endgrent endpwent f +@@ -31061,11 +31887,11 @@ for ac_func in bcopy endgrent endpwent f getcwd getmntinfo gettimeofday isascii lchown \ listmntent memcpy mkfifo strchr strerror strrchr vprintf do @@ -16054,7 +16045,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31116,35 +31944,41 @@ case "(($ac_try" in +@@ -31118,35 +31944,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16106,7 +16097,7 @@ _ACEOF fi -@@ -31177,10 +32011,10 @@ list_mounted_fs= +@@ -31179,10 +32011,10 @@ list_mounted_fs= # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, # -lseq on Dynix/PTX, -lgen on Unixware. @@ -16120,7 +16111,7 @@ else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -31218,26 +32052,30 @@ case "(($ac_try" in +@@ -31220,26 +32052,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16156,7 +16147,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_getmntent+set}" = set; then -@@ -31252,8 +32090,8 @@ fi +@@ -31254,8 +32090,8 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -16167,7 +16158,7 @@ ac_res=$ac_cv_search_getmntent if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -31280,10 +32118,10 @@ fi +@@ -31282,10 +32118,10 @@ fi if test -z "$list_mounted_fs"; then # Cray UNICOS 9 @@ -16181,7 +16172,7 @@ else fu_cv_sys_mounted_cray_listmntent=no cat >conftest.$ac_ext <<_ACEOF -@@ -31309,8 +32147,8 @@ rm -f conftest* +@@ -31311,8 +32147,8 @@ rm -f conftest* fi @@ -16192,7 +16183,7 @@ if test $fu_cv_sys_mounted_cray_listmntent = yes; then list_mounted_fs=found -@@ -31328,18 +32166,18 @@ if test $ac_cv_func_getmntent = yes; the +@@ -31330,18 +32166,18 @@ if test $ac_cv_func_getmntent = yes; the if test -z "$list_mounted_fs"; then # 4.3BSD, SunOS, HP-UX, Dynix, Irix @@ -16216,7 +16207,7 @@ if test $fu_cv_sys_mounted_getmntent1 = yes; then list_mounted_fs=found -@@ -31352,10 +32190,10 @@ fi +@@ -31354,10 +32190,10 @@ fi if test -z "$list_mounted_fs"; then # SVR4 @@ -16230,7 +16221,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31376,8 +32214,8 @@ rm -f conftest* +@@ -31378,8 +32214,8 @@ rm -f conftest* fi @@ -16241,7 +16232,7 @@ if test $fu_cv_sys_mounted_getmntent2 = yes; then list_mounted_fs=found -@@ -31389,8 +32227,8 @@ fi +@@ -31391,8 +32227,8 @@ fi fi if test -z "$list_mounted_fs"; then @@ -16252,7 +16243,7 @@ { (exit 1); exit 1; }; } fi -@@ -31398,10 +32236,10 @@ fi +@@ -31400,10 +32236,10 @@ fi if test -z "$list_mounted_fs"; then # DEC Alpha running OSF/1. @@ -16266,7 +16257,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31428,32 +32266,36 @@ case "(($ac_try" in +@@ -31430,32 +32266,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16310,7 +16301,7 @@ if test $fu_cv_sys_mounted_getsstat = yes; then list_mounted_fs=found -@@ -31466,10 +32308,10 @@ fi +@@ -31468,10 +32308,10 @@ fi if test -z "$list_mounted_fs"; then # AIX. @@ -16324,7 +16315,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31484,20 +32326,21 @@ case "(($ac_try" in +@@ -31486,20 +32326,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16349,7 +16340,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_mounted_vmount=no -@@ -31506,8 +32349,8 @@ fi +@@ -31508,8 +32349,8 @@ fi rm -f conftest.err conftest.$ac_ext fi @@ -16360,7 +16351,7 @@ if test $fu_cv_sys_mounted_vmount = yes; then list_mounted_fs=found -@@ -31520,10 +32363,10 @@ fi +@@ -31522,10 +32363,10 @@ fi if test -z "$list_mounted_fs"; then # SVR3 @@ -16374,7 +16365,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31541,20 +32384,21 @@ case "(($ac_try" in +@@ -31543,20 +32384,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16399,7 +16390,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_mounted_fread_fstyp=no -@@ -31563,8 +32407,8 @@ fi +@@ -31565,8 +32407,8 @@ fi rm -f conftest.err conftest.$ac_ext fi @@ -16410,7 +16401,7 @@ if test $fu_cv_sys_mounted_fread_fstyp = yes; then list_mounted_fs=found -@@ -31577,10 +32421,10 @@ fi +@@ -31579,10 +32421,10 @@ fi if test -z "$list_mounted_fs"; then # 4.4BSD and DEC OSF/1. @@ -16424,7 +16415,7 @@ else ok= -@@ -31607,8 +32451,8 @@ test -n "$ok" \ +@@ -31609,8 +32451,8 @@ test -n "$ok" \ fi @@ -16435,7 +16426,7 @@ if test $fu_cv_sys_mounted_getmntinfo = yes; then list_mounted_fs=found -@@ -31623,10 +32467,10 @@ fi +@@ -31625,10 +32467,10 @@ fi if test -z "$list_mounted_fs"; then # Ultrix @@ -16449,7 +16440,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31643,20 +32487,21 @@ case "(($ac_try" in +@@ -31645,20 +32487,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16474,7 +16465,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_mounted_getmnt=no -@@ -31665,8 +32510,8 @@ fi +@@ -31667,8 +32510,8 @@ fi rm -f conftest.err conftest.$ac_ext fi @@ -16485,7 +16476,7 @@ if test $fu_cv_sys_mounted_getmnt = yes; then list_mounted_fs=found -@@ -31679,10 +32524,10 @@ fi +@@ -31681,10 +32524,10 @@ fi if test -z "$list_mounted_fs"; then # SVR2 @@ -16499,7 +16490,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31697,20 +32542,21 @@ case "(($ac_try" in +@@ -31699,20 +32542,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16524,7 +16515,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_mounted_fread=no -@@ -31719,8 +32565,8 @@ fi +@@ -31721,8 +32565,8 @@ fi rm -f conftest.err conftest.$ac_ext fi @@ -16535,7 +16526,7 @@ if test $fu_cv_sys_mounted_fread = yes; then list_mounted_fs=found -@@ -31732,15 +32578,15 @@ fi +@@ -31734,15 +32578,15 @@ fi fi if test -z "$list_mounted_fs"; then @@ -16555,7 +16546,7 @@ space=no # Perform only the link test since it seems there are no variants of the -@@ -31751,10 +32597,10 @@ space=no +@@ -31753,10 +32597,10 @@ space=no # is what it gets when this test fails. if test $space = no; then # SVR4 @@ -16569,7 +16560,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31778,31 +32624,35 @@ case "(($ac_try" in +@@ -31780,31 +32624,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16612,7 +16603,7 @@ if test $fu_cv_sys_stat_statvfs = yes; then space=yes -@@ -31815,10 +32665,10 @@ fi +@@ -31817,10 +32665,10 @@ fi if test $space = no; then # DEC Alpha running OSF/1 @@ -16626,7 +16617,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs3_osf1=no -@@ -31846,37 +32696,40 @@ case "(($ac_try" in +@@ -31848,37 +32696,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16675,7 +16666,7 @@ if test $fu_cv_sys_stat_statfs3_osf1 = yes; then space=yes -@@ -31889,10 +32742,10 @@ fi +@@ -31891,10 +32742,10 @@ fi if test $space = no; then # AIX @@ -16689,7 +16680,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs2_bsize=no -@@ -31926,37 +32779,40 @@ case "(($ac_try" in +@@ -31928,37 +32779,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16738,7 +16729,7 @@ if test $fu_cv_sys_stat_statfs2_bsize = yes; then space=yes -@@ -31969,10 +32825,10 @@ fi +@@ -31971,10 +32825,10 @@ fi if test $space = no; then # SVR3 @@ -16752,7 +16743,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs4=no -@@ -31997,37 +32853,40 @@ case "(($ac_try" in +@@ -31999,37 +32853,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16801,7 +16792,7 @@ if test $fu_cv_sys_stat_statfs4 = yes; then space=yes -@@ -32040,10 +32899,10 @@ fi +@@ -32042,10 +32899,10 @@ fi if test $space = no; then # 4.4BSD and NetBSD @@ -16815,7 +16806,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs2_fsize=no -@@ -32074,37 +32933,40 @@ case "(($ac_try" in +@@ -32076,37 +32933,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16864,7 +16855,7 @@ if test $fu_cv_sys_stat_statfs2_fsize = yes; then space=yes -@@ -32117,10 +32979,10 @@ fi +@@ -32119,10 +32979,10 @@ fi if test $space = no; then # Ultrix @@ -16878,7 +16869,7 @@ else if test "$cross_compiling" = yes; then fu_cv_sys_stat_fs_data=no -@@ -32155,37 +33017,40 @@ case "(($ac_try" in +@@ -32157,37 +33017,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16927,7 +16918,7 @@ if test $fu_cv_sys_stat_fs_data = yes; then space=yes -@@ -32211,13 +33076,14 @@ case "(($ac_try" in +@@ -32213,13 +33076,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16944,7 +16935,7 @@ (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -32229,7 +33095,7 @@ _ACEOF +@@ -32231,7 +33095,7 @@ _ACEOF space=yes else @@ -16953,7 +16944,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 -@@ -32247,10 +33113,10 @@ fi +@@ -32249,10 +33113,10 @@ fi # Check for SunOS statfs brokenness wrt partitions 2GB and larger. # If <sys/vfs.h> exists and struct statfs has a member named f_spare, # enable the work-around code in fsusage.c. @@ -16967,7 +16958,7 @@ else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32278,20 +33144,21 @@ case "(($ac_try" in +@@ -32280,20 +33144,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16992,7 +16983,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fu_cv_sys_truncating_statfs=no -@@ -32307,11 +33174,11 @@ cat >>confdefs.h <<\_ACEOF +@@ -32309,11 +33174,11 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -17008,7 +16999,7 @@ test -d /afs && cat >>confdefs.h <<\_ACEOF #define AFS 1 -@@ -32466,32 +33333,32 @@ fi +@@ -32468,32 +33333,32 @@ fi if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ @@ -17052,7 +17043,7 @@ else case $GTKDOC_CHECK in [\\/]* | ?:[\\/]*) -@@ -32506,7 +33373,7 @@ do +@@ -32508,7 +33373,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" @@ -17061,7 +17052,7 @@ break 2 fi done -@@ -32518,11 +33385,11 @@ esac +@@ -32520,11 +33385,11 @@ esac fi GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK if test -n "$GTKDOC_CHECK"; then @@ -17077,7 +17068,7 @@ fi -@@ -32582,11 +33449,12 @@ _ACEOF +@@ -32584,11 +33449,12 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -17092,7 +17083,7 @@ *) $as_unset $ac_var ;; esac ;; esac -@@ -32619,12 +33487,12 @@ echo "$as_me: WARNING: Cache variable $a +@@ -32621,12 +33487,12 @@ echo "$as_me: WARNING: Cache variable $a if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -17109,7 +17100,7 @@ fi fi rm -f confcache -@@ -32640,7 +33508,7 @@ ac_ltlibobjs= +@@ -32642,7 +33508,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -17118,7 +17109,7 @@ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -32652,79 +33520,79 @@ LTLIBOBJS=$ac_ltlibobjs +@@ -32654,79 +33520,79 @@ LTLIBOBJS=$ac_ltlibobjs if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -17220,7 +17211,7 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -@@ -32733,26 +33601,27 @@ fi +@@ -32735,26 +33601,27 @@ fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then @@ -17255,7 +17246,7 @@ #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -32765,7 +33634,7 @@ ac_cs_silent=false +@@ -32767,7 +33634,7 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF @@ -17264,7 +17255,7 @@ ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -@@ -32775,7 +33644,7 @@ DUALCASE=1; export DUALCASE # for MKS sh +@@ -32777,7 +33644,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -17273,7 +17264,7 @@ # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -@@ -32797,17 +33666,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE +@@ -32799,17 +33666,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -17328,7 +17319,7 @@ fi # Support unset when possible. -@@ -32823,8 +33720,6 @@ fi +@@ -32825,8 +33720,6 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) @@ -17337,7 +17328,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -@@ -32847,7 +33742,7 @@ if test "x$as_myself" = x; then +@@ -32849,7 +33742,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then @@ -17346,7 +17337,7 @@ { (exit 1); exit 1; } fi -@@ -32860,17 +33755,10 @@ PS2='> ' +@@ -32862,17 +33755,10 @@ PS2='> ' PS4='+ ' # NLS nuisances. @@ -17368,7 +17359,7 @@ # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -32892,7 +33780,7 @@ as_me=`$as_basename -- "$0" || +@@ -32894,7 +33780,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || @@ -17377,7 +17368,7 @@ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q -@@ -32943,7 +33831,7 @@ $as_unset CDPATH +@@ -32945,7 +33831,7 @@ $as_unset CDPATH s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || @@ -17386,7 +17377,7 @@ { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems -@@ -32971,7 +33859,6 @@ case `echo -n x` in +@@ -32973,7 +33859,6 @@ case `echo -n x` in *) ECHO_N='-n';; esac @@ -17394,7 +17385,7 @@ if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -32984,19 +33871,22 @@ if test -d conf$$.dir; then +@@ -32986,19 +33871,22 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir @@ -17428,7 +17419,7 @@ else as_ln_s='cp -p' fi -@@ -33021,10 +33911,10 @@ else +@@ -33023,10 +33911,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then @@ -17441,16 +17432,16 @@ esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi -@@ -33047,7 +33937,7 @@ exec 6>&1 +@@ -33049,7 +33937,7 @@ exec 6>&1 # values after options handling. ac_log=" - This file was extended by libgtop $as_me 2.22.3, which was + This file was extended by libgtop $as_me 2.24.0, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -33060,7 +33950,7 @@ on `(hostname || uname -n) 2>/dev/null | +@@ -33062,7 +33950,7 @@ on `(hostname || uname -n) 2>/dev/null | _ACEOF @@ -17459,7 +17450,7 @@ # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" -@@ -33068,7 +33958,7 @@ config_commands="$ac_config_commands" +@@ -33070,7 +33958,7 @@ config_commands="$ac_config_commands" _ACEOF @@ -17468,7 +17459,7 @@ ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -@@ -33081,9 +33971,9 @@ Usage: $0 [OPTIONS] [FILE]... +@@ -33083,9 +33971,9 @@ Usage: $0 [OPTIONS] [FILE]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] @@ -17480,14 +17471,14 @@ Configuration files: $config_files -@@ -33097,24 +33987,25 @@ $config_commands +@@ -33099,24 +33987,25 @@ $config_commands Report bugs to <bug-autoconf@gnu.org>." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ - libgtop config.status 2.22.3 + libgtop config.status 2.24.0 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.62, @@ -17513,7 +17504,7 @@ ac_need_defaults=: while test $# != 0 do -@@ -33136,30 +34027,36 @@ do +@@ -33138,30 +34027,36 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) @@ -17556,7 +17547,7 @@ Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; -@@ -33178,27 +34075,29 @@ if $ac_cs_silent; then +@@ -33180,27 +34075,29 @@ if $ac_cs_silent; then fi _ACEOF @@ -17593,7 +17584,7 @@ # # INIT-COMMANDS # -@@ -33207,7 +34106,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac +@@ -33209,7 +34106,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac _ACEOF @@ -17602,7 +17593,7 @@ # Handling of arguments. for ac_config_target in $ac_config_targets -@@ -33245,8 +34144,8 @@ do +@@ -33247,8 +34144,8 @@ do "libgtopconfig.h") CONFIG_FILES="$CONFIG_FILES libgtopconfig.h" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -17613,7 +17604,7 @@ { (exit 1); exit 1; }; };; esac done -@@ -33287,357 +34186,143 @@ $debug || +@@ -33289,357 +34186,143 @@ $debug || (umask 077 && mkdir "$tmp") } || { @@ -18079,7 +18070,7 @@ # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty -@@ -33653,19 +34338,133 @@ s/^[^=]*=[ ]*$// +@@ -33655,19 +34338,133 @@ s/^[^=]*=[ ]*$// }' fi @@ -18217,7 +18208,7 @@ { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -33694,26 +34493,38 @@ echo "$as_me: error: Invalid tag $ac_tag +@@ -33696,26 +34493,38 @@ echo "$as_me: error: Invalid tag $ac_tag [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -18264,7 +18255,7 @@ esac ;; esac -@@ -33723,7 +34534,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ +@@ -33725,7 +34534,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || @@ -18273,7 +18264,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -33749,7 +34560,7 @@ echo X"$ac_file" | +@@ -33751,7 +34560,7 @@ echo X"$ac_file" | as_dirs= while :; do case $as_dir in #( @@ -18282,7 +18273,7 @@ *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -33758,7 +34569,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ +@@ -33760,7 +34569,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -18291,7 +18282,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -33779,17 +34590,17 @@ echo X"$as_dir" | +@@ -33781,17 +34590,17 @@ echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -18313,7 +18304,7 @@ case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -33829,12 +34640,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ +@@ -33831,12 +34640,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ esac _ACEOF @@ -18329,7 +18320,7 @@ p q } -@@ -33843,13 +34655,14 @@ case `sed -n '/datarootdir/ { +@@ -33845,13 +34655,14 @@ case `sed -n '/datarootdir/ { /@infodir@/p /@localedir@/p /@mandir@/p @@ -18348,7 +18339,7 @@ ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g -@@ -33863,15 +34676,16 @@ _ACEOF +@@ -33865,15 +34676,16 @@ _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? @@ -18369,7 +18360,7 @@ s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -33881,135 +34695,74 @@ s&@abs_builddir@&$ac_abs_builddir&;t t +@@ -33883,135 +34695,74 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack @@ -18546,7 +18537,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -34029,8 +34782,8 @@ echo X$ac_file | +@@ -34031,8 +34782,8 @@ echo X$ac_file | s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -18557,7 +18548,7 @@ ;; esac -@@ -34051,7 +34804,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/ +@@ -34053,7 +34804,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || @@ -18566,7 +18557,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -34095,7 +34848,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ +@@ -34097,7 +34848,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || @@ -18575,7 +18566,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -34121,7 +34874,7 @@ echo X"$file" | +@@ -34123,7 +34874,7 @@ echo X"$file" | as_dirs= while :; do case $as_dir in #( @@ -18584,7 +18575,7 @@ *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -34130,7 +34883,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ +@@ -34132,7 +34883,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -18593,7 +18584,7 @@ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -34151,8 +34904,8 @@ echo X"$as_dir" | +@@ -34153,8 +34904,8 @@ echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -18604,7 +18595,7 @@ { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" -@@ -34172,8 +34925,8 @@ done +@@ -34174,8 +34925,8 @@ done "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" if test ! -f "po/Makefile"; then @@ -18615,7 +18606,7 @@ { (exit 1); exit 1; }; } fi mv "po/Makefile" "po/Makefile.tmp" -@@ -34195,6 +34948,11 @@ _ACEOF +@@ -34197,6 +34948,11 @@ _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save @@ -18627,7 +18618,7 @@ # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. -@@ -34216,4 +34974,8 @@ if test "$no_create" != yes; then +@@ -34218,4 +34974,8 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi diff --git a/devel/libgtop/files/patch-libgtop-sysdeps.m4 b/devel/libgtop/files/patch-libgtop-sysdeps.m4 index 0b72b319b545..1805da02a85d 100644 --- a/devel/libgtop/files/patch-libgtop-sysdeps.m4 +++ b/devel/libgtop/files/patch-libgtop-sysdeps.m4 @@ -1,14 +1,5 @@ --- libgtop-sysdeps.m4.orig 2008-04-21 14:58:38.000000000 -0400 +++ libgtop-sysdeps.m4 2008-12-06 16:16:00.000000000 -0500 -@@ -79,6 +79,8 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ - libgtop_sysdeps_dir=freebsd - libgtop_use_machine_h=yes - libgtop_need_server=yes -+ libgtop_sysdeps_private_mountlist=yes -+ libgtop_sysdeps_private_fsusage=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2' - ;; - solaris*) @@ -158,6 +160,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat" diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am new file mode 100644 index 000000000000..25ec1f7d7949 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.am @@ -0,0 +1,17 @@ +--- sysdeps/freebsd/Makefile.am.orig 2008-09-29 17:21:56.000000000 -0400 ++++ sysdeps/freebsd/Makefile.am 2008-09-29 17:22:07.000000000 -0400 +@@ -7,12 +7,12 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid. + cpu.c msg_limits.c sem_limits.c loadavg.c \ + uptime.c netlist.c fsusage.c mem.c \ + mountlist.c procopenfiles.c procwd.c \ +- procaffinity.c glibtop_private.c ++ procaffinity.c glibtop_private.c open.c + + libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) + + libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS) +-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \ ++libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \ + proclist.c procstate.c procuid.c \ + proctime.c procmem.c procsignal.c \ + prockernel.c procsegment.c procargs.c \ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in index e8a6bd895fa5..f68c6d0d186f 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in +++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in @@ -1,28 +1,40 @@ ---- sysdeps/freebsd/Makefile.in.orig 2007-11-02 23:55:07.000000000 -0400 -+++ sysdeps/freebsd/Makefile.in 2007-11-02 23:58:08.000000000 -0400 -@@ -54,7 +54,7 @@ libgtop_sysdeps_2_0_la_LIBADD = +--- sysdeps/freebsd/Makefile.in.orig 2008-09-29 17:24:03.000000000 -0400 ++++ sysdeps/freebsd/Makefile.in 2008-09-29 17:24:44.000000000 -0400 +@@ -54,12 +54,13 @@ libgtop_sysdeps_2_0_la_LIBADD = am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo \ shm_limits.lo cpu.lo msg_limits.lo sem_limits.lo loadavg.lo \ - uptime.lo netlist.lo fsusage.lo mem.lo procopenfiles.lo \ -- procwd.lo glibtop_private.lo -+ procwd.lo glibtop_private.lo mountlist.lo + uptime.lo netlist.lo fsusage.lo mem.lo mountlist.lo \ +- procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo ++ procopenfiles.lo procwd.lo procaffinity.lo glibtop_private.lo \ ++ open.lo libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS) am__DEPENDENCIES_1 = libgtop_sysdeps_suid_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@@ -303,7 +303,7 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid. + $(am__DEPENDENCIES_1) +-am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo swap.lo \ ++am_libgtop_sysdeps_suid_2_0_la_OBJECTS = suid_open.lo close.lo swap.lo \ + proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ + procsignal.lo prockernel.lo procsegment.lo procargs.lo \ + procmap.lo netload.lo ppp.lo +@@ -306,11 +307,11 @@ libgtop_sysdeps_2_0_la_SOURCES = nosuid. cpu.c msg_limits.c sem_limits.c loadavg.c \ uptime.c netlist.c fsusage.c mem.c \ - procopenfiles.c procwd.c \ -- glibtop_private.c -+ glibtop_private.c mountlist.c + mountlist.c procopenfiles.c procwd.c \ +- procaffinity.c glibtop_private.c ++ procaffinity.c glibtop_private.c open.c libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_suid_2_0_la_LIBADD = $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS) -@@ -374,6 +374,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glibtop_private.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadavg.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem.Plo@am__quote@ +-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c swap.c \ ++libgtop_sysdeps_suid_2_0_la_SOURCES = suid_open.c close.c swap.c \ + proclist.c procstate.c procuid.c \ + proctime.c procmem.c procsignal.c \ + prockernel.c procsegment.c procargs.c \ +@@ -385,6 +386,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlist.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netload.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nosuid.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suid_open.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procaffinity.Plo@am__quote@ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c deleted file mode 100644 index 90da05b1b71d..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c +++ /dev/null @@ -1,61 +0,0 @@ ---- sysdeps/freebsd/fsusage.c.orig 2007-06-03 16:06:05.000000000 -0400 -+++ sysdeps/freebsd/fsusage.c 2008-02-09 19:50:44.000000000 -0500 -@@ -10,6 +10,7 @@ - #include <unistd.h> - #include <sys/param.h> - #include <sys/mount.h> -+#include <sys/statvfs.h> - #if __FreeBSD_version >= 600000 || defined(__FreeBSD_kernel__) - #include <libgeom.h> - #include <sys/resource.h> -@@ -21,15 +22,13 @@ - #include <string.h> - #include <stdlib.h> - --void --_glibtop_freebsd_get_fsusage_read_write(glibtop *server, -- glibtop_fsusage *buf, -- const char *path); -+static const unsigned long _glibtop_sysdeps_fsusage = -+(1L << GLIBTOP_FSUSAGE_BLOCKS) + (1L << GLIBTOP_FSUSAGE_BFREE) -++ (1L << GLIBTOP_FSUSAGE_BAVAIL) + (1L << GLIBTOP_FSUSAGE_FILES) -++ (1L << GLIBTOP_FSUSAGE_FFREE) + (1L << GLIBTOP_FSUSAGE_BLOCK_SIZE); - --void --_glibtop_freebsd_get_fsusage_read_write(glibtop *server, -- glibtop_fsusage *buf, -- const char *path) -+static void -+_glibtop_get_fsusage_read_write (glibtop *server, glibtop_fsusage *buf, const char *path) - { - int result; - struct statfs sfs; -@@ -135,3 +134,28 @@ _glibtop_freebsd_get_fsusage_read_write( - #endif - buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE); - } -+ -+void -+glibtop_get_fsusage_s(glibtop *server, glibtop_fsusage *buf, const char *path) -+{ -+ struct statvfs fsd; -+ -+ glibtop_init_r (&server, 0, 0); -+ -+ memset (buf, 0, sizeof (glibtop_fsusage)); -+ -+ if (statvfs (path, &fsd) < 0) -+ return; -+ -+ buf->block_size = fsd.f_frsize; -+ buf->blocks = fsd.f_blocks; -+ buf->bfree = fsd.f_bfree; -+ buf->bavail = (fsd.f_bavail > fsd.f_bfree) ? 0 : fsd.f_bavail; -+ buf->files = fsd.f_files; -+ buf->ffree = fsd.f_ffree; -+ -+ buf->flags = _glibtop_sysdeps_fsusage; -+ -+ _glibtop_get_fsusage_read_write(server, buf, path); -+} -+ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c b/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c deleted file mode 100644 index 7c1b1774cd89..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c +++ /dev/null @@ -1,171 +0,0 @@ ---- sysdeps/freebsd/mountlist.c.orig 2008-02-15 02:11:59.000000000 -0500 -+++ sysdeps/freebsd/mountlist.c 2008-02-15 02:28:14.000000000 -0500 -@@ -0,0 +1,168 @@ -+/* mountlist.c -- return a list of mounted filesystems -+ Copyright (C) 1991, 1992 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#include <config.h> -+ -+#include <glib.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <sys/types.h> -+#include <sys/param.h> -+#include <sys/mount.h> -+ -+#include <string.h> -+ -+#include <glibtop.h> -+#include <glibtop/mountlist.h> -+ -+/* A mount table entry. */ -+struct mount_entry -+{ -+ char *me_devname; /* Device node pathname, including "/dev/". */ -+ char *me_mountdir; /* Mount point directory pathname. */ -+ char *me_type; /* "nfs", "4.2", etc. */ -+ dev_t me_dev; /* Device number of me_mountdir. */ -+ struct mount_entry *me_next; -+}; -+ -+static struct mount_entry *read_filesystem_list (void); -+ -+/* Return a list of the currently mounted filesystems, or NULL on error. -+ Add each entry to the tail of the list so that they stay in order. -+*/ -+ -+static struct mount_entry * -+read_filesystem_list (void) -+{ -+ struct mount_entry *mount_list; -+ struct mount_entry *me; -+ struct mount_entry *mtail; -+ -+ /* Start the list off with a dummy entry. */ -+ me = g_new (struct mount_entry, 1); -+ me->me_next = NULL; -+ mount_list = mtail = me; -+ { -+ struct statfs *fsp; -+ int entries; -+ -+ entries = getmntinfo (&fsp, MNT_NOWAIT); -+ if (entries < 0) -+ return NULL; -+ while (entries-- > 0) -+ { -+ me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry)); -+ me->me_devname = g_strdup (fsp->f_mntfromname); -+ me->me_mountdir = g_strdup (fsp->f_mntonname); -+ me->me_type = g_strdup (fsp->f_fstypename); -+ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ -+ me->me_next = NULL; -+ -+ /* Add to the linked list. */ -+ mtail->me_next = me; -+ mtail = me; -+ fsp++; -+ } -+ } -+ -+ /* Free the dummy head. */ -+ me = mount_list; -+ mount_list = mount_list->me_next; -+ g_free (me); -+ return mount_list; -+} -+ -+static gboolean ignore_mount_entry(const struct mount_entry *me) -+{ -+ /* keep sorted */ -+ static const char ignored[][17] = { -+ "autofs", -+ "devfs", -+ "fusectl", -+ "linprocfs", -+ "linsysfs", -+ "mfs", -+ "none", -+ "nfs", -+ "nullfs", -+ "nwfs", -+ "portalfs", -+ "proc", -+ "procfs", -+ "smbfs", -+ "tmpfs", -+ "unionfs", -+ "unknown" -+ }; -+ -+ typedef int (*Comparator)(const void*, const void*); -+ -+ return bsearch(me->me_type, -+ ignored, G_N_ELEMENTS(ignored), sizeof ignored[0], -+ (Comparator) strcmp) != NULL; -+} -+ -+ -+glibtop_mountentry * -+glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs) -+{ -+ struct mount_entry *entries, *cur, *next; -+ -+ GArray *mount_array = g_array_new(FALSE, FALSE, -+ sizeof(glibtop_mountentry)); -+ -+ glibtop_init_r (&server, 0, 0); -+ -+ memset (buf, 0, sizeof (glibtop_mountlist)); -+ -+ /* Read filesystem list. */ -+ -+ if((entries = read_filesystem_list ()) == NULL) -+ return NULL; -+ -+ for (cur = &entries[0]; cur != NULL; cur = next) { -+ -+ if(all_fs || !ignore_mount_entry(cur)) { -+ /* add a new glibtop_mountentry */ -+ glibtop_mountentry e; -+ -+ g_strlcpy(e.devname, cur->me_devname, sizeof e.devname); -+ g_strlcpy(e.mountdir, cur->me_mountdir, sizeof e.mountdir); -+ g_strlcpy(e.type, cur->me_type, sizeof e.type); -+ e.dev = cur->me_dev; -+ -+ g_array_append_val(mount_array, e); -+ } -+ -+ /* free current mount_entry and move to the next */ -+ next = cur->me_next; -+ g_free(cur->me_devname); -+ g_free(cur->me_mountdir); -+ g_free(cur->me_type); -+ g_free(cur); -+ } -+ -+ buf->size = sizeof (glibtop_mountentry); -+ buf->number = mount_array->len; -+ buf->total = buf->number * buf->size; -+ -+ buf->flags = (1 << GLIBTOP_MOUNTLIST_SIZE) -+ | (1 << GLIBTOP_MOUNTLIST_NUMBER) -+ | (1 << GLIBTOP_MOUNTLIST_TOTAL); -+ -+ return (glibtop_mountentry*) g_array_free(mount_array, FALSE); -+} diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c new file mode 100644 index 000000000000..acb327f98162 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_nosuid.c @@ -0,0 +1,19 @@ +--- sysdeps/freebsd/nosuid.c.orig 2008-09-29 17:28:31.000000000 -0400 ++++ sysdeps/freebsd/nosuid.c 2008-09-29 17:28:39.000000000 -0400 +@@ -21,16 +21,8 @@ + + #include <config.h> + #include <glibtop.h> +-#include <glibtop/open.h> + #include <glibtop/close.h> + + void +-glibtop_open_s (glibtop *server, +- const char *program_name, +- const unsigned long features, +- const unsigned flags) +-{ } +- +-void + glibtop_close_s (glibtop *server) + { } diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_open.c new file mode 100644 index 000000000000..f7bf0e3b1488 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_open.c @@ -0,0 +1,91 @@ +--- sysdeps/freebsd/open.c.orig 2008-05-23 18:13:23.000000000 -0400 ++++ sysdeps/freebsd/open.c 2008-09-29 17:23:22.000000000 -0400 +@@ -20,76 +20,33 @@ + */ + + #include <config.h> ++#include <sys/types.h> ++#include <sys/sysctl.h> + #include <glibtop.h> +-#include <glibtop/error.h> + #include <glibtop/open.h> +-#include <glibtop/init_hooks.h> +- +-/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */ +- +-void +-glibtop_init_p (glibtop *server, const unsigned long features, +- const unsigned flags) +-{ +- const _glibtop_init_func_t *init_fkt; +- +- if (server == NULL) +- glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); +- +- /* Do the initialization, but only if not already initialized. */ +- +- if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) { +- glibtop_open_p (server, "glibtop", features, flags); ++#include <glibtop/cpu.h> ++#include <glibtop/error.h> + +- for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++) +- (*init_fkt) (server); ++#include <glibtop_private.h> + +- server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS; +- } +-} + + void +-glibtop_open_p (glibtop *server, const char *program_name, ++glibtop_open_s (glibtop *server, const char *program_name, + const unsigned long features, + const unsigned flags) + { +-#ifdef DEBUG +- fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); +-#endif ++ int ncpus; ++ size_t len; + +- /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ ++ len = sizeof (ncpus); ++ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); ++ server->real_ncpu = ncpus - 1; ++ server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu); + +- server->machine.uid = getuid (); +- server->machine.euid = geteuid (); +- server->machine.gid = getgid (); +- server->machine.egid = getegid (); + #if defined(__FreeBSD_kernel__) + server->os_version_code = __FreeBSD_kernel_version; + #else + server->os_version_code = __FreeBSD_version; + #endif +- /* Setup machine-specific data */ +- server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); +- +- if (server->machine.kd == NULL) +- glibtop_error_io_r (server, "kvm_open"); +- +- /* Drop priviledges. */ +- +- if (setreuid (server->machine.euid, server->machine.uid)) +- _exit (1); +- +- if (setregid (server->machine.egid, server->machine.gid)) +- _exit (1); +- +- /* !!! END OF SUID ROOT PART !!! */ +- +- /* Our effective uid is now those of the user invoking the server, +- * so we do no longer have any priviledges. */ + +- /* NOTE: On FreeBSD, we do not need to be suid root, we just need to +- * be sgid kmem. +- * +- * The server will only use setegid() to get back it's priviledges, +- * so it will fail if it is suid root and not sgid kmem. */ + } diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c deleted file mode 100644 index a2bdf79aee8b..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c +++ /dev/null @@ -1,36 +0,0 @@ ---- sysdeps/freebsd/procmap.c.orig 2008-04-21 14:58:26.000000000 -0400 -+++ sysdeps/freebsd/procmap.c 2008-08-02 15:06:46.000000000 -0400 -@@ -41,7 +41,17 @@ - #define _KERNEL - #include <sys/pipe.h> - #include <sys/conf.h> -+#undef _KERNEL -+#if __FreeBSD_version >= 800038 -+#define _WANT_FILE - #include <sys/file.h> -+#undef _WANT_FILE -+#else -+#define _KERNEL -+#include <sys/file.h> -+#undef _KERNEL -+#endif -+#define _KERNEL - #include <sys/mount.h> - #include <ufs/ufs/quota.h> - #include <ufs/ufs/inode.h> -@@ -103,8 +113,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glib - - if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si, - sizeof (si)) != sizeof (si) || -+#if __FreeBSD_version >= 800039 -+ kvm_read (server->machine.kd, (gulong) cdev2priv(&si), (char *) &priv, -+ sizeof (priv)) -+#else - kvm_read (server->machine.kd, (gulong) si.si_priv, (char *) &priv, -- sizeof (priv)) != sizeof (priv)) -+ sizeof (priv)) -+#endif -+ != sizeof (priv)) - { - glibtop_warn_io_r (server, "kvm_read (si)"); - return; diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c index 9ca014c1b508..e14dd39bdbe2 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c @@ -1,136 +1,50 @@ ---- sysdeps/freebsd/procopenfiles.c.orig 2008-12-06 20:43:44.256309000 -0500 -+++ sysdeps/freebsd/procopenfiles.c 2008-12-06 20:44:45.000000000 -0500 -@@ -28,6 +28,16 @@ - #include <glibtop/error.h> - #include <glibtop/procopenfiles.h> - #include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <sys/un.h> -+#include <sys/user.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#ifdef HAVE_KINFO_GETFILE +--- sysdeps/freebsd/procopenfiles.c.orig 2008-08-18 11:23:36.000000000 -0400 ++++ sysdeps/freebsd/procopenfiles.c 2008-12-07 00:17:26.000000000 -0500 +@@ -35,6 +35,9 @@ + #include <sys/user.h> + #include <netinet/in.h> + #include <arpa/inet.h> ++#ifdef HAVE_KINFO_PROC +#include <libutil.h> +#endif #include <string.h> #include <stdlib.h> -@@ -46,6 +56,63 @@ _glibtop_init_proc_open_files_s (glibtop - server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; - } - -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+static char * -+addr_to_string(struct sockaddr_storage *ss) -+{ -+ char *buffer; -+ char buffer2[INET6_ADDRSTRLEN]; -+ struct sockaddr_in6 *sin6; -+ struct sockaddr_in *sin; -+ struct sockaddr_un *sun; -+ -+ switch (ss->ss_family) { -+ case AF_LOCAL: -+ sun = (struct sockaddr_un *)ss; -+ if (strlen(sun->sun_path) == 0) -+ buffer = g_strdup("-"); -+ else -+ buffer = g_strdup(sun->sun_path); -+ break; -+ case AF_INET: -+ sin = (struct sockaddr_in *)ss; -+ buffer = g_strdup(inet_ntoa(sin->sin_addr)); -+ break; -+ case AF_INET6: -+ sin6 = (struct sockaddr_in6 *)ss; -+ if (inet_ntop(AF_INET6, &sin6->sin6_addr, buffer2, -+ sizeof(buffer2)) != NULL) -+ buffer = g_strdup(buffer2); -+ else -+ buffer = g_strdup("-"); -+ break; -+ } -+ -+ return buffer; -+} -+ -+static int -+addr_to_port(struct sockaddr_storage *ss) -+{ -+ int port; -+ struct sockaddr_in6 *sin6; -+ struct sockaddr_in *sin; -+ -+ switch (ss->ss_family) { -+ case AF_INET: -+ sin = (struct sockaddr_in *)ss; -+ port = ntohs(sin->sin_port); -+ break; -+ case AF_INET6: -+ sin6 = (struct sockaddr_in6 *)ss; -+ port = ntohs(sin6->sin6_port); -+ break; -+ } -+ -+ return port; -+} -+#else -+ - static GArray * - parse_output(const char *output) { - GArray *entries; -@@ -159,21 +226,123 @@ parse_output(const char *output) { - - return entries; - } -+#endif - - glibtop_open_files_entry * - glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid) +@@ -263,8 +266,12 @@ glibtop_get_proc_open_files_s (glibtop * { -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+ struct kinfo_file *freep, *kif; + #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + struct kinfo_file *freep, *kif; +#ifndef HAVE_KINFO_GETFILE -+ int name[4]; -+ size_t len; + int name[4]; + size_t len; +#else + int cnt; +#endif -+ int i; -+#else + size_t i; + #else char *output; -+#endif - GArray *entries; - +@@ -274,6 +281,7 @@ glibtop_get_proc_open_files_s (glibtop * memset(buf, 0, sizeof (glibtop_proc_open_files)); -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) +#ifndef HAVE_KINFO_GETFILE -+ name[0] = CTL_KERN; -+ name[1] = KERN_PROC; -+ name[2] = KERN_PROC_FILEDESC; -+ name[3] = pid; -+ -+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0) -+ return NULL; -+ -+ freep = kif = g_malloc(len); -+ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) { -+ g_free(freep); -+ return NULL; -+ } + name[0] = CTL_KERN; + name[1] = KERN_PROC; + name[2] = KERN_PROC_FILEDESC; +@@ -287,12 +295,25 @@ glibtop_get_proc_open_files_s (glibtop * + g_free(freep); + return NULL; + } +#else + freep = kinfo_getfile(pid, &cnt); +#endif -+ -+ entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry)); -+ + + entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry)); + +#ifndef HAVE_KINFO_GETFILE -+ for (i = 0; i < len / sizeof(*kif); i++, kif++) { -+ glibtop_open_files_entry entry = {0}; -+ + for (i = 0; i < len / sizeof(*kif); i++, kif++) { + glibtop_open_files_entry entry = {0}; + + if (kif->kf_structsize != sizeof(*kif)) + continue; +#else @@ -140,68 +54,6 @@ + kif = &freep[i]; +#endif + -+ if (kif->kf_fd < 0) -+ continue; -+ -+ if (kif->kf_type == KF_TYPE_SOCKET) { -+ if (kif->kf_sock_domain == AF_LOCAL) { -+ struct sockaddr_un *sun; -+ -+ entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET; -+ sun = (struct sockaddr_un *)&kif->kf_sa_local; -+ -+ if (sun->sun_path[0]) { -+ char *addrstr; -+ -+ addrstr = addr_to_string(&kif->kf_sa_local); -+ g_strlcpy(entry.info.localsock.name, -+ addrstr, -+ sizeof(entry.info.localsock.name)); -+ g_free(addrstr); -+ } else { -+ char *addrstr; -+ -+ addrstr = addr_to_string(&kif->kf_sa_peer); -+ g_strlcpy(entry.info.localsock.name, -+ addrstr, -+ sizeof(entry.info.localsock.name)); -+ g_free(addrstr); -+ } -+ } else if (kif->kf_sock_domain == AF_INET || -+ kif->kf_sock_domain == AF_INET6) { -+ char *addrstr; -+ -+ entry.type = GLIBTOP_FILE_TYPE_INETSOCKET; -+ addrstr = addr_to_string(&kif->kf_sa_peer); -+ g_strlcpy(entry.info.sock.dest_host, -+ addrstr, -+ sizeof(entry.info.sock.dest_host)); -+ g_free(addrstr); -+ entry.info.sock.dest_port = addr_to_port(&kif->kf_sa_peer); -+ } -+ } else if (kif->kf_type == KF_TYPE_PIPE) { -+ entry.type = GLIBTOP_FILE_TYPE_PIPE; -+ } else if (kif->kf_type == KF_TYPE_VNODE) { -+ entry.type = GLIBTOP_FILE_TYPE_FILE; -+ g_strlcpy(entry.info.file.name, kif->kf_path, -+ sizeof(entry.info.file.name)); -+ } else -+ continue; -+ -+ entry.fd = kif->kf_fd; -+ -+ g_array_append_val(entries, entry); -+ } -+ g_free(freep); -+#else -+ - output = execute_lsof(pid); - if (output == NULL) return NULL; - - entries = parse_output(output); - - g_free(output); -+#endif + if (kif->kf_fd < 0) + continue; - buf->flags = _glibtop_sysdeps_proc_open_files; - buf->number = entries->len; diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c index 17d9f5ec1880..731fec120d39 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c @@ -1,112 +1,58 @@ ---- sysdeps/freebsd/procwd.c.orig 2008-12-06 20:43:44.256309000 -0500 -+++ sysdeps/freebsd/procwd.c 2008-12-06 20:44:32.000000000 -0500 -@@ -24,7 +24,12 @@ - #include <glibtop_private.h> - - #include <sys/types.h> -+#include <sys/sysctl.h> +--- sysdeps/freebsd/procwd.c.orig 2008-08-18 11:23:36.000000000 -0400 ++++ sysdeps/freebsd/procwd.c 2008-12-07 00:19:44.000000000 -0500 +@@ -27,6 +27,9 @@ + #include <sys/sysctl.h> #include <sys/param.h> -+#include <sys/user.h> + #include <sys/user.h> +#ifdef HAVE_KINFO_GETFILE +#include <libutil.h> +#endif #include <string.h> static const unsigned long _glibtop_sysdeps_proc_wd = -@@ -38,6 +43,7 @@ _glibtop_init_proc_wd_s(glibtop *server) - server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd; - } - -+#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || _FreeBSD_version < 700104 - static GPtrArray * - parse_output(const char *output, glibtop_proc_wd *buf) - { -@@ -89,12 +95,25 @@ parse_output(const char *output, glibtop - - return dirs; - } -+#endif - - char** - glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid) - { - char path[MAXPATHLEN]; -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) -+ struct kinfo_file *freep, *kif; -+ GPtrArray *dirs; +@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g + #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + struct kinfo_file *freep, *kif; + GPtrArray *dirs; +#ifndef HAVE_KINFO_GETFILE -+ size_t len; -+ int name[4]; -+#else + size_t len; +- int i; + int name[4]; + #else + int cnt; +#endif + int i; +#else char *output; -+#endif - - memset (buf, 0, sizeof (glibtop_proc_wd)); + #endif -@@ -102,6 +121,54 @@ glibtop_get_proc_wd_s(glibtop *server, g - if (safe_readlink(path, buf->exe, sizeof(buf->exe))) +@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); -+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) + #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) +#ifndef HAVE_KINFO_GETFILE -+ name[0] = CTL_KERN; -+ name[1] = KERN_PROC; -+ name[2] = KERN_PROC_FILEDESC; -+ name[3] = pid; -+ -+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0) -+ return NULL; -+ freep = kif = g_malloc(len); -+ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) { -+ g_free(freep); -+ return NULL; -+ } + name[0] = CTL_KERN; + name[1] = KERN_PROC; + name[2] = KERN_PROC_FILEDESC; +@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g + g_free(freep); + return NULL; + } +#else + freep = kinfo_getfile(pid, &cnt); +#endif -+ -+ dirs = g_ptr_array_sized_new(1); -+ + + dirs = g_ptr_array_sized_new(1); + +#ifndef HAVE_KINFO_GETFILE -+ for (i = 0; i < len / sizeof(*kif); i++, kif++) { + for (i = 0; i < len / sizeof(*kif); i++, kif++) { + if (kif->kf_structsize != sizeof(*kif)) + continue; +#else + for (i = 0; i < cnt; i++) { + kif = &freep[i]; +#endif -+ switch (kif->kf_fd) { -+ case KF_FD_TYPE_ROOT: -+ g_strlcpy(buf->root, kif->kf_path, -+ sizeof(buf->root)); -+ buf->flags |= (1 << GLIBTOP_PROC_WD_ROOT); -+ break; -+ case KF_FD_TYPE_CWD: -+ g_ptr_array_add(dirs, g_strdup (kif->kf_path)); -+ break; -+ } -+ } -+ g_free(freep); -+ -+ buf->number = dirs->len; -+ buf->flags |= (1 << GLIBTOP_PROC_WD_NUMBER); -+ -+ g_ptr_array_add(dirs, NULL); + -+ return (char **)g_ptr_array_free(dirs, FALSE); -+#else - output = execute_lsof(pid); - if (output != NULL) { - GPtrArray *dirs; -@@ -116,6 +183,7 @@ glibtop_get_proc_wd_s(glibtop *server, g - - return (char **)g_ptr_array_free(dirs, FALSE); - } -+#endif - - return NULL; - } + switch (kif->kf_fd) { + case KF_FD_TYPE_ROOT: + g_strlcpy(buf->root, kif->kf_path, diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c b/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c deleted file mode 100644 index 8fa00f388d8c..000000000000 --- a/devel/libgtop/files/patch-sysdeps_freebsd_shm_limits.c +++ /dev/null @@ -1,22 +0,0 @@ ---- sysdeps/freebsd/shm_limits.c.orig 2008-02-14 12:26:46.000000000 -0500 -+++ sysdeps/freebsd/shm_limits.c 2008-02-14 12:26:29.000000000 -0500 -@@ -25,6 +25,7 @@ - #include <glibtop/shm_limits.h> - - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/sysctl.h> - - static unsigned long _glibtop_sysdeps_shm_limits = -@@ -46,7 +47,11 @@ void - glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf) - { - size_t len; -+#if __FreeBSD_version < 700002 - int shmmax, shmmin, shmmni, shmseg, shmall; -+#else -+ unsigned long shmmax, shmmin, shmmni, shmseg, shmall; -+#endif - - glibtop_init_s (&server, GLIBTOP_SYSDEPS_SHM_LIMITS, 0); - diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c new file mode 100644 index 000000000000..a188b364cbcd --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_suid_open.c @@ -0,0 +1,94 @@ +--- sysdeps/freebsd/suid_open.c.orig 2008-09-29 17:22:12.000000000 -0400 ++++ sysdeps/freebsd/suid_open.c 2008-09-29 17:23:35.000000000 -0400 +@@ -0,0 +1,91 @@ ++/* Copyright (C) 1998 Joshua Sled ++ This file is part of LibGTop 1.0. ++ ++ Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998. ++ ++ LibGTop is free software; you can redistribute it and/or modify it ++ under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, ++ or (at your option) any later version. ++ ++ LibGTop is distributed in the hope that it will be useful, but WITHOUT ++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with LibGTop; see the file COPYING. If not, write to the ++ Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ Boston, MA 02111-1307, USA. ++*/ ++ ++#include <config.h> ++#include <glibtop.h> ++#include <glibtop/error.h> ++#include <glibtop/cpu.h> ++#include <glibtop/open.h> ++#include <glibtop/init_hooks.h> ++ ++ ++/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */ ++ ++void ++glibtop_init_p (glibtop *server, const unsigned long features, ++ const unsigned flags) ++{ ++ const _glibtop_init_func_t *init_fkt; ++ ++ if (server == NULL) ++ glibtop_error_r (NULL, "glibtop_init_p (server == NULL)"); ++ ++ /* Do the initialization, but only if not already initialized. */ ++ ++ if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) { ++ glibtop_open_p (server, "glibtop", features, flags); ++ ++ for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++) ++ (*init_fkt) (server); ++ ++ server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS; ++ } ++} ++ ++void ++glibtop_open_p (glibtop *server, const char *program_name, ++ const unsigned long features, ++ const unsigned flags) ++{ ++#ifdef DEBUG ++ fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); ++#endif ++ ++ /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ ++ server->machine.uid = getuid (); ++ server->machine.euid = geteuid (); ++ server->machine.gid = getgid (); ++ server->machine.egid = getegid (); ++ /* Setup machine-specific data */ ++ server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open"); ++ ++ if (server->machine.kd == NULL) ++ glibtop_error_io_r (server, "kvm_open"); ++ ++ /* Drop priviledges. */ ++ ++ if (setreuid (server->machine.euid, server->machine.uid)) ++ _exit (1); ++ ++ if (setregid (server->machine.egid, server->machine.gid)) ++ _exit (1); ++ ++ /* !!! END OF SUID ROOT PART !!! */ ++ ++ /* Our effective uid is now those of the user invoking the server, ++ * so we do no longer have any priviledges. */ ++ ++ /* NOTE: On FreeBSD, we do not need to be suid root, we just need to ++ * be sgid kmem. ++ * ++ * The server will only use setegid() to get back it's priviledges, ++ * so it will fail if it is suid root and not sgid kmem. */ ++} diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c new file mode 100644 index 000000000000..ab5fdd66d5ee --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_sysinfo.c @@ -0,0 +1,13 @@ +--- sysdeps/freebsd/sysinfo.c.orig 2008-05-23 18:13:23.000000000 -0400 ++++ sysdeps/freebsd/sysinfo.c 2008-09-29 14:35:25.000000000 -0400 +@@ -45,8 +45,8 @@ init_sysinfo (glibtop *server) + + glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); + +- len = sizeof (ncpus); +- sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); ++ ncpus = server->ncpu + 1; ++ + len = 0; + sysctlbyname ("hw.model", NULL, &len, NULL, 0); + model = g_malloc (len); diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index 91e8d83abe47..fa5b9d29dda8 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -16,6 +16,7 @@ include/libgtop-2.0/glibtop/netload.h include/libgtop-2.0/glibtop/open.h include/libgtop-2.0/glibtop/parameter.h include/libgtop-2.0/glibtop/ppp.h +include/libgtop-2.0/glibtop/procaffinity.h include/libgtop-2.0/glibtop/procargs.h include/libgtop-2.0/glibtop/prockernel.h include/libgtop-2.0/glibtop/proclist.h @@ -158,7 +159,7 @@ share/locale/sk/LC_MESSAGES/libgtop-2.0.mo share/locale/sl/LC_MESSAGES/libgtop-2.0.mo share/locale/sq/LC_MESSAGES/libgtop-2.0.mo share/locale/sr/LC_MESSAGES/libgtop-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo +share/locale/sr@latin/LC_MESSAGES/libgtop-2.0.mo share/locale/sv/LC_MESSAGES/libgtop-2.0.mo share/locale/ta/LC_MESSAGES/libgtop-2.0.mo share/locale/te/LC_MESSAGES/libgtop-2.0.mo @@ -179,6 +180,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo @dirrmtry share/locale/xh @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/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index b563d4ffc16a..b01eaf41b5f1 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -3,11 +3,11 @@ # Whom: Andreas Kohn <andreas@syndrom23.de> # # $FreeBSD$ +# $MCom: ports/devel/libnotify/Makefile,v 1.3 2008/11/30 19:42:57 marcus Exp $ # PORTNAME= libnotify -PORTVERSION= 0.4.4 -PORTREVISION= 2 +PORTVERSION= 0.4.5 CATEGORIES= devel gnome MASTER_SITES= http://www.galago-project.org/files/releases/source/libnotify/ diff --git a/devel/libnotify/distinfo b/devel/libnotify/distinfo index c499bccb0c26..fa3d33aa8905 100644 --- a/devel/libnotify/distinfo +++ b/devel/libnotify/distinfo @@ -1,3 +1,3 @@ -MD5 (libnotify-0.4.4.tar.gz) = ba76f68b7e3bd284ac2c2a1b9c5ecb06 -SHA256 (libnotify-0.4.4.tar.gz) = 2389a9b8220f776033f728a8d46352cfee5c8705066e34887bfb188f9f0d3856 -SIZE (libnotify-0.4.4.tar.gz) = 395528 +MD5 (libnotify-0.4.5.tar.gz) = 472e2c1f808848365572a9b024d9e8f5 +SHA256 (libnotify-0.4.5.tar.gz) = 0799db8ea1500b65a477421a8c930cc8c8b0bbc0596e55ea1601e2542f3fb0d9 +SIZE (libnotify-0.4.5.tar.gz) = 364142 diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 8aa6caa4ed60..53532478b4e3 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libsoup/Makefile,v 1.42 2008/03/10 21:18:42 mezz Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.52 2008/11/25 16:22:57 marcus Exp $ # PORTNAME= libsoup -PORTVERSION= 2.4.1 -PORTREVISION?= 1 +PORTVERSION= 2.24.2.1 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index f185585d8abe..df4036166ec5 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libsoup-2.4.1.tar.bz2) = d0fc91ccb9da401e9e40d2f4612bdac9 -SHA256 (gnome2/libsoup-2.4.1.tar.bz2) = 774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd -SIZE (gnome2/libsoup-2.4.1.tar.bz2) = 627890 +MD5 (gnome2/libsoup-2.24.2.1.tar.bz2) = 27409ea1a93e45668e1b999f162ee4d0 +SHA256 (gnome2/libsoup-2.24.2.1.tar.bz2) = acc2568cd0d75b5a8c81f3a88754876ce16eddddbc9c153f7dec413182e874be +SIZE (gnome2/libsoup-2.24.2.1.tar.bz2) = 658843 diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 915831c2d51f..f753686dcd54 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -3,6 +3,8 @@ include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-basic.h include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-digest.h include/libsoup-%%VERSION%%/libsoup/soup-auth-domain.h include/libsoup-%%VERSION%%/libsoup/soup-auth.h +include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar.h +include/libsoup-%%VERSION%%/libsoup/soup-cookie.h include/libsoup-%%VERSION%%/libsoup/soup-date.h include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h include/libsoup-%%VERSION%%/libsoup/soup-form.h @@ -16,6 +18,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-misc.h include/libsoup-%%VERSION%%/libsoup/soup-portability.h include/libsoup-%%VERSION%%/libsoup/soup-server.h include/libsoup-%%VERSION%%/libsoup/soup-session-async.h +include/libsoup-%%VERSION%%/libsoup/soup-session-feature.h include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h include/libsoup-%%VERSION%%/libsoup/soup-session.h include/libsoup-%%VERSION%%/libsoup/soup-socket.h diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile index 5f28790d4617..6c73e2c2eb78 100644 --- a/devel/py-gobject/Makefile +++ b/devel/py-gobject/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-gobject/Makefile,v 1.21 2007/09/16 17:11:09 ahze Exp $ +# $MCom: ports/devel/py-gobject/Makefile,v 1.29 2009/01/04 22:11:03 marcus Exp $ # PORTNAME= gobject -PORTVERSION= 2.14.2 -PORTREVISION= 2 +PORTVERSION= 2.16.0 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -24,6 +23,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_PYTHON= yes GNU_CONFIGURE= yes +USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-docs CONFLICTS= py*-gtk-0* diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo index 9a08c85d6330..d7878e045ba9 100644 --- a/devel/py-gobject/distinfo +++ b/devel/py-gobject/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygobject-2.14.2.tar.bz2) = 0e9e9300e81847f4f7266f49d3bebbaf -SHA256 (gnome2/pygobject-2.14.2.tar.bz2) = 79c5d3ab8f072f1d0b102b2bd6410b0dc383a008b5efad1750d8b6dadfde8c6e -SIZE (gnome2/pygobject-2.14.2.tar.bz2) = 366808 +MD5 (gnome2/pygobject-2.16.0.tar.bz2) = 431e7d4632163b93d1ee43cd071a389c +SHA256 (gnome2/pygobject-2.16.0.tar.bz2) = db0ab6f998bc5750aba2dfa96c8932f673914d8bf804a2c1c769b4a6e3f192d2 +SIZE (gnome2/pygobject-2.16.0.tar.bz2) = 515503 diff --git a/devel/py-gobject/files/patch-gobject_gobjectmodule.c b/devel/py-gobject/files/patch-gobject_gobjectmodule.c deleted file mode 100644 index 1cc2885a21da..000000000000 --- a/devel/py-gobject/files/patch-gobject_gobjectmodule.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gobject/gobjectmodule.c.orig 2008-06-29 19:20:31.000000000 -0400 -+++ gobject/gobjectmodule.c 2008-06-29 19:21:16.000000000 -0400 -@@ -2564,7 +2564,7 @@ pyg_markup_escape_text(PyObject *unused, - { - static char *kwlist[] = { "text", NULL }; - char *text_in, *text_out; -- int text_size; -+ Py_ssize_t text_size; - PyObject *retval; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist index de86b146d3a4..63a4cceb85d4 100644 --- a/devel/py-gobject/pkg-plist +++ b/devel/py-gobject/pkg-plist @@ -1,7 +1,27 @@ +bin/pygobject-codegen-2.0 +include/pygtk-2.0/pyglib.h include/pygtk-2.0/pygobject.h +lib/libpyglib-2.0.la +lib/libpyglib-2.0.so +lib/libpyglib-2.0.so.0 %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/_glib.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/_glib.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.pyc +%%PYTHON_SITELIBDIR%%/gtk-2.0/glib/option.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/__init__.pyo @@ -10,9 +30,6 @@ include/pygtk-2.0/pygobject.h %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/constants.pyo -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.py -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyc -%%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/option.pyo %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject/propertyhelper.pyo @@ -21,12 +38,14 @@ include/pygtk-2.0/pygobject.h %%PYTHON_SITELIBDIR%%/pygtk.pyc %%PYTHON_SITELIBDIR%%/pygtk.pyo libdata/pkgconfig/pygobject-2.0.pc +share/doc/pygobject/class-glibmaincontext.html +share/doc/pygobject/class-glibmainloop.html share/doc/pygobject/class-gobject.html share/doc/pygobject/class-gobjectgboxed.html share/doc/pygobject/class-gobjectginterface.html share/doc/pygobject/class-gobjectgpointer.html -share/doc/pygobject/class-gobjectmaincontext.html -share/doc/pygobject/class-gobjectmainloop.html +share/doc/pygobject/glib-constants.html +share/doc/pygobject/glib-functions.html share/doc/pygobject/gobject-class-reference.html share/doc/pygobject/gobject-constants.html share/doc/pygobject/gobject-functions.html @@ -35,6 +54,65 @@ share/doc/pygobject/index.sgml share/doc/pygobject/pygobject-introduction.html share/doc/pygobject/pygobject.devhelp share/doc/pygobject/style.css +share/pygobject/2.0/codegen/__init__.py +share/pygobject/2.0/codegen/__init__.pyc +share/pygobject/2.0/codegen/__init__.pyo +share/pygobject/2.0/codegen/argtypes.py +share/pygobject/2.0/codegen/argtypes.pyc +share/pygobject/2.0/codegen/argtypes.pyo +share/pygobject/2.0/codegen/codegen.py +share/pygobject/2.0/codegen/codegen.pyc +share/pygobject/2.0/codegen/codegen.pyo +share/pygobject/2.0/codegen/createdefs.py +share/pygobject/2.0/codegen/createdefs.pyc +share/pygobject/2.0/codegen/createdefs.pyo +share/pygobject/2.0/codegen/definitions.py +share/pygobject/2.0/codegen/definitions.pyc +share/pygobject/2.0/codegen/definitions.pyo +share/pygobject/2.0/codegen/defsparser.py +share/pygobject/2.0/codegen/defsparser.pyc +share/pygobject/2.0/codegen/defsparser.pyo +share/pygobject/2.0/codegen/docextract.py +share/pygobject/2.0/codegen/docextract.pyc +share/pygobject/2.0/codegen/docextract.pyo +share/pygobject/2.0/codegen/docgen.py +share/pygobject/2.0/codegen/docgen.pyc +share/pygobject/2.0/codegen/docgen.pyo +share/pygobject/2.0/codegen/h2def.py +share/pygobject/2.0/codegen/h2def.pyc +share/pygobject/2.0/codegen/h2def.pyo +share/pygobject/2.0/codegen/mergedefs.py +share/pygobject/2.0/codegen/mergedefs.pyc +share/pygobject/2.0/codegen/mergedefs.pyo +share/pygobject/2.0/codegen/mkskel.py +share/pygobject/2.0/codegen/mkskel.pyc +share/pygobject/2.0/codegen/mkskel.pyo +share/pygobject/2.0/codegen/override.py +share/pygobject/2.0/codegen/override.pyc +share/pygobject/2.0/codegen/override.pyo +share/pygobject/2.0/codegen/reversewrapper.py +share/pygobject/2.0/codegen/reversewrapper.pyc +share/pygobject/2.0/codegen/reversewrapper.pyo +share/pygobject/2.0/codegen/scmexpr.py +share/pygobject/2.0/codegen/scmexpr.pyc +share/pygobject/2.0/codegen/scmexpr.pyo +share/pygobject/2.0/defs/gappinfo.override +share/pygobject/2.0/defs/gapplaunchcontext.override +share/pygobject/2.0/defs/gfile.override +share/pygobject/2.0/defs/gfileattribute.override +share/pygobject/2.0/defs/gfileenumerator.override +share/pygobject/2.0/defs/gfileinfo.override +share/pygobject/2.0/defs/gicon.override +share/pygobject/2.0/defs/ginputstream.override +share/pygobject/2.0/defs/gio-types.defs +share/pygobject/2.0/defs/gio.defs +share/pygobject/2.0/defs/gio.override +share/pygobject/2.0/defs/goutputstream.override +share/pygobject/2.0/defs/gvolume.override +share/pygobject/2.0/defs/gvolumemonitor.override +share/pygobject/2.0/defs/unix-types.defs +share/pygobject/2.0/defs/unix.defs +share/pygobject/2.0/defs/unix.override share/pygobject/xsl/common.xsl share/pygobject/xsl/devhelp.xsl share/pygobject/xsl/fixxref.py @@ -43,8 +121,13 @@ share/pygobject/xsl/pdf-style.xsl share/pygobject/xsl/pdf.xsl share/pygobject/xsl/ref-html-style.xsl @dirrm share/pygobject/xsl +@dirrm share/pygobject/2.0/defs +@dirrm share/pygobject/2.0/codegen +@dirrm share/pygobject/2.0 @dirrm share/pygobject @dirrm share/doc/pygobject @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0 @dirrmtry include/pygtk-2.0 diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile index 146197be729a..14328870fc5e 100644 --- a/devel/py-orbit/Makefile +++ b/devel/py-orbit/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/py-orbit2/Makefile,v 1.11 2006/04/13 07:52:34 bland Exp $ +# $MCom: ports/devel/py-orbit/Makefile,v 1.1 2008/09/23 20:08:04 mezz Exp $ +# PORTNAME= orbit -PORTVERSION= 2.14.3 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pyorbit/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/py-orbit/distinfo b/devel/py-orbit/distinfo index ba360c458b40..c2d848cee6f8 100644 --- a/devel/py-orbit/distinfo +++ b/devel/py-orbit/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pyorbit-2.14.3.tar.bz2) = 3c4d42ae1a7303fd85071a842617043f -SHA256 (gnome2/pyorbit-2.14.3.tar.bz2) = a3517e0ddaf23508f99e7489a23e3462f86c528ea24bce432e832a78ee4149db -SIZE (gnome2/pyorbit-2.14.3.tar.bz2) = 284374 +MD5 (gnome2/pyorbit-2.24.0.tar.bz2) = 574593815e75ee6e98062c75d6d1581f +SHA256 (gnome2/pyorbit-2.24.0.tar.bz2) = 8754669b8220aa1f151b920360029d5ea28c42bec55769059676725fe28397b8 +SIZE (gnome2/pyorbit-2.24.0.tar.bz2) = 293054 diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index b0611377ab37..fb3d0ee2f8fc 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/abiword/Makefile,v 1.8 2007/07/24 04:25:21 mezz Exp $ +# $MCom: ports/editors/abiword/Makefile,v 1.11 2008/08/19 00:45:06 marcus Exp $ # PORTNAME= abiword PORTVERSION= 2.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/ MASTER_SITE_SUBDIR= abiword @@ -66,14 +66,14 @@ PLIST_SUB+= DICT:="@comment " #CONFIGURE_ARGS+= --disable-gnomeui #.endif -.if (defined(WITH_GUCHARMAP) || \ - exists(${LOCALBASE}/libdata/pkgconfig/gucharmap.pc)) && \ - !defined(WITHOUT_GUCHARMAP) -LIB_DEPENDS+= gucharmap.6:${PORTSDIR}/deskutils/gucharmap -CONFIGURE_ARGS+= --enable-gucharmap -.else +#.if (defined(WITH_GUCHARMAP) || \ +# exists(${LOCALBASE}/libdata/pkgconfig/gucharmap.pc)) && \ +# !defined(WITHOUT_GUCHARMAP) +#LIB_DEPENDS+= gucharmap.6:${PORTSDIR}/deskutils/gucharmap +#CONFIGURE_ARGS+= --enable-gucharmap +#.else CONFIGURE_ARGS+= --disable-gucharmap -.endif +#.endif pre-everything:: @${ECHO_MSG} "" diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile index 5c8789e5047e..4dddde49f8e1 100644 --- a/editors/gedit-plugins/Makefile +++ b/editors/gedit-plugins/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/gedit-plugins/Makefile,v 1.28 2008/03/17 11:25:37 ahze Exp $ +# $MCom: ports/editors/gedit-plugins/Makefile,v 1.33 2008/10/26 20:28:27 marcus Exp $ # PORTNAME= gedit-plugins -PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTVERSION= 2.22.5 CATEGORIES= editors gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,7 +25,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 -USE_GNOME= gnomehack gnomeprefix gnometarget intlhack +USE_GNOME= gnomehack gnomeprefix intlhack WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo index 0e8e1a3f1eeb..875e28337cd6 100644 --- a/editors/gedit-plugins/distinfo +++ b/editors/gedit-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gedit-plugins-2.22.2.tar.bz2) = 556d4171db9a5a44fdc18f403cea5fdd -SHA256 (gnome2/gedit-plugins-2.22.2.tar.bz2) = 9b445d10130b8f8f05c8a74a2b4f079cba1627a437ea65688cf623f757d48cfe -SIZE (gnome2/gedit-plugins-2.22.2.tar.bz2) = 584763 +MD5 (gnome2/gedit-plugins-2.22.5.tar.bz2) = c2104d56b7aa78e14395648f8e235306 +SHA256 (gnome2/gedit-plugins-2.22.5.tar.bz2) = 98cd453525bcb53e725f8e49d5fa387019331e7df2d37101519d177141fbced9 +SIZE (gnome2/gedit-plugins-2.22.5.tar.bz2) = 592942 diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist index 61032d546627..97d3b375a387 100644 --- a/editors/gedit-plugins/pkg-plist +++ b/editors/gedit-plugins/pkg-plist @@ -88,7 +88,6 @@ share/locale/nb/LC_MESSAGES/gedit-plugins.mo share/locale/ne/LC_MESSAGES/gedit-plugins.mo share/locale/nl/LC_MESSAGES/gedit-plugins.mo share/locale/nn/LC_MESSAGES/gedit-plugins.mo -share/locale/no/LC_MESSAGES/gedit-plugins.mo share/locale/oc/LC_MESSAGES/gedit-plugins.mo share/locale/or/LC_MESSAGES/gedit-plugins.mo share/locale/pa/LC_MESSAGES/gedit-plugins.mo diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 2bca46670bba..fce39b346c96 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -3,15 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/gedit/Makefile,v 1.79 2008/03/15 19:59:30 ahze Exp $ +# $MCom: ports/editors/gedit/Makefile,v 1.91 2008/11/25 00:59:25 marcus Exp $ # PORTNAME= gedit -PORTVERSION= 2.22.3 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= editors gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,13 +19,14 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso- LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +USE_XORG= sm USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gtksourceview2 \ +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \ desktopfileutils gnomedocutils ltasneededhack WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo index e8334d677534..278869441025 100644 --- a/editors/gedit/distinfo +++ b/editors/gedit/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gedit-2.22.3.tar.bz2) = 9af45548bf8f2c335906c95877df4699 -SHA256 (gnome2/gedit-2.22.3.tar.bz2) = 1c9a97e5665bad9bc5c128a6dcc1be37683b619ff7255efad8f282b2184b8576 -SIZE (gnome2/gedit-2.22.3.tar.bz2) = 3884436 +MD5 (gnome2/gedit-2.24.2.tar.bz2) = 04bcf226edc5de3a4ac759e97e0e2e6e +SHA256 (gnome2/gedit-2.24.2.tar.bz2) = 2efe1aa0b44caec9b29e2cf40222d27a18ae32e98f00bd70b2c056602940d203 +SIZE (gnome2/gedit-2.24.2.tar.bz2) = 4089534 diff --git a/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in b/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in deleted file mode 100644 index aa069fd241ca..000000000000 --- a/editors/gedit/files/patch-plugins_externaltools_data_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/externaltools/data/Makefile.in.orig Thu Jan 11 00:53:33 2007 -+++ plugins/externaltools/data/Makefile.in Thu Jan 11 00:53:41 2007 -@@ -471,7 +471,7 @@ - # (.desktop), which happens to be translated using intltool. - $(tools_SCRIPTS): %: %.tool.in %.desktop $(TOOL_MERGE) - perl $(TOOL_MERGE) -o $@ $< $(word 2,$^) -- chmod --reference=$< $@ -+ chmod 0755 $@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist index 59241235449a..4648fe458b3a 100644 --- a/editors/gedit/pkg-plist +++ b/editors/gedit/pkg-plist @@ -45,7 +45,8 @@ lib/gedit-2/plugins/docinfo.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.py %%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyc %%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.pyo -%%PYTHON%%lib/gedit-2/plugins/externaltools/tools.glade +%%PYTHON%%lib/gedit-2/plugins/externaltools/outputpanel.ui +%%PYTHON%%lib/gedit-2/plugins/externaltools/tools.ui lib/gedit-2/plugins/filebrowser.gedit-plugin lib/gedit-2/plugins/indent.gedit-plugin lib/gedit-2/plugins/libchangecase.a @@ -130,7 +131,7 @@ lib/gedit-2/plugins/sample.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.py %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyc %%PYTHON%%lib/gedit-2/plugins/snippets/__init__.pyo -%%PYTHON%%lib/gedit-2/plugins/snippets/snippets.glade +%%PYTHON%%lib/gedit-2/plugins/snippets/snippets.ui lib/gedit-2/plugins/sort.gedit-plugin lib/gedit-2/plugins/spell.gedit-plugin lib/gedit-2/plugins/taglist.gedit-plugin @@ -171,19 +172,13 @@ share/applications/gedit.desktop %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png -share/gedit-2/glade/docinfo.glade2 -share/gedit-2/glade/gedit-encodings-dialog.glade -share/gedit-2/glade/gedit-open-location-dialog.glade -share/gedit-2/glade/gedit-preferences-dialog.glade -share/gedit-2/glade/gedit-print-preferences.glade -share/gedit-2/glade/gedit-search-dialog.glade -share/gedit-2/glade/languages-dialog.glade2 -share/gedit-2/glade/sort.glade2 -share/gedit-2/glade/spell-checker.glade2 -share/gedit-2/glade/time.glade2 share/gedit-2/icons/gedit-plugin.png share/gedit-2/logo/gedit-logo.png +@exec mkdir -p %D/share/gedit-2/plugins/changecase +share/gedit-2/plugins/docinfo/docinfo.ui share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml +@exec mkdir -p %D/share/gedit-2/plugins/indent +@exec mkdir -p %D/share/gedit-2/plugins/sample %%PYTHON%%share/gedit-2/plugins/snippets/c++.xml %%PYTHON%%share/gedit-2/plugins/snippets/c.xml %%PYTHON%%share/gedit-2/plugins/snippets/css.xml @@ -204,6 +199,10 @@ share/gedit-2/plugins/filebrowser/gedit-file-browser-widget-ui.xml %%PYTHON%%share/gedit-2/plugins/snippets/snippets.xml %%PYTHON%%share/gedit-2/plugins/snippets/tcl.xml %%PYTHON%%share/gedit-2/plugins/snippets/xml.xml +share/gedit-2/plugins/sort/sort.ui +share/gedit-2/plugins/spell/languages-dialog.ui +share/gedit-2/plugins/spell/spell-checker.ui +share/gedit-2/plugins/time/time.ui %%PYTHON%%share/gedit-2/plugins/tools/build %%PYTHON%%share/gedit-2/plugins/tools/open-terminal-here %%PYTHON%%share/gedit-2/plugins/tools/remove-trailing-spaces @@ -212,6 +211,11 @@ share/gedit-2/taglist/HTML.tags.gz share/gedit-2/taglist/Latex.tags.gz share/gedit-2/taglist/XSLT.tags.gz share/gedit-2/taglist/XUL.tags.gz +share/gedit-2/ui/gedit-encodings-dialog.ui +share/gedit-2/ui/gedit-open-location-dialog.ui +share/gedit-2/ui/gedit-preferences-dialog.ui +share/gedit-2/ui/gedit-print-preferences.ui +share/gedit-2/ui/gedit-search-dialog.ui share/gedit-2/ui/gedit-ui.xml share/gnome/help/gedit/C/figures/gedit_format_bold.png share/gnome/help/gedit/C/figures/gedit_format_italic.png @@ -229,6 +233,14 @@ share/gnome/help/gedit/bg/figures/gedit_recent_files_menu_icon.png share/gnome/help/gedit/bg/figures/gedit_window.png share/gnome/help/gedit/bg/gedit.xml share/gnome/help/gedit/bg/legal.xml +share/gnome/help/gedit/da/figures/gedit_format_bold.png +share/gnome/help/gedit/da/figures/gedit_format_italic.png +share/gnome/help/gedit/da/figures/gedit_format_strikethrough.png +share/gnome/help/gedit/da/figures/gedit_format_underline.png +share/gnome/help/gedit/da/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/da/figures/gedit_window.png +share/gnome/help/gedit/da/gedit.xml +share/gnome/help/gedit/da/legal.xml share/gnome/help/gedit/de/figures/gedit_format_bold.png share/gnome/help/gedit/de/figures/gedit_format_italic.png share/gnome/help/gedit/de/figures/gedit_format_strikethrough.png @@ -249,6 +261,14 @@ share/gnome/help/gedit/eu/figures/gedit_recent_files_menu_icon.png share/gnome/help/gedit/eu/figures/gedit_window.png share/gnome/help/gedit/eu/gedit.xml share/gnome/help/gedit/eu/legal.xml +share/gnome/help/gedit/fi/figures/gedit_format_bold.png +share/gnome/help/gedit/fi/figures/gedit_format_italic.png +share/gnome/help/gedit/fi/figures/gedit_format_strikethrough.png +share/gnome/help/gedit/fi/figures/gedit_format_underline.png +share/gnome/help/gedit/fi/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/fi/figures/gedit_window.png +share/gnome/help/gedit/fi/gedit.xml +share/gnome/help/gedit/fi/legal.xml share/gnome/help/gedit/fr/figures/gedit_format_bold.png share/gnome/help/gedit/fr/figures/gedit_format_italic.png share/gnome/help/gedit/fr/figures/gedit_format_strikethrough.png @@ -399,8 +419,10 @@ share/locale/ka/LC_MESSAGES/gedit.mo share/locale/kn/LC_MESSAGES/gedit.mo share/locale/ko/LC_MESSAGES/gedit.mo share/locale/ku/LC_MESSAGES/gedit.mo +share/locale/la/LC_MESSAGES/gedit.mo share/locale/lt/LC_MESSAGES/gedit.mo share/locale/lv/LC_MESSAGES/gedit.mo +share/locale/mai/LC_MESSAGES/gedit.mo share/locale/mg/LC_MESSAGES/gedit.mo share/locale/mi/LC_MESSAGES/gedit.mo share/locale/mk/LC_MESSAGES/gedit.mo @@ -416,6 +438,7 @@ share/locale/oc/LC_MESSAGES/gedit.mo share/locale/or/LC_MESSAGES/gedit.mo share/locale/pa/LC_MESSAGES/gedit.mo share/locale/pl/LC_MESSAGES/gedit.mo +share/locale/ps/LC_MESSAGES/gedit.mo share/locale/pt/LC_MESSAGES/gedit.mo share/locale/pt_BR/LC_MESSAGES/gedit.mo share/locale/ro/LC_MESSAGES/gedit.mo @@ -426,7 +449,7 @@ share/locale/sk/LC_MESSAGES/gedit.mo share/locale/sl/LC_MESSAGES/gedit.mo share/locale/sq/LC_MESSAGES/gedit.mo share/locale/sr/LC_MESSAGES/gedit.mo -share/locale/sr@Latn/LC_MESSAGES/gedit.mo +share/locale/sr@latin/LC_MESSAGES/gedit.mo share/locale/sv/LC_MESSAGES/gedit.mo share/locale/ta/LC_MESSAGES/gedit.mo share/locale/te/LC_MESSAGES/gedit.mo @@ -442,9 +465,11 @@ share/locale/zh_HK/LC_MESSAGES/gedit.mo share/locale/zh_TW/LC_MESSAGES/gedit.mo share/omf/gedit/gedit-C.omf share/omf/gedit/gedit-bg.omf +share/omf/gedit/gedit-da.omf share/omf/gedit/gedit-de.omf share/omf/gedit/gedit-es.omf share/omf/gedit/gedit-eu.omf +share/omf/gedit/gedit-fi.omf share/omf/gedit/gedit-fr.omf share/omf/gedit/gedit-hu.omf share/omf/gedit/gedit-it.omf @@ -488,12 +513,16 @@ share/omf/gedit/gedit-zh_TW.omf @dirrm share/gnome/help/gedit/hu @dirrm share/gnome/help/gedit/fr/figures @dirrm share/gnome/help/gedit/fr +@dirrm share/gnome/help/gedit/fi/figures +@dirrm share/gnome/help/gedit/fi @dirrm share/gnome/help/gedit/eu/figures @dirrm share/gnome/help/gedit/eu @dirrm share/gnome/help/gedit/es/figures @dirrm share/gnome/help/gedit/es @dirrm share/gnome/help/gedit/de/figures @dirrm share/gnome/help/gedit/de +@dirrm share/gnome/help/gedit/da/figures +@dirrm share/gnome/help/gedit/da @dirrm share/gnome/help/gedit/bg/figures @dirrm share/gnome/help/gedit/bg @dirrm share/gnome/help/gedit/C/figures @@ -502,15 +531,22 @@ share/omf/gedit/gedit-zh_TW.omf @dirrm share/gedit-2/ui @dirrm share/gedit-2/taglist %%PYTHON%%@dirrm share/gedit-2/plugins/tools +@dirrm share/gedit-2/plugins/time +@dirrm share/gedit-2/plugins/spell +@dirrm share/gedit-2/plugins/sort %%PYTHON%%@dirrm share/gedit-2/plugins/snippets/lang %%PYTHON%%@dirrm share/gedit-2/plugins/snippets +@dirrm share/gedit-2/plugins/sample +@dirrm share/gedit-2/plugins/indent @dirrm share/gedit-2/plugins/filebrowser +@dirrm share/gedit-2/plugins/docinfo +@dirrm share/gedit-2/plugins/changecase @dirrm share/gedit-2/plugins @dirrm share/gedit-2/logo @dirrm share/gedit-2/icons -@dirrm share/gedit-2/glade @dirrm share/gedit-2 @dirrm %%DOCSDIR%% +@dirrmtry share/applications @dirrmtry libexec/gedit-2 %%PYTHON%%@dirrm lib/gedit-2/plugins/snippets %%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole @@ -521,17 +557,20 @@ share/omf/gedit/gedit-zh_TW.omf @dirrm include/gedit-%%VERSION%% @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -540,6 +579,10 @@ share/omf/gedit/gedit-zh_TW.omf @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai +@dirrmtry share/locale/la/LC_MESSAGES +@dirrmtry share/locale/la @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index d56e68c86b19..9f37f883e2d5 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/ghex/Makefile,v 1.11 2008/02/27 04:39:06 mezz Exp $ +# $MCom: ports/editors/ghex/Makefile,v 1.13 2008/08/23 18:22:59 mezz Exp $ # PORTNAME= ghex @@ -18,7 +18,7 @@ COMMENT= GNOME 2 hex editor USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeprintui libgnomeui \ +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \ gnomedocutils USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index f1e8cab0233f..753f1d730d07 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -3,12 +3,12 @@ # Whom: David O'Brien (obrien@NUXI.com) # # $FreeBSD$ -# $MCom: ports/finance/gnucash/Makefile,v 1.22 2007/07/30 20:05:51 mezz Exp $ +# $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $ # PORTNAME= gnucash PORTVERSION= 2.2.7 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= finance gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.gnucash.org/pub/gnucash/sources/stable/ @@ -20,7 +20,7 @@ COMMENT= Quicken-like money and finance manager BUILD_DEPENDS= guile>=1.6.8_2:${PORTSDIR}/lang/guile \ ${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - goffice-0.6.6:${PORTSDIR}/devel/goffice + goffice-0.8.7:${PORTSDIR}/devel/goffice RUN_DEPENDS= guile>=1.6.8_2:${PORTSDIR}/lang/guile \ ${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile \ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \ diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile index f296f33e0d3f..85b510834357 100644 --- a/games/gnome-games-extra-data/Makefile +++ b/games/gnome-games-extra-data/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.21 2008/02/10 01:24:01 kwm Exp $ +# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.24 2008/09/27 01:52:59 mezz Exp $ # PORTNAME= gnome-games-extra-data -PORTVERSION= 2.22.0 -PORTREVISION= 3 +PORTVERSION= 2.24.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/sol:${PORTSDIR}/games/gnome-games USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack gnomeprefix gnometarget +USE_GNOME= gnomehack gnomeprefix CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo index 3f6b20a522fe..af6078d30b4e 100644 --- a/games/gnome-games-extra-data/distinfo +++ b/games/gnome-games-extra-data/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-games-extra-data-2.22.0.tar.bz2) = 9c520b6766095f5ae1f0508adcf559c1 -SHA256 (gnome2/gnome-games-extra-data-2.22.0.tar.bz2) = e82516906353f850198e751c0c14cd9d307b4577e0e135652544a8218067e04f -SIZE (gnome2/gnome-games-extra-data-2.22.0.tar.bz2) = 4740059 +MD5 (gnome2/gnome-games-extra-data-2.24.0.tar.bz2) = 6167bd439e1923c127885e253be4fdbe +SHA256 (gnome2/gnome-games-extra-data-2.24.0.tar.bz2) = d2e34b861cafcacbbbe28fdb61ef89811d7f6945671369095d2a38e599731369 +SIZE (gnome2/gnome-games-extra-data-2.24.0.tar.bz2) = 4785628 diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist index 3746939fbb19..1f979791c5be 100644 --- a/games/gnome-games-extra-data/pkg-plist +++ b/games/gnome-games-extra-data/pkg-plist @@ -6,6 +6,7 @@ share/gnome-games/same-gnome/themes/2.10/rotate.svg share/gnome-games-common/cards/anglo_bitmap.svg share/gnome-games-common/cards/anglo.svg share/gnome-games-common/cards/bellot.svg +share/gnome-games-common/cards/bonded.svg share/gnome-games-common/cards/dondorf.svg share/gnome-games-common/cards/gnomangelo.svg share/gnome-games-common/cards/ornamental.svg diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 02d739d8323f..49f727b1f08b 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/games/gnome-games/Makefile,v 1.171 2008/03/11 03:23:56 mezz Exp $ +# $MCom: ports/games/gnome-games/Makefile,v 1.187 2008/11/25 17:39:15 mezz Exp $ # PORTNAME= gnome-games -PORTVERSION= 2.22.3 -PORTREVISION= 3 +PORTVERSION= 2.24.2 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -47,7 +46,7 @@ DSC_FILES= iagno/iagno-client.dsc gnect/data/gnect-client.dsc \ .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/lib/libavahi-client.a) || defined(WITH_MDNS) -LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi +LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app .endif post-patch: diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 0663ed7eb6bb..8ab516ee8f2f 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-games-2.22.3.tar.bz2) = d6feb460f7db007aafb35b7a46b947be -SHA256 (gnome2/gnome-games-2.22.3.tar.bz2) = 17971e175786d922445d4571df99f1aead3a6dbd18cd851a7107ed1d15b02de6 -SIZE (gnome2/gnome-games-2.22.3.tar.bz2) = 16406581 +MD5 (gnome2/gnome-games-2.24.2.tar.bz2) = ed86a6fe212fc6b6175f1ac2baca8abb +SHA256 (gnome2/gnome-games-2.24.2.tar.bz2) = 5e8fffbbc7b946a478a0c849e89df4e3d30746330bed5bc4caa433654ef95a37 +SIZE (gnome2/gnome-games-2.24.2.tar.bz2) = 19324778 diff --git a/games/gnome-games/files/patch-gnect_src_Makefile.in b/games/gnome-games/files/patch-gnect_src_Makefile.in deleted file mode 100644 index 9567e5d23a37..000000000000 --- a/games/gnome-games/files/patch-gnect_src_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- gnect/src/Makefile.in.orig 2008-04-09 11:38:20.000000000 -0500 -+++ gnect/src/Makefile.in 2008-04-09 11:39:07.000000000 -0500 -@@ -455,9 +455,9 @@ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DGNECT_DATA_DIR=\""$(datadir)/"\" \ -- $(GNOME_GAMES_CFLAGS) \ -- $(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\ -- $(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) -+ $(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES)\ -+ $(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) \ -+ $(GNOME_GAMES_CFLAGS) - - gnect_LDADD = \ - ../../libgames-support/libgames-support.la \ diff --git a/games/gnome-games/files/patch-gnibbles_Makefile.in b/games/gnome-games/files/patch-gnibbles_Makefile.in deleted file mode 100644 index 96f84de3af09..000000000000 --- a/games/gnome-games/files/patch-gnibbles_Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- gnibbles/Makefile.in.orig 2008-04-09 13:54:25.000000000 -0500 -+++ gnibbles/Makefile.in 2008-04-09 13:54:58.000000000 -0500 -@@ -45,8 +45,8 @@ - @GGZ_CLIENT_TRUE@ $(NULL) - - @GGZ_CLIENT_TRUE@am__append_2 = \ --@GGZ_CLIENT_TRUE@ $(GGZMOD_INCLUDES) \ - @GGZ_CLIENT_TRUE@ $(GGZ_GTK_INCLUDES) \ -+@GGZ_CLIENT_TRUE@ $(GGZMOD_INCLUDES) \ - @GGZ_CLIENT_TRUE@ $(GGZCORE_INCLUDES) \ - @GGZ_CLIENT_TRUE@ $(LIBGGZ_INCLUDES) \ - @GGZ_CLIENT_TRUE@ $(GGZCORE_INCLUDES) \ -@@ -501,7 +501,7 @@ - @GGZ_SERVER_TRUE@ -I$(top_srcdir)/libgames-support \ - @GGZ_SERVER_TRUE@ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - @GGZ_SERVER_TRUE@ -DREAL_DATADIR=\""$(datadir)"\" \ --@GGZ_SERVER_TRUE@ $(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\ -+@GGZ_SERVER_TRUE@ $(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES)\ - @GGZ_SERVER_TRUE@ $(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES) - - @GGZ_SERVER_TRUE@gnibblesd_CFLAGS = \ diff --git a/games/gnome-games/files/patch-gnobots2_properties.c b/games/gnome-games/files/patch-gnobots2_properties.c deleted file mode 100644 index 6a5a72646898..000000000000 --- a/games/gnome-games/files/patch-gnobots2_properties.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gnobots2/properties.c.orig 2007-09-07 15:39:29.000000000 -0500 -+++ gnobots2/properties.c 2007-09-07 15:41:56.000000000 -0500 -@@ -116,6 +116,7 @@ - static void defkey_cb (GtkWidget *, gpointer); - static void fill_typemenu (GtkWidget *); - static void conf_set_background_color (GdkColor * c); -+static void load_keys (void); - /**********************************************************************/ - - diff --git a/games/gnome-games/files/patch-iagno_Makefile.in b/games/gnome-games/files/patch-iagno_Makefile.in deleted file mode 100644 index 64ef9b7789a1..000000000000 --- a/games/gnome-games/files/patch-iagno_Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ ---- iagno/Makefile.in.orig 2008-04-09 13:33:03.000000000 -0500 -+++ iagno/Makefile.in 2008-04-09 13:33:26.000000000 -0500 -@@ -416,11 +416,11 @@ - INCLUDES = \ - -I$(top_srcdir)/libgames-support \ - $(WARN_CFLAGS) \ -- $(GNOME_GAMES_CFLAGS) \ - -DDATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -- $(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES) $(GGZCORE_INCLUDES)\ -- $(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES) -+ $(GGZ_GTK_INCLUDES) $(GGZMOD_INCLUDES) $(GGZCORE_INCLUDES)\ -+ $(LIBGGZ_INCLUDES) $(GGZCORE_INCLUDES) $(GGZDMOD_INCLUDES) \ -+ $(GNOME_GAMES_CFLAGS) - - @GGZ_SERVER_TRUE@iagnod_SOURCES = server.h \ - @GGZ_SERVER_TRUE@ server.c diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index e0d7b20b6a29..227ece48bf29 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -389,7 +389,6 @@ share/gnobots2/nightmare.cfg share/gnobots2/robots2.cfg share/gnobots2/robots2_easy.cfg share/gnobots2/robots_with_safe_teleport.cfg -share/gnome-games-common/cards/bonded.svg share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/aisleriot/games/agnes.scm %%DATADIR%%/aisleriot/games/athena.scm @@ -418,6 +417,7 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/aisleriot/games/first_law.scm %%DATADIR%%/aisleriot/games/fortress.scm %%DATADIR%%/aisleriot/games/fortunes.scm +%%DATADIR%%/aisleriot/games/forty_thieves.scm %%DATADIR%%/aisleriot/games/fourteen.scm %%DATADIR%%/aisleriot/games/freecell.scm %%DATADIR%%/aisleriot/games/gaps.scm @@ -557,6 +557,7 @@ share/gnome/help/aisleriot/C/figures/clock-rules.png share/gnome/help/aisleriot/C/first_law.xml share/gnome/help/aisleriot/C/fortress.xml share/gnome/help/aisleriot/C/fortunes.xml +share/gnome/help/aisleriot/C/forty_thieves.xml share/gnome/help/aisleriot/C/fourteen.xml share/gnome/help/aisleriot/C/freecell.xml share/gnome/help/aisleriot/C/gaps.xml @@ -616,6 +617,9 @@ share/gnome/help/aisleriot/C/zebra.xml share/gnome/help/aisleriot/ca/aisleriot.xml share/gnome/help/aisleriot/ca/figures/camelot-goal.png share/gnome/help/aisleriot/ca/figures/clock-rules.png +share/gnome/help/aisleriot/de/aisleriot.xml +share/gnome/help/aisleriot/de/figures/camelot-goal.png +share/gnome/help/aisleriot/de/figures/clock-rules.png share/gnome/help/aisleriot/es/aisleriot.xml share/gnome/help/aisleriot/es/figures/camelot-goal.png share/gnome/help/aisleriot/es/figures/clock-rules.png @@ -625,6 +629,9 @@ share/gnome/help/aisleriot/fr/figures/clock-rules.png share/gnome/help/aisleriot/oc/aisleriot.xml share/gnome/help/aisleriot/oc/figures/camelot-goal.png share/gnome/help/aisleriot/oc/figures/clock-rules.png +share/gnome/help/aisleriot/ru/aisleriot.xml +share/gnome/help/aisleriot/ru/figures/camelot-goal.png +share/gnome/help/aisleriot/ru/figures/clock-rules.png share/gnome/help/aisleriot/sv/aisleriot.xml share/gnome/help/aisleriot/sv/figures/camelot-goal.png share/gnome/help/aisleriot/sv/figures/clock-rules.png @@ -635,6 +642,9 @@ share/gnome/help/blackjack/C/legal.xml share/gnome/help/blackjack/ca/blackjack.xml share/gnome/help/blackjack/ca/figures/blackjack_start_window.png share/gnome/help/blackjack/ca/figures/blackjack_win_window.png +share/gnome/help/blackjack/de/blackjack.xml +share/gnome/help/blackjack/de/figures/blackjack_start_window.png +share/gnome/help/blackjack/de/figures/blackjack_win_window.png share/gnome/help/blackjack/el/blackjack.xml share/gnome/help/blackjack/el/figures/blackjack_start_window.png share/gnome/help/blackjack/el/figures/blackjack_win_window.png @@ -661,6 +671,11 @@ share/gnome/help/glchess/ca/figures/new_game.png share/gnome/help/glchess/ca/figures/preferences_game.png share/gnome/help/glchess/ca/figures/preferences_view.png share/gnome/help/glchess/ca/glchess.xml +share/gnome/help/glchess/de/figures/game.png +share/gnome/help/glchess/de/figures/new_game.png +share/gnome/help/glchess/de/figures/preferences_game.png +share/gnome/help/glchess/de/figures/preferences_view.png +share/gnome/help/glchess/de/glchess.xml share/gnome/help/glchess/el/figures/game.png share/gnome/help/glchess/el/figures/new_game.png share/gnome/help/glchess/el/figures/preferences_game.png @@ -686,6 +701,11 @@ share/gnome/help/glchess/pt_BR/figures/new_game.png share/gnome/help/glchess/pt_BR/figures/preferences_game.png share/gnome/help/glchess/pt_BR/figures/preferences_view.png share/gnome/help/glchess/pt_BR/glchess.xml +share/gnome/help/glchess/ru/figures/game.png +share/gnome/help/glchess/ru/figures/new_game.png +share/gnome/help/glchess/ru/figures/preferences_game.png +share/gnome/help/glchess/ru/figures/preferences_view.png +share/gnome/help/glchess/ru/glchess.xml share/gnome/help/glchess/sv/figures/game.png share/gnome/help/glchess/sv/figures/new_game.png share/gnome/help/glchess/sv/figures/preferences_game.png @@ -700,6 +720,10 @@ share/gnome/help/glines/ca/figures/glines-gameover.png share/gnome/help/glines/ca/figures/glines-startgame.png share/gnome/help/glines/ca/figures/preferences.png share/gnome/help/glines/ca/glines.xml +share/gnome/help/glines/de/figures/glines-gameover.png +share/gnome/help/glines/de/figures/glines-startgame.png +share/gnome/help/glines/de/figures/preferences.png +share/gnome/help/glines/de/glines.xml share/gnome/help/glines/en_GB/figures/glines-gameover.png share/gnome/help/glines/en_GB/figures/glines-startgame.png share/gnome/help/glines/en_GB/figures/preferences.png @@ -728,6 +752,10 @@ share/gnome/help/glines/sv/figures/glines-gameover.png share/gnome/help/glines/sv/figures/glines-startgame.png share/gnome/help/glines/sv/figures/preferences.png share/gnome/help/glines/sv/glines.xml +share/gnome/help/glines/tr/figures/glines-gameover.png +share/gnome/help/glines/tr/figures/glines-startgame.png +share/gnome/help/glines/tr/figures/preferences.png +share/gnome/help/glines/tr/glines.xml share/gnome/help/gnect/C/figures/connect.png share/gnome/help/gnect/C/figures/mainwindow.png share/gnome/help/gnect/C/figures/tables.png @@ -740,6 +768,11 @@ share/gnome/help/gnect/ca/figures/mainwindow.png share/gnome/help/gnect/ca/figures/tables.png share/gnome/help/gnect/ca/figures/tileset.png share/gnome/help/gnect/ca/gnect.xml +share/gnome/help/gnect/de/figures/connect.png +share/gnome/help/gnect/de/figures/mainwindow.png +share/gnome/help/gnect/de/figures/tables.png +share/gnome/help/gnect/de/figures/tileset.png +share/gnome/help/gnect/de/gnect.xml share/gnome/help/gnect/en_GB/figures/connect.png share/gnome/help/gnect/en_GB/figures/mainwindow.png share/gnome/help/gnect/en_GB/figures/tables.png @@ -786,6 +819,13 @@ share/gnome/help/gnibbles/ca/figures/playing.png share/gnome/help/gnibbles/ca/figures/tables.png share/gnome/help/gnibbles/ca/figures/worm_op.png share/gnome/help/gnibbles/ca/gnibbles.xml +share/gnome/help/gnibbles/de/figures/connect.png +share/gnome/help/gnibbles/de/figures/game.png +share/gnome/help/gnibbles/de/figures/intro.png +share/gnome/help/gnibbles/de/figures/playing.png +share/gnome/help/gnibbles/de/figures/tables.png +share/gnome/help/gnibbles/de/figures/worm_op.png +share/gnome/help/gnibbles/de/gnibbles.xml share/gnome/help/gnibbles/es/figures/connect.png share/gnome/help/gnibbles/es/figures/game.png share/gnome/help/gnibbles/es/figures/intro.png @@ -800,6 +840,13 @@ share/gnome/help/gnibbles/fr/figures/playing.png share/gnome/help/gnibbles/fr/figures/tables.png share/gnome/help/gnibbles/fr/figures/worm_op.png share/gnome/help/gnibbles/fr/gnibbles.xml +share/gnome/help/gnibbles/it/figures/connect.png +share/gnome/help/gnibbles/it/figures/game.png +share/gnome/help/gnibbles/it/figures/intro.png +share/gnome/help/gnibbles/it/figures/playing.png +share/gnome/help/gnibbles/it/figures/tables.png +share/gnome/help/gnibbles/it/figures/worm_op.png +share/gnome/help/gnibbles/it/gnibbles.xml share/gnome/help/gnibbles/oc/figures/connect.png share/gnome/help/gnibbles/oc/figures/game.png share/gnome/help/gnibbles/oc/figures/intro.png @@ -858,6 +905,14 @@ share/gnome/help/gnome-sudoku/da/figures/hints.png share/gnome/help/gnome-sudoku/da/figures/resuming.png share/gnome/help/gnome-sudoku/da/figures/starting.png share/gnome/help/gnome-sudoku/da/gnome-sudoku.xml +share/gnome/help/gnome-sudoku/de/figures/Print_Sudokus.png +share/gnome/help/gnome-sudoku/de/figures/always_show_hint.png +share/gnome/help/gnome-sudoku/de/figures/error_highlighting.png +share/gnome/help/gnome-sudoku/de/figures/highlighting.png +share/gnome/help/gnome-sudoku/de/figures/hints.png +share/gnome/help/gnome-sudoku/de/figures/resuming.png +share/gnome/help/gnome-sudoku/de/figures/starting.png +share/gnome/help/gnome-sudoku/de/gnome-sudoku.xml share/gnome/help/gnome-sudoku/es/figures/Print_Sudokus.png share/gnome/help/gnome-sudoku/es/figures/always_show_hint.png share/gnome/help/gnome-sudoku/es/figures/error_highlighting.png @@ -874,6 +929,14 @@ share/gnome/help/gnome-sudoku/fr/figures/hints.png share/gnome/help/gnome-sudoku/fr/figures/resuming.png share/gnome/help/gnome-sudoku/fr/figures/starting.png share/gnome/help/gnome-sudoku/fr/gnome-sudoku.xml +share/gnome/help/gnome-sudoku/it/figures/Print_Sudokus.png +share/gnome/help/gnome-sudoku/it/figures/always_show_hint.png +share/gnome/help/gnome-sudoku/it/figures/error_highlighting.png +share/gnome/help/gnome-sudoku/it/figures/highlighting.png +share/gnome/help/gnome-sudoku/it/figures/hints.png +share/gnome/help/gnome-sudoku/it/figures/resuming.png +share/gnome/help/gnome-sudoku/it/figures/starting.png +share/gnome/help/gnome-sudoku/it/gnome-sudoku.xml share/gnome/help/gnome-sudoku/oc/figures/Print_Sudokus.png share/gnome/help/gnome-sudoku/oc/figures/always_show_hint.png share/gnome/help/gnome-sudoku/oc/figures/error_highlighting.png @@ -890,6 +953,14 @@ share/gnome/help/gnome-sudoku/pt_BR/figures/hints.png share/gnome/help/gnome-sudoku/pt_BR/figures/resuming.png share/gnome/help/gnome-sudoku/pt_BR/figures/starting.png share/gnome/help/gnome-sudoku/pt_BR/gnome-sudoku.xml +share/gnome/help/gnome-sudoku/ru/figures/Print_Sudokus.png +share/gnome/help/gnome-sudoku/ru/figures/always_show_hint.png +share/gnome/help/gnome-sudoku/ru/figures/error_highlighting.png +share/gnome/help/gnome-sudoku/ru/figures/highlighting.png +share/gnome/help/gnome-sudoku/ru/figures/hints.png +share/gnome/help/gnome-sudoku/ru/figures/resuming.png +share/gnome/help/gnome-sudoku/ru/figures/starting.png +share/gnome/help/gnome-sudoku/ru/gnome-sudoku.xml share/gnome/help/gnome-sudoku/sv/figures/Print_Sudokus.png share/gnome/help/gnome-sudoku/sv/figures/always_show_hint.png share/gnome/help/gnome-sudoku/sv/figures/error_highlighting.png @@ -901,6 +972,7 @@ share/gnome/help/gnome-sudoku/sv/gnome-sudoku.xml share/gnome/help/gnometris/C/gnometris.xml share/gnome/help/gnometris/C/legal.xml share/gnome/help/gnometris/ca/gnometris.xml +share/gnome/help/gnometris/de/gnometris.xml share/gnome/help/gnometris/el/gnometris.xml share/gnome/help/gnometris/es/gnometris.xml share/gnome/help/gnometris/fr/gnometris.xml @@ -1045,6 +1117,9 @@ share/gnome/help/gnotravex/it/gnotravex.xml share/gnome/help/gnotravex/oc/figures/gnotravex_game.png share/gnome/help/gnotravex/oc/figures/gnotravex_mainwindow.png share/gnome/help/gnotravex/oc/gnotravex.xml +share/gnome/help/gnotravex/ru/figures/gnotravex_game.png +share/gnome/help/gnotravex/ru/figures/gnotravex_mainwindow.png +share/gnome/help/gnotravex/ru/gnotravex.xml share/gnome/help/gnotravex/sv/figures/gnotravex_game.png share/gnome/help/gnotravex/sv/figures/gnotravex_mainwindow.png share/gnome/help/gnotravex/sv/gnotravex.xml @@ -1082,6 +1157,9 @@ share/gnome/help/gtali/ca/figures/preferences.png share/gnome/help/gtali/ca/gtali.xml share/gnome/help/gtali/da/gtali.xml share/gnome/help/gtali/da/legal.xml +share/gnome/help/gtali/de/figures/mainwindow.png +share/gnome/help/gtali/de/figures/preferences.png +share/gnome/help/gtali/de/gtali.xml share/gnome/help/gtali/es/figures/mainwindow.png share/gnome/help/gtali/es/figures/preferences.png share/gnome/help/gtali/es/gtali.xml @@ -1094,6 +1172,9 @@ share/gnome/help/gtali/it/gtali.xml share/gnome/help/gtali/oc/figures/mainwindow.png share/gnome/help/gtali/oc/figures/preferences.png share/gnome/help/gtali/oc/gtali.xml +share/gnome/help/gtali/pt_BR/figures/mainwindow.png +share/gnome/help/gtali/pt_BR/figures/preferences.png +share/gnome/help/gtali/pt_BR/gtali.xml share/gnome/help/gtali/sv/figures/mainwindow.png share/gnome/help/gtali/sv/figures/preferences.png share/gnome/help/gtali/sv/gtali.xml @@ -1115,6 +1196,14 @@ share/gnome/help/iagno/ca/figures/START.png share/gnome/help/iagno/ca/figures/connect.png share/gnome/help/iagno/ca/figures/tables.png share/gnome/help/iagno/ca/iagno.xml +share/gnome/help/iagno/de/figures/ANIMATION.png +share/gnome/help/iagno/de/figures/BLOCK.png +share/gnome/help/iagno/de/figures/FIRST.png +share/gnome/help/iagno/de/figures/PLAYER.png +share/gnome/help/iagno/de/figures/START.png +share/gnome/help/iagno/de/figures/connect.png +share/gnome/help/iagno/de/figures/tables.png +share/gnome/help/iagno/de/iagno.xml share/gnome/help/iagno/es/figures/ANIMATION.png share/gnome/help/iagno/es/figures/BLOCK.png share/gnome/help/iagno/es/figures/FIRST.png @@ -1131,6 +1220,14 @@ share/gnome/help/iagno/fr/figures/START.png share/gnome/help/iagno/fr/figures/connect.png share/gnome/help/iagno/fr/figures/tables.png share/gnome/help/iagno/fr/iagno.xml +share/gnome/help/iagno/it/figures/ANIMATION.png +share/gnome/help/iagno/it/figures/BLOCK.png +share/gnome/help/iagno/it/figures/FIRST.png +share/gnome/help/iagno/it/figures/PLAYER.png +share/gnome/help/iagno/it/figures/START.png +share/gnome/help/iagno/it/figures/connect.png +share/gnome/help/iagno/it/figures/tables.png +share/gnome/help/iagno/it/iagno.xml share/gnome/help/iagno/oc/figures/ANIMATION.png share/gnome/help/iagno/oc/figures/BLOCK.png share/gnome/help/iagno/oc/figures/FIRST.png @@ -1166,6 +1263,11 @@ share/gnome/help/mahjongg/ca/figures/no-move.png share/gnome/help/mahjongg/ca/figures/preferences.png share/gnome/help/mahjongg/ca/figures/toolbar.png share/gnome/help/mahjongg/ca/mahjongg.xml +share/gnome/help/mahjongg/de/figures/mahjongg.png +share/gnome/help/mahjongg/de/figures/no-move.png +share/gnome/help/mahjongg/de/figures/preferences.png +share/gnome/help/mahjongg/de/figures/toolbar.png +share/gnome/help/mahjongg/de/mahjongg.xml share/gnome/help/mahjongg/es/figures/mahjongg.png share/gnome/help/mahjongg/es/figures/no-move.png share/gnome/help/mahjongg/es/figures/preferences.png @@ -1176,6 +1278,11 @@ share/gnome/help/mahjongg/fr/figures/no-move.png share/gnome/help/mahjongg/fr/figures/preferences.png share/gnome/help/mahjongg/fr/figures/toolbar.png share/gnome/help/mahjongg/fr/mahjongg.xml +share/gnome/help/mahjongg/it/figures/mahjongg.png +share/gnome/help/mahjongg/it/figures/no-move.png +share/gnome/help/mahjongg/it/figures/preferences.png +share/gnome/help/mahjongg/it/figures/toolbar.png +share/gnome/help/mahjongg/it/mahjongg.xml share/gnome/help/mahjongg/oc/figures/mahjongg.png share/gnome/help/mahjongg/oc/figures/no-move.png share/gnome/help/mahjongg/oc/figures/preferences.png @@ -1194,6 +1301,10 @@ share/gnome/help/same-gnome/ca/figures/play.png share/gnome/help/same-gnome/ca/figures/start-up.png share/gnome/help/same-gnome/ca/legal.xml share/gnome/help/same-gnome/ca/same-gnome.xml +share/gnome/help/same-gnome/de/figures/play.png +share/gnome/help/same-gnome/de/figures/start-up.png +share/gnome/help/same-gnome/de/legal.xml +share/gnome/help/same-gnome/de/same-gnome.xml share/gnome/help/same-gnome/en_GB/figures/play.png share/gnome/help/same-gnome/en_GB/figures/start-up.png share/gnome/help/same-gnome/en_GB/legal.xml @@ -1362,8 +1473,10 @@ share/locale/ka/LC_MESSAGES/gnome-games.mo share/locale/kn/LC_MESSAGES/gnome-games.mo share/locale/ko/LC_MESSAGES/gnome-games.mo share/locale/ku/LC_MESSAGES/gnome-games.mo +share/locale/la/LC_MESSAGES/gnome-games.mo share/locale/lt/LC_MESSAGES/gnome-games.mo share/locale/lv/LC_MESSAGES/gnome-games.mo +share/locale/mai/LC_MESSAGES/gnome-games.mo share/locale/mk/LC_MESSAGES/gnome-games.mo share/locale/ml/LC_MESSAGES/gnome-games.mo share/locale/mn/LC_MESSAGES/gnome-games.mo @@ -1387,7 +1500,7 @@ share/locale/sk/LC_MESSAGES/gnome-games.mo share/locale/sl/LC_MESSAGES/gnome-games.mo share/locale/sq/LC_MESSAGES/gnome-games.mo share/locale/sr/LC_MESSAGES/gnome-games.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-games.mo +share/locale/sr@latin/LC_MESSAGES/gnome-games.mo share/locale/sv/LC_MESSAGES/gnome-games.mo share/locale/ta/LC_MESSAGES/gnome-games.mo share/locale/te/LC_MESSAGES/gnome-games.mo @@ -1402,12 +1515,15 @@ share/locale/zh_HK/LC_MESSAGES/gnome-games.mo share/locale/zh_TW/LC_MESSAGES/gnome-games.mo share/omf/aisleriot/aisleriot-C.omf share/omf/aisleriot/aisleriot-ca.omf +share/omf/aisleriot/aisleriot-de.omf share/omf/aisleriot/aisleriot-es.omf share/omf/aisleriot/aisleriot-fr.omf share/omf/aisleriot/aisleriot-oc.omf +share/omf/aisleriot/aisleriot-ru.omf share/omf/aisleriot/aisleriot-sv.omf share/omf/blackjack/blackjack-C.omf share/omf/blackjack/blackjack-ca.omf +share/omf/blackjack/blackjack-de.omf share/omf/blackjack/blackjack-el.omf share/omf/blackjack/blackjack-es.omf share/omf/blackjack/blackjack-fr.omf @@ -1415,14 +1531,17 @@ share/omf/blackjack/blackjack-oc.omf share/omf/blackjack/blackjack-sv.omf share/omf/glchess/glchess-C.omf share/omf/glchess/glchess-ca.omf +share/omf/glchess/glchess-de.omf share/omf/glchess/glchess-el.omf share/omf/glchess/glchess-es.omf share/omf/glchess/glchess-fr.omf share/omf/glchess/glchess-oc.omf share/omf/glchess/glchess-pt_BR.omf +share/omf/glchess/glchess-ru.omf share/omf/glchess/glchess-sv.omf share/omf/glines/glines-C.omf share/omf/glines/glines-ca.omf +share/omf/glines/glines-de.omf share/omf/glines/glines-en_GB.omf share/omf/glines/glines-es.omf share/omf/glines/glines-fr.omf @@ -1430,8 +1549,10 @@ share/omf/glines/glines-it.omf share/omf/glines/glines-oc.omf share/omf/glines/glines-ru.omf share/omf/glines/glines-sv.omf +share/omf/glines/glines-tr.omf share/omf/gnect/gnect-C.omf share/omf/gnect/gnect-ca.omf +share/omf/gnect/gnect-de.omf share/omf/gnect/gnect-en_GB.omf share/omf/gnect/gnect-es.omf share/omf/gnect/gnect-fr.omf @@ -1440,8 +1561,10 @@ share/omf/gnect/gnect-oc.omf share/omf/gnect/gnect-sv.omf share/omf/gnibbles/gnibbles-C.omf share/omf/gnibbles/gnibbles-ca.omf +share/omf/gnibbles/gnibbles-de.omf share/omf/gnibbles/gnibbles-es.omf share/omf/gnibbles/gnibbles-fr.omf +share/omf/gnibbles/gnibbles-it.omf share/omf/gnibbles/gnibbles-oc.omf share/omf/gnibbles/gnibbles-sv.omf share/omf/gnobots2/gnobots2-C.omf @@ -1457,13 +1580,17 @@ share/omf/gnome-games/gtali-da.omf share/omf/gnome-sudoku/gnome-sudoku-C.omf share/omf/gnome-sudoku/gnome-sudoku-ca.omf share/omf/gnome-sudoku/gnome-sudoku-da.omf +share/omf/gnome-sudoku/gnome-sudoku-de.omf share/omf/gnome-sudoku/gnome-sudoku-es.omf share/omf/gnome-sudoku/gnome-sudoku-fr.omf +share/omf/gnome-sudoku/gnome-sudoku-it.omf share/omf/gnome-sudoku/gnome-sudoku-oc.omf share/omf/gnome-sudoku/gnome-sudoku-pt_BR.omf +share/omf/gnome-sudoku/gnome-sudoku-ru.omf share/omf/gnome-sudoku/gnome-sudoku-sv.omf share/omf/gnometris/gnometris-C.omf share/omf/gnometris/gnometris-ca.omf +share/omf/gnometris/gnometris-de.omf share/omf/gnometris/gnometris-el.omf share/omf/gnometris/gnometris-es.omf share/omf/gnometris/gnometris-fr.omf @@ -1486,6 +1613,7 @@ share/omf/gnotravex/gnotravex-es.omf share/omf/gnotravex/gnotravex-fr.omf share/omf/gnotravex/gnotravex-it.omf share/omf/gnotravex/gnotravex-oc.omf +share/omf/gnotravex/gnotravex-ru.omf share/omf/gnotravex/gnotravex-sv.omf share/omf/gnotski/gnotski-C.omf share/omf/gnotski/gnotski-ca.omf @@ -1497,26 +1625,33 @@ share/omf/gnotski/gnotski-oc.omf share/omf/gnotski/gnotski-sv.omf share/omf/gtali/gtali-C.omf share/omf/gtali/gtali-ca.omf +share/omf/gtali/gtali-de.omf share/omf/gtali/gtali-es.omf share/omf/gtali/gtali-fr.omf share/omf/gtali/gtali-it.omf share/omf/gtali/gtali-oc.omf +share/omf/gtali/gtali-pt_BR.omf share/omf/gtali/gtali-sv.omf share/omf/iagno/iagno-C.omf share/omf/iagno/iagno-ca.omf +share/omf/iagno/iagno-de.omf share/omf/iagno/iagno-es.omf share/omf/iagno/iagno-fr.omf +share/omf/iagno/iagno-it.omf share/omf/iagno/iagno-oc.omf share/omf/iagno/iagno-pt_BR.omf share/omf/iagno/iagno-sv.omf share/omf/mahjongg/mahjongg-C.omf share/omf/mahjongg/mahjongg-ca.omf +share/omf/mahjongg/mahjongg-de.omf share/omf/mahjongg/mahjongg-es.omf share/omf/mahjongg/mahjongg-fr.omf +share/omf/mahjongg/mahjongg-it.omf share/omf/mahjongg/mahjongg-oc.omf share/omf/mahjongg/mahjongg-sv.omf share/omf/same-gnome/same-gnome-C.omf share/omf/same-gnome/same-gnome-ca.omf +share/omf/same-gnome/same-gnome-de.omf share/omf/same-gnome/same-gnome-en_GB.omf share/omf/same-gnome/same-gnome-es.omf share/omf/same-gnome/same-gnome-fr.omf @@ -1649,6 +1784,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/same-gnome/es @dirrm share/gnome/help/same-gnome/en_GB/figures @dirrm share/gnome/help/same-gnome/en_GB +@dirrm share/gnome/help/same-gnome/de/figures +@dirrm share/gnome/help/same-gnome/de @dirrm share/gnome/help/same-gnome/ca/figures @dirrm share/gnome/help/same-gnome/ca @dirrm share/gnome/help/same-gnome/C/figures @@ -1658,10 +1795,14 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/mahjongg/sv @dirrm share/gnome/help/mahjongg/oc/figures @dirrm share/gnome/help/mahjongg/oc +@dirrm share/gnome/help/mahjongg/it/figures +@dirrm share/gnome/help/mahjongg/it @dirrm share/gnome/help/mahjongg/fr/figures @dirrm share/gnome/help/mahjongg/fr @dirrm share/gnome/help/mahjongg/es/figures @dirrm share/gnome/help/mahjongg/es +@dirrm share/gnome/help/mahjongg/de/figures +@dirrm share/gnome/help/mahjongg/de @dirrm share/gnome/help/mahjongg/ca/figures @dirrm share/gnome/help/mahjongg/ca @dirrm share/gnome/help/mahjongg/C/figures @@ -1673,10 +1814,14 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/iagno/pt_BR @dirrm share/gnome/help/iagno/oc/figures @dirrm share/gnome/help/iagno/oc +@dirrm share/gnome/help/iagno/it/figures +@dirrm share/gnome/help/iagno/it @dirrm share/gnome/help/iagno/fr/figures @dirrm share/gnome/help/iagno/fr @dirrm share/gnome/help/iagno/es/figures @dirrm share/gnome/help/iagno/es +@dirrm share/gnome/help/iagno/de/figures +@dirrm share/gnome/help/iagno/de @dirrm share/gnome/help/iagno/ca/figures @dirrm share/gnome/help/iagno/ca @dirrm share/gnome/help/iagno/C/figures @@ -1684,6 +1829,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/iagno @dirrm share/gnome/help/gtali/sv/figures @dirrm share/gnome/help/gtali/sv +@dirrm share/gnome/help/gtali/pt_BR/figures +@dirrm share/gnome/help/gtali/pt_BR @dirrm share/gnome/help/gtali/oc/figures @dirrm share/gnome/help/gtali/oc @dirrm share/gnome/help/gtali/it/figures @@ -1692,6 +1839,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gtali/fr @dirrm share/gnome/help/gtali/es/figures @dirrm share/gnome/help/gtali/es +@dirrm share/gnome/help/gtali/de/figures +@dirrm share/gnome/help/gtali/de @dirrm share/gnome/help/gtali/da @dirrm share/gnome/help/gtali/ca/figures @dirrm share/gnome/help/gtali/ca @@ -1717,6 +1866,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnotski @dirrm share/gnome/help/gnotravex/sv/figures @dirrm share/gnome/help/gnotravex/sv +@dirrm share/gnome/help/gnotravex/ru/figures +@dirrm share/gnome/help/gnotravex/ru @dirrm share/gnome/help/gnotravex/oc/figures @dirrm share/gnome/help/gnotravex/oc @dirrm share/gnome/help/gnotravex/it/figures @@ -1757,19 +1908,26 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnometris/fr @dirrm share/gnome/help/gnometris/es @dirrm share/gnome/help/gnometris/el +@dirrm share/gnome/help/gnometris/de @dirrm share/gnome/help/gnometris/ca @dirrm share/gnome/help/gnometris/C @dirrm share/gnome/help/gnometris @dirrm share/gnome/help/gnome-sudoku/sv/figures @dirrm share/gnome/help/gnome-sudoku/sv +@dirrm share/gnome/help/gnome-sudoku/ru/figures +@dirrm share/gnome/help/gnome-sudoku/ru @dirrm share/gnome/help/gnome-sudoku/pt_BR/figures @dirrm share/gnome/help/gnome-sudoku/pt_BR @dirrm share/gnome/help/gnome-sudoku/oc/figures @dirrm share/gnome/help/gnome-sudoku/oc +@dirrm share/gnome/help/gnome-sudoku/it/figures +@dirrm share/gnome/help/gnome-sudoku/it @dirrm share/gnome/help/gnome-sudoku/fr/figures @dirrm share/gnome/help/gnome-sudoku/fr @dirrm share/gnome/help/gnome-sudoku/es/figures @dirrm share/gnome/help/gnome-sudoku/es +@dirrm share/gnome/help/gnome-sudoku/de/figures +@dirrm share/gnome/help/gnome-sudoku/de @dirrm share/gnome/help/gnome-sudoku/da/figures @dirrm share/gnome/help/gnome-sudoku/da @dirrm share/gnome/help/gnome-sudoku/ca/figures @@ -1799,10 +1957,14 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnibbles/sv @dirrm share/gnome/help/gnibbles/oc/figures @dirrm share/gnome/help/gnibbles/oc +@dirrm share/gnome/help/gnibbles/it/figures +@dirrm share/gnome/help/gnibbles/it @dirrm share/gnome/help/gnibbles/fr/figures @dirrm share/gnome/help/gnibbles/fr @dirrm share/gnome/help/gnibbles/es/figures @dirrm share/gnome/help/gnibbles/es +@dirrm share/gnome/help/gnibbles/de/figures +@dirrm share/gnome/help/gnibbles/de @dirrm share/gnome/help/gnibbles/ca/figures @dirrm share/gnome/help/gnibbles/ca @dirrm share/gnome/help/gnibbles/C/figures @@ -1820,11 +1982,15 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnect/es @dirrm share/gnome/help/gnect/en_GB/figures @dirrm share/gnome/help/gnect/en_GB +@dirrm share/gnome/help/gnect/de/figures +@dirrm share/gnome/help/gnect/de @dirrm share/gnome/help/gnect/ca/figures @dirrm share/gnome/help/gnect/ca @dirrm share/gnome/help/gnect/C/figures @dirrm share/gnome/help/gnect/C @dirrm share/gnome/help/gnect +@dirrm share/gnome/help/glines/tr/figures +@dirrm share/gnome/help/glines/tr @dirrm share/gnome/help/glines/sv/figures @dirrm share/gnome/help/glines/sv @dirrm share/gnome/help/glines/ru/figures @@ -1839,6 +2005,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/glines/es @dirrm share/gnome/help/glines/en_GB/figures @dirrm share/gnome/help/glines/en_GB +@dirrm share/gnome/help/glines/de/figures +@dirrm share/gnome/help/glines/de @dirrm share/gnome/help/glines/ca/figures @dirrm share/gnome/help/glines/ca @dirrm share/gnome/help/glines/C/figures @@ -1846,6 +2014,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/glines @dirrm share/gnome/help/glchess/sv/figures @dirrm share/gnome/help/glchess/sv +@dirrm share/gnome/help/glchess/ru/figures +@dirrm share/gnome/help/glchess/ru @dirrm share/gnome/help/glchess/pt_BR/figures @dirrm share/gnome/help/glchess/pt_BR @dirrm share/gnome/help/glchess/oc/figures @@ -1856,6 +2026,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/glchess/es @dirrm share/gnome/help/glchess/el/figures @dirrm share/gnome/help/glchess/el +@dirrm share/gnome/help/glchess/de/figures +@dirrm share/gnome/help/glchess/de @dirrm share/gnome/help/glchess/ca/figures @dirrm share/gnome/help/glchess/ca @dirrm share/gnome/help/glchess/C/figures @@ -1871,6 +2043,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/blackjack/es @dirrm share/gnome/help/blackjack/el/figures @dirrm share/gnome/help/blackjack/el +@dirrm share/gnome/help/blackjack/de/figures +@dirrm share/gnome/help/blackjack/de @dirrm share/gnome/help/blackjack/ca/figures @dirrm share/gnome/help/blackjack/ca @dirrm share/gnome/help/blackjack/C/figures @@ -1878,12 +2052,16 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/blackjack @dirrm share/gnome/help/aisleriot/sv/figures @dirrm share/gnome/help/aisleriot/sv +@dirrm share/gnome/help/aisleriot/ru/figures +@dirrm share/gnome/help/aisleriot/ru @dirrm share/gnome/help/aisleriot/oc/figures @dirrm share/gnome/help/aisleriot/oc @dirrm share/gnome/help/aisleriot/fr/figures @dirrm share/gnome/help/aisleriot/fr @dirrm share/gnome/help/aisleriot/es/figures @dirrm share/gnome/help/aisleriot/es +@dirrm share/gnome/help/aisleriot/de/figures +@dirrm share/gnome/help/aisleriot/de @dirrm share/gnome/help/aisleriot/ca/figures @dirrm share/gnome/help/aisleriot/ca @dirrm share/gnome/help/aisleriot/C/figures @@ -1940,6 +2118,8 @@ share/pixmaps/mahjongg/smooth.png @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -1948,6 +2128,10 @@ share/pixmaps/mahjongg/smooth.png @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/la/LC_MESSAGES +@dirrmtry share/locale/la @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 75026f4327c7..511c425010c9 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/cairo/Makefile,v 1.3 2008/06/16 21:35:57 mezz Exp $ +# $MCom: ports/graphics/cairo/Makefile,v 1.89 2008/12/16 03:06:44 marcus Exp $ # PORTNAME= cairo -PORTVERSION= 1.6.4 -PORTREVISION?= 4 +PORTVERSION= 1.8.6 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -27,7 +27,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --enable-pdf \ --enable-ps -USE_GNOME= gnometarget gnomehack ltverhack referencehack +USE_GNOME= gnomehack ltverhack referencehack USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index afffbc8d7480..0c7bb07eac58 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (cairo-1.6.4.tar.gz) = a198d509f9e3a35b78de8bb02174ebb9 -SHA256 (cairo-1.6.4.tar.gz) = 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42 -SIZE (cairo-1.6.4.tar.gz) = 5042623 +MD5 (cairo-1.8.6.tar.gz) = 4e64139ef6f668df24450f3b81dd0771 +SHA256 (cairo-1.8.6.tar.gz) = 93a347af0cecf258be8fb54265b16a0fb16317df4a32896141d2987c30773535 +SIZE (cairo-1.8.6.tar.gz) = 6616544 diff --git a/graphics/cairo/files/patch-src_cairo-ft-font.c b/graphics/cairo/files/patch-src_cairo-ft-font.c deleted file mode 100644 index 8cd60665fef0..000000000000 --- a/graphics/cairo/files/patch-src_cairo-ft-font.c +++ /dev/null @@ -1,28 +0,0 @@ ---- src/cairo-ft-font.c.orig Tue Aug 16 14:46:46 2005 -+++ src/cairo-ft-font.c Tue Aug 16 14:46:59 2005 -@@ -44,6 +44,11 @@ - #include <fontconfig/fontconfig.h> - #include <fontconfig/fcfreetype.h> - -+#include <sys/types.h> -+#include <stdlib.h> -+#include <time.h> -+#include <unistd.h> -+ - #include <ft2build.h> - #include FT_FREETYPE_H - #include FT_OUTLINE_H -@@ -257,7 +262,12 @@ _cairo_ft_unscaled_font_init_key (cairo_ - key->id = id; - - /* 1607 is just an arbitrary prime. */ -- hash = _cairo_hash_string (filename); -+ if (filename != NULL) { -+ hash = _cairo_hash_string (filename); -+ } else { -+ srandom(time(NULL) * getpid()); -+ hash = random(); -+ } - hash += ((unsigned long) id) * 1607; - - key->base.hash_entry.hash = hash; diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index d1b67967143d..ec0206e6a37d 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -5,6 +5,7 @@ include/cairo/cairo-ft.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h include/cairo/cairo-svg.h +include/cairo/cairo-version.h %%XCB%%include/cairo/cairo-xcb-xrender.h %%XCB%%include/cairo/cairo-xcb.h %%X11%%include/cairo/cairo-xlib-xrender.h diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 742dca7f5681..be8d34cd4e77 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/eog/Makefile,v 1.74 2008/03/10 13:44:08 ahze Exp $ +# $MCom: ports/graphics/eog/Makefile,v 1.88 2008/11/25 16:26:59 marcus Exp $ # PORTNAME= eog -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 CATEGORIES= graphics gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index 8891d2584381..e1fab8058a41 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eog-2.22.3.tar.bz2) = f1ca295b0ebf800cab17fc166e37588e -SHA256 (gnome2/eog-2.22.3.tar.bz2) = 183656d9ae0347eded7ba02c992e281f7e139ec82a0ee854c6ee387548391dd2 -SIZE (gnome2/eog-2.22.3.tar.bz2) = 1894695 +MD5 (gnome2/eog-2.24.2.tar.bz2) = 219896d7b33016bc9b0485937e737d9f +SHA256 (gnome2/eog-2.24.2.tar.bz2) = e6edcc0b97b2b23db87ea444ba8e7a42ce29b524f1bf41cb020007bf8ceac1b0 +SIZE (gnome2/eog-2.24.2.tar.bz2) = 2277300 diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index d42b43a1826d..66e1a4e9c6de 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -3,6 +3,8 @@ include/eog-2.20/eog/eog-application.h include/eog-2.20/eog/eog-debug.h include/eog-2.20/eog/eog-dialog.h include/eog-2.20/eog/eog-error-message-area.h +include/eog-2.20/eog/eog-exif-details.h +include/eog-2.20/eog/eog-exif-util.h include/eog-2.20/eog/eog-file-chooser.h include/eog-2.20/eog/eog-image-save-info.h include/eog-2.20/eog/eog-image.h @@ -20,8 +22,74 @@ include/eog-2.20/eog/eog-thumb-view.h include/eog-2.20/eog/eog-thumbnail.h include/eog-2.20/eog/eog-transform.h include/eog-2.20/eog/eog-window.h +lib/eog/plugins/fullscreen.eog-plugin +lib/eog/plugins/libfullscreen.la +lib/eog/plugins/libfullscreen.so +lib/eog/plugins/libreload.la +lib/eog/plugins/libreload.so +lib/eog/plugins/libstatusbar-date.la +lib/eog/plugins/libstatusbar-date.so +lib/eog/plugins/reload.eog-plugin +lib/eog/plugins/statusbar-date.eog-plugin libdata/pkgconfig/eog.pc share/applications/eog.desktop +%%DOCSDIR%%/EogApplication.html +%%DOCSDIR%%/EogDialog.html +%%DOCSDIR%%/EogExifDetails.html +%%DOCSDIR%%/EogFileChooser.html +%%DOCSDIR%%/EogImage.html +%%DOCSDIR%%/EogImageSaveInfo.html +%%DOCSDIR%%/EogJobSaveAs.html +%%DOCSDIR%%/EogListStore.html +%%DOCSDIR%%/EogMessageArea.html +%%DOCSDIR%%/EogMetadataReaderJpg.html +%%DOCSDIR%%/EogMetadataReaderPng.html +%%DOCSDIR%%/EogPixbufCellRenderer.html +%%DOCSDIR%%/EogPlugin.html +%%DOCSDIR%%/EogPluginManager.html +%%DOCSDIR%%/EogPreferencesDialog.html +%%DOCSDIR%%/EogPrintImageSetup.html +%%DOCSDIR%%/EogPrintPreview.html +%%DOCSDIR%%/EogPropertiesDialog.html +%%DOCSDIR%%/EogScrollView.html +%%DOCSDIR%%/EogSidebar.html +%%DOCSDIR%%/EogStatusbar.html +%%DOCSDIR%%/EogThumbNav.html +%%DOCSDIR%%/EogThumbView.html +%%DOCSDIR%%/EogTransform.html +%%DOCSDIR%%/EogURIConverter.html +%%DOCSDIR%%/EogWindow.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/ch03.html +%%DOCSDIR%%/ch04.html +%%DOCSDIR%%/ch05.html +%%DOCSDIR%%/ch06.html +%%DOCSDIR%%/ch07.html +%%DOCSDIR%%/eog-eog-config-keys.html +%%DOCSDIR%%/eog-eog-debug.html +%%DOCSDIR%%/eog-eog-error-message-area.html +%%DOCSDIR%%/eog-eog-exif-util.html +%%DOCSDIR%%/eog-eog-job-queue.html +%%DOCSDIR%%/eog-eog-metadata-reader.html +%%DOCSDIR%%/eog-eog-pixbuf-util.html +%%DOCSDIR%%/eog-eog-plugin-engine.html +%%DOCSDIR%%/eog-eog-print.html +%%DOCSDIR%%/eog-eog-save-as-dialog-helper.html +%%DOCSDIR%%/eog-eog-session.html +%%DOCSDIR%%/eog-eog-thumbnail.html +%%DOCSDIR%%/eog-eog-util.html +%%DOCSDIR%%/eog-uta.html +%%DOCSDIR%%/eog-zoom.html +%%DOCSDIR%%/eog.devhelp +%%DOCSDIR%%/eog.devhelp2 +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png %%DATADIR%%/eog-image-properties-dialog.glade %%DATADIR%%/eog-multiple-save-as-dialog.glade %%DATADIR%%/eog-preferences-dialog.glade @@ -30,19 +98,33 @@ share/applications/eog.desktop %%DATADIR%%/gtkrc %%DATADIR%%/icons/hicolor/16x16/actions/eog-image-collection.png %%DATADIR%%/icons/hicolor/16x16/actions/eog-plugin.png +%%DATADIR%%/icons/hicolor/16x16/actions/slideshow-play.png %%DATADIR%%/icons/hicolor/22x22/actions/eog-image-collection.png %%DATADIR%%/icons/hicolor/22x22/actions/eog-plugin.png +%%DATADIR%%/icons/hicolor/22x22/actions/slideshow-play.png %%DATADIR%%/icons/hicolor/24x24/actions/eog-image-collection.png +%%DATADIR%%/icons/hicolor/24x24/actions/slideshow-play.png %%DATADIR%%/icons/hicolor/32x32/actions/eog-image-collection.png %%DATADIR%%/icons/hicolor/32x32/actions/eog-plugin.png +%%DATADIR%%/icons/hicolor/32x32/actions/slideshow-play.png +%%DATADIR%%/icons/hicolor/48x48/actions/slideshow-play.png %%DATADIR%%/icons/hicolor/scalable/actions/eog-image-collection.svg %%DATADIR%%/icons/hicolor/scalable/actions/eog-plugin.svg +%%DATADIR%%/icons/hicolor/scalable/actions/slideshow-play.svg %%DATADIR%%/pixmaps/thumbnail-frame.png share/gnome/help/eog/C/eog.xml share/gnome/help/eog/C/figures/eog_save_as_window.png share/gnome/help/eog/C/figures/eog_start_window.png share/gnome/help/eog/C/figures/eog_toolbar_editor_window.png share/gnome/help/eog/C/legal.xml +share/gnome/help/eog/ar/eog.xml +share/gnome/help/eog/ar/figures/eog_save_as_window.png +share/gnome/help/eog/ar/figures/eog_start_window.png +share/gnome/help/eog/ar/figures/eog_toolbar_editor_window.png +share/gnome/help/eog/ca/eog.xml +share/gnome/help/eog/ca/figures/eog_save_as_window.png +share/gnome/help/eog/ca/figures/eog_start_window.png +share/gnome/help/eog/ca/figures/eog_toolbar_editor_window.png share/gnome/help/eog/da/eog.xml share/gnome/help/eog/da/figures/eog_save_as_window.png share/gnome/help/eog/da/figures/eog_start_window.png @@ -99,6 +181,10 @@ share/gnome/help/eog/sv/eog.xml share/gnome/help/eog/sv/figures/eog_save_as_window.png share/gnome/help/eog/sv/figures/eog_start_window.png share/gnome/help/eog/sv/figures/eog_toolbar_editor_window.png +share/gnome/help/eog/th/eog.xml +share/gnome/help/eog/th/figures/eog_save_as_window.png +share/gnome/help/eog/th/figures/eog_start_window.png +share/gnome/help/eog/th/figures/eog_toolbar_editor_window.png share/gnome/help/eog/uk/eog.xml share/gnome/help/eog/uk/figures/eog_save_as_window.png share/gnome/help/eog/uk/figures/eog_start_window.png @@ -142,6 +228,7 @@ share/locale/eu/LC_MESSAGES/eog.mo share/locale/fa/LC_MESSAGES/eog.mo share/locale/fi/LC_MESSAGES/eog.mo share/locale/fr/LC_MESSAGES/eog.mo +share/locale/fur/LC_MESSAGES/eog.mo share/locale/ga/LC_MESSAGES/eog.mo share/locale/gl/LC_MESSAGES/eog.mo share/locale/gu/LC_MESSAGES/eog.mo @@ -156,6 +243,7 @@ share/locale/ja/LC_MESSAGES/eog.mo share/locale/ka/LC_MESSAGES/eog.mo share/locale/kn/LC_MESSAGES/eog.mo share/locale/ko/LC_MESSAGES/eog.mo +share/locale/ks/LC_MESSAGES/eog.mo share/locale/ku/LC_MESSAGES/eog.mo share/locale/lt/LC_MESSAGES/eog.mo share/locale/lv/LC_MESSAGES/eog.mo @@ -174,6 +262,7 @@ share/locale/oc/LC_MESSAGES/eog.mo share/locale/or/LC_MESSAGES/eog.mo share/locale/pa/LC_MESSAGES/eog.mo share/locale/pl/LC_MESSAGES/eog.mo +share/locale/ps/LC_MESSAGES/eog.mo share/locale/pt/LC_MESSAGES/eog.mo share/locale/pt_BR/LC_MESSAGES/eog.mo share/locale/ro/LC_MESSAGES/eog.mo @@ -184,7 +273,7 @@ share/locale/sk/LC_MESSAGES/eog.mo share/locale/sl/LC_MESSAGES/eog.mo share/locale/sq/LC_MESSAGES/eog.mo share/locale/sr/LC_MESSAGES/eog.mo -share/locale/sr@Latn/LC_MESSAGES/eog.mo +share/locale/sr@latin/LC_MESSAGES/eog.mo share/locale/sv/LC_MESSAGES/eog.mo share/locale/ta/LC_MESSAGES/eog.mo share/locale/te/LC_MESSAGES/eog.mo @@ -201,6 +290,8 @@ share/locale/zh_HK/LC_MESSAGES/eog.mo share/locale/zh_TW/LC_MESSAGES/eog.mo share/locale/zu/LC_MESSAGES/eog.mo share/omf/eog/eog-C.omf +share/omf/eog/eog-ar.omf +share/omf/eog/eog-ca.omf share/omf/eog/eog-da.omf share/omf/eog/eog-de.omf share/omf/eog/eog-en_GB.omf @@ -215,6 +306,7 @@ share/omf/eog/eog-pa.omf share/omf/eog/eog-pt_BR.omf share/omf/eog/eog-ru.omf share/omf/eog/eog-sv.omf +share/omf/eog/eog-th.omf share/omf/eog/eog-uk.omf share/omf/eog/eog-zh_CN.omf share/omf/eog/eog-zh_TW.omf @@ -225,6 +317,8 @@ share/omf/eog/eog-zh_TW.omf @dirrm share/gnome/help/eog/zh_CN @dirrm share/gnome/help/eog/uk/figures @dirrm share/gnome/help/eog/uk +@dirrm share/gnome/help/eog/th/figures +@dirrm share/gnome/help/eog/th @dirrm share/gnome/help/eog/sv/figures @dirrm share/gnome/help/eog/sv @dirrm share/gnome/help/eog/ru/figures @@ -253,12 +347,18 @@ share/omf/eog/eog-zh_TW.omf @dirrm share/gnome/help/eog/de @dirrm share/gnome/help/eog/da/figures @dirrm share/gnome/help/eog/da +@dirrm share/gnome/help/eog/ca/figures +@dirrm share/gnome/help/eog/ca +@dirrm share/gnome/help/eog/ar/figures +@dirrm share/gnome/help/eog/ar @dirrm share/gnome/help/eog/C/figures @dirrm share/gnome/help/eog/C @dirrm share/gnome/help/eog @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/icons/hicolor/scalable/actions @dirrm %%DATADIR%%/icons/hicolor/scalable +@dirrm %%DATADIR%%/icons/hicolor/48x48/actions +@dirrm %%DATADIR%%/icons/hicolor/48x48 @dirrm %%DATADIR%%/icons/hicolor/32x32/actions @dirrm %%DATADIR%%/icons/hicolor/32x32 @dirrm %%DATADIR%%/icons/hicolor/24x24/actions @@ -270,7 +370,10 @@ share/omf/eog/eog-zh_TW.omf @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrm %%DOCSDIR%% @dirrmtry share/applications +@dirrm lib/eog/plugins +@dirrm lib/eog @dirrm include/eog-2.20/eog @dirrm include/eog-2.20 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @@ -285,10 +388,14 @@ share/omf/eog/eog-zh_TW.omf @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @@ -299,6 +406,10 @@ share/omf/eog/eog-zh_TW.omf @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ks/LC_MESSAGES +@dirrmtry share/locale/ks +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index f760bdf6d41c..bdcd74b0205d 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/evince/Makefile,v 1.5 2008/06/17 03:47:54 mezz Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.114 2008/11/25 16:19:07 marcus Exp $ # PORTNAME= evince -PORTVERSION= 2.22.2 -PORTREVISION= 3 +PORTVERSION= 2.24.2 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,7 +25,7 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes USE_GMAKE= yes INSTALLS_OMF= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui desktopfileutils \ +USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \ gnomedocutils ltasneededhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index efb9e420a9af..caeb882f6080 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evince-2.22.2.tar.bz2) = 3661f901ab40cee44d5350a045a8bdb1 -SHA256 (gnome2/evince-2.22.2.tar.bz2) = 4dcbdbd253b1978dcd70452780d7804ade912f4ede90f122f30d5322f53c5c3e -SIZE (gnome2/evince-2.22.2.tar.bz2) = 1629323 +MD5 (gnome2/evince-2.24.2.tar.bz2) = f0f9e06a93516b238ee24ac38d68b57c +SHA256 (gnome2/evince-2.24.2.tar.bz2) = aa6f29c93413e206b0e30fc241b4e5aa8d67c94baff50b9b92147543516e6bce +SIZE (gnome2/evince-2.24.2.tar.bz2) = 1717166 diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index 6f1c5f0723c2..38808c3f49b2 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -20,6 +20,7 @@ include/evince-2.20/evince/ev-image.h include/evince-2.20/evince/ev-link-action.h include/evince-2.20/evince/ev-link-dest.h include/evince-2.20/evince/ev-link.h +include/evince-2.20/evince/ev-page.h include/evince-2.20/evince/ev-render-context.h include/evince-2.20/evince/ev-selection.h include/evince-2.20/evince/ev-transition-effect.h @@ -60,7 +61,6 @@ lib/libevbackend.so lib/libevbackend.so.0 share/applications/evince.desktop %%DOCSDIR%%/EvAttachment.html -%%DOCSDIR%%/EvJobPrint.html %%DOCSDIR%%/EvNavigationAction.html %%DOCSDIR%%/EvNavigationActionWidget.html %%DOCSDIR%%/EvPageAction.html @@ -68,6 +68,7 @@ share/applications/evince.desktop %%DOCSDIR%%/EvWindow.html %%DOCSDIR%%/evince-EvHistory.html %%DOCSDIR%%/evince-EvImage.html +%%DOCSDIR%%/evince-EvJobFind.html %%DOCSDIR%%/evince-EvPasswordDialog.html %%DOCSDIR%%/evince-EvPasswordView.html %%DOCSDIR%%/evince-EvRenderContext.html @@ -90,7 +91,6 @@ share/applications/evince.desktop %%DOCSDIR%%/evince-ev-document.html %%DOCSDIR%%/evince-ev-file-exporter.html %%DOCSDIR%%/evince-ev-file-helpers.html -%%DOCSDIR%%/evince-ev-job-queue.html %%DOCSDIR%%/evince-ev-link-action.html %%DOCSDIR%%/evince-ev-link-dest.html %%DOCSDIR%%/evince-ev-link.html @@ -151,6 +151,8 @@ share/gnome/help/evince/bg/evince.xml share/gnome/help/evince/bg/figures/evince_start_window.png share/gnome/help/evince/ca/evince.xml share/gnome/help/evince/ca/figures/evince_start_window.png +share/gnome/help/evince/de/evince.xml +share/gnome/help/evince/de/figures/evince_start_window.png share/gnome/help/evince/el/evince.xml share/gnome/help/evince/el/figures/evince_start_window.png share/gnome/help/evince/en_GB/evince.xml @@ -179,6 +181,8 @@ share/gnome/help/evince/sv/evince.xml share/gnome/help/evince/sv/figures/evince_start_window.png share/gnome/help/evince/uk/evince.xml share/gnome/help/evince/uk/figures/evince_start_window.png +share/gnome/help/evince/vi/evince.xml +share/gnome/help/evince/vi/figures/evince_start_window.png share/gnome/help/evince/zh_CN/evince.xml share/gnome/help/evince/zh_CN/figures/evince_start_window.png share/icons/hicolor/16x16/apps/evince.png @@ -221,6 +225,7 @@ share/locale/ja/LC_MESSAGES/evince.mo share/locale/ka/LC_MESSAGES/evince.mo share/locale/kn/LC_MESSAGES/evince.mo share/locale/ko/LC_MESSAGES/evince.mo +share/locale/ks/LC_MESSAGES/evince.mo share/locale/ku/LC_MESSAGES/evince.mo share/locale/lt/LC_MESSAGES/evince.mo share/locale/lv/LC_MESSAGES/evince.mo @@ -236,6 +241,7 @@ share/locale/oc/LC_MESSAGES/evince.mo share/locale/or/LC_MESSAGES/evince.mo share/locale/pa/LC_MESSAGES/evince.mo share/locale/pl/LC_MESSAGES/evince.mo +share/locale/ps/LC_MESSAGES/evince.mo share/locale/pt/LC_MESSAGES/evince.mo share/locale/pt_BR/LC_MESSAGES/evince.mo share/locale/ro/LC_MESSAGES/evince.mo @@ -246,7 +252,7 @@ share/locale/sk/LC_MESSAGES/evince.mo share/locale/sl/LC_MESSAGES/evince.mo share/locale/sq/LC_MESSAGES/evince.mo share/locale/sr/LC_MESSAGES/evince.mo -share/locale/sr@Latn/LC_MESSAGES/evince.mo +share/locale/sr@latin/LC_MESSAGES/evince.mo share/locale/sv/LC_MESSAGES/evince.mo share/locale/ta/LC_MESSAGES/evince.mo share/locale/te/LC_MESSAGES/evince.mo @@ -261,6 +267,7 @@ share/locale/zh_TW/LC_MESSAGES/evince.mo share/omf/evince/evince-C.omf share/omf/evince/evince-bg.omf share/omf/evince/evince-ca.omf +share/omf/evince/evince-de.omf share/omf/evince/evince-el.omf share/omf/evince/evince-en_GB.omf share/omf/evince/evince-es.omf @@ -275,10 +282,13 @@ share/omf/evince/evince-ru.omf share/omf/evince/evince-sr.omf share/omf/evince/evince-sv.omf share/omf/evince/evince-uk.omf +share/omf/evince/evince-vi.omf share/omf/evince/evince-zh_CN.omf @dirrm share/omf/evince @dirrm share/gnome/help/evince/zh_CN/figures @dirrm share/gnome/help/evince/zh_CN +@dirrm share/gnome/help/evince/vi/figures +@dirrm share/gnome/help/evince/vi @dirrm share/gnome/help/evince/uk/figures @dirrm share/gnome/help/evince/uk @dirrm share/gnome/help/evince/sv/figures @@ -307,6 +317,8 @@ share/omf/evince/evince-zh_CN.omf @dirrm share/gnome/help/evince/en_GB @dirrm share/gnome/help/evince/el/figures @dirrm share/gnome/help/evince/el +@dirrm share/gnome/help/evince/de/figures +@dirrm share/gnome/help/evince/de @dirrm share/gnome/help/evince/ca/figures @dirrm share/gnome/help/evince/ca @dirrm share/gnome/help/evince/bg/figures @@ -339,10 +351,14 @@ share/omf/evince/evince-zh_CN.omf @dirrmtry share/locale/zh_HK @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -351,6 +367,8 @@ share/omf/evince/evince-zh_CN.omf @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ks/LC_MESSAGES +@dirrmtry share/locale/ks @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index a181ab614ee4..a886eae50499 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,12 +3,12 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# $MCom: ports-stable/graphics/gimp-app/Makefile,v 1.4 2008/06/17 03:24:09 mezz Exp $ +# $MCom: ports/graphics/gimp-app/Makefile,v 1.30 2009/01/04 22:16:26 marcus Exp $ # PORTNAME= gimp-app DISTVERSION= 2.6.4 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -45,7 +45,7 @@ USE_XORG= xpm xmu xext USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack \ - desktopfileutils + desktopfileutils librsvg2 USE_LDCONFIG= yes INSTALLS_ICONS= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore @@ -56,7 +56,7 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \ --with-desktop-dir=${PREFIX}/share \ --docdir=${PREFIX}/share/doc/gimp \ --enable-default-binary \ - --without-gvfs + --without-gnomevfs CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GIMP_THREAD_LIBS=${PTHREAD_LIBS} @@ -66,10 +66,9 @@ WANT_GNOME= yes OPTIONS?= DEBUG "debugging" off \ DBUS "D-BUS support" on \ - GNOMEVFS "Use GNOME VFS for the URI plug-in" on \ + GVFS "Use GVFS for the URI plug-in" on \ HELPBROWSER "internal help browser" on \ - MP "multiple processor support" off \ - RSVG "SVG format support" on + MP "multiple processor support" off .endif .include <bsd.port.pre.mk> @@ -91,14 +90,6 @@ MLINKS= gimp-2.6.1 gimp.1 \ gimp-console-2.6.1 gimp-console.1 \ gimprc-2.6.5 gimprc.5 -.if defined(WITHOUT_RSVG) -CONFIGURE_ARGS+= --without-librsvg -PLIST_SUB+= SVG="@comment " -.else -USE_GNOME+= librsvg2 -PLIST_SUB+= SVG="" -.endif - .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif @@ -117,7 +108,7 @@ PLIST_SUB+= GNOME="@comment " .endif .if defined(WITH_HELPBROWSER) -LIB_DEPENDS+= WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2 CONFIGURE_ARGS+= --with-webkit PLIST_SUB+= HELPBROWSER="" .else @@ -132,9 +123,9 @@ CONFIGURE_ARGS+= --with-dbus CONFIGURE_ARGS+= --without-dbus .endif -.if defined(WITH_GNOMEVFS) || ${HAVE_GNOME:Mgnomevfs2}!="" +.if defined(WITH_GVFS) || ${HAVE_GNOME:Mgvfs}!="" LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring -USE_GNOME+= gnomevfs2 +USE_GNOME+= gvfs . if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui . endif diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist index 4d7f111ef351..ca271443a601 100644 --- a/graphics/gimp-app/pkg-plist +++ b/graphics/gimp-app/pkg-plist @@ -2026,26 +2026,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo share/locale/zh_TW/LC_MESSAGES/gimp20-tips.mo share/locale/zh_TW/LC_MESSAGES/gimp20.mo -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/yi/LC_MESSAGES -@dirrmtry share/locale/yi -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/tt/LC_MESSAGES -@dirrmtry share/locale/tt -@dirrmtry share/locale/sr@latin/LC_MESSAGES -@dirrmtry share/locale/sr@latin -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/km/LC_MESSAGES -@dirrmtry share/locale/km -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/ca@valencia/LC_MESSAGES -@dirrmtry share/locale/ca@valencia @dirrm share/gimp/tips @dirrm share/gimp/themes/Small @dirrm share/gimp/themes/Default/images/preferences @@ -2098,3 +2078,23 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo @dirrm etc/gimp @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/ca@valencia/LC_MESSAGES +@dirrmtry share/locale/ca@valencia diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile index 2cc126568e89..9408c1b34060 100644 --- a/graphics/goocanvasmm/Makefile +++ b/graphics/goocanvasmm/Makefile @@ -3,11 +3,10 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/graphics/goocanvasmm/Makefile,v 1.2 2009/01/09 11:30:01 kwm Exp $ PORTNAME= goocanvasmm -PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTVERSION= 0.13.0 CATEGORIES= graphics MASTER_SITES= GNOME diff --git a/graphics/goocanvasmm/distinfo b/graphics/goocanvasmm/distinfo index 76702ab61f8b..7082387227e6 100644 --- a/graphics/goocanvasmm/distinfo +++ b/graphics/goocanvasmm/distinfo @@ -1,3 +1,3 @@ -MD5 (goocanvasmm-0.9.0.tar.bz2) = 202953757c7e86463ac1480475aa53e0 -SHA256 (goocanvasmm-0.9.0.tar.bz2) = 0612d4dfe18c5b510ca13949a6247cd8ebdf5f5169bde2c303fa848bebbcebc9 -SIZE (goocanvasmm-0.9.0.tar.bz2) = 361431 +MD5 (goocanvasmm-0.13.0.tar.bz2) = c25c567f95af4619b0af0124251b3c39 +SHA256 (goocanvasmm-0.13.0.tar.bz2) = b30837a486e8e38f980e257a69d66d9a6fbb381d7e8499774765e7cf11f27565 +SIZE (goocanvasmm-0.13.0.tar.bz2) = 367570 diff --git a/graphics/goocanvasmm/pkg-plist b/graphics/goocanvasmm/pkg-plist index efa56d5fe850..da5d987ffb67 100644 --- a/graphics/goocanvasmm/pkg-plist +++ b/graphics/goocanvasmm/pkg-plist @@ -4,6 +4,8 @@ include/goocanvasmm-0.1/goocanvasmm/canvas.h include/goocanvasmm-0.1/goocanvasmm/ellipse.h include/goocanvasmm-0.1/goocanvasmm/ellipsemodel.h include/goocanvasmm-0.1/goocanvasmm/enums.h +include/goocanvasmm-0.1/goocanvasmm/grid.h +include/goocanvasmm-0.1/goocanvasmm/gridmodel.h include/goocanvasmm-0.1/goocanvasmm/group.h include/goocanvasmm-0.1/goocanvasmm/groupmodel.h include/goocanvasmm-0.1/goocanvasmm/image.h @@ -24,6 +26,8 @@ include/goocanvasmm-0.1/goocanvasmm/private/canvas_p.h include/goocanvasmm-0.1/goocanvasmm/private/ellipse_p.h include/goocanvasmm-0.1/goocanvasmm/private/ellipsemodel_p.h include/goocanvasmm-0.1/goocanvasmm/private/enums_p.h +include/goocanvasmm-0.1/goocanvasmm/private/grid_p.h +include/goocanvasmm-0.1/goocanvasmm/private/gridmodel_p.h include/goocanvasmm-0.1/goocanvasmm/private/group_p.h include/goocanvasmm-0.1/goocanvasmm/private/groupmodel_p.h include/goocanvasmm-0.1/goocanvasmm/private/image_p.h @@ -62,7 +66,7 @@ lib/goocanvasmm-0.1/proc/m4/convert_libgoocanvasmm.m4 lib/libgoocanvasmm-0.1.a lib/libgoocanvasmm-0.1.la lib/libgoocanvasmm-0.1.so -lib/libgoocanvasmm-0.1.so.2 +lib/libgoocanvasmm-0.1.so.4 libdata/pkgconfig/goocanvasmm-1.0.pc @dirrm lib/goocanvasmm-0.1/proc/m4 @dirrm lib/goocanvasmm-0.1/proc diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index c4a568e268a6..567089e2cd15 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.70 2007/10/20 18:32:13 mezz Exp $ +# $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.72 2008/08/23 18:22:59 mezz Exp $ # PORTNAME= libgnomecanvas @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 -USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack gail +USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index d361d7b1e24f..08da5ae8b8f8 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.18 2008/03/08 16:48:36 marcus Exp $ +# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.20 2008/08/05 18:12:26 marcus Exp $ # PORTNAME= libgnomecanvasmm -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.23.1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/graphics/libgnomecanvasmm26/distinfo b/graphics/libgnomecanvasmm26/distinfo index e1f92bfc1553..5a6e8df1b5bb 100644 --- a/graphics/libgnomecanvasmm26/distinfo +++ b/graphics/libgnomecanvasmm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomecanvasmm-2.22.0.tar.bz2) = d5b08af567fe1df9752fbdae980bf23c -SHA256 (gnome2/libgnomecanvasmm-2.22.0.tar.bz2) = 45fa2424d2fc9340bfb071801de1f3b30f6f093b8bd9254e3a59d3ce0ba635f8 -SIZE (gnome2/libgnomecanvasmm-2.22.0.tar.bz2) = 319048 +MD5 (gnome2/libgnomecanvasmm-2.23.1.tar.bz2) = 9990eb5560db197e16be3497873fe1d9 +SHA256 (gnome2/libgnomecanvasmm-2.23.1.tar.bz2) = a9983c587cf92671c49f089a588e9e8e902ff5e735e596f4e72e99fb975aff5e +SIZE (gnome2/libgnomecanvasmm-2.23.1.tar.bz2) = 325751 diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 9e568495cb76..9ed1eafd79af 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-cairo/Makefile,v 1.22 2007/03/14 21:38:08 ahze Exp $ +# $MCom: ports/graphics/py-cairo/Makefile,v 1.26 2009/01/02 20:13:31 mezz Exp $ # PORTNAME= cairo -PORTVERSION= 1.6.4 +PORTVERSION= 1.8.0 PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= http://cairographics.org/releases/ @@ -23,7 +23,6 @@ USE_PYTHON= yes USE_GMAKE= yes USE_GNOME= gnometarget gnomehack GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-pygtk CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo index 3eb44707ecd7..86c26004f9d3 100644 --- a/graphics/py-cairo/distinfo +++ b/graphics/py-cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (pycairo-1.6.4.tar.gz) = 2c3aa21e6e610321498f9f81f7b625df -SHA256 (pycairo-1.6.4.tar.gz) = 2149ad0f8236c477de8df87a79d3ea2c76e7c79c82d71cf40229597a8516f34f -SIZE (pycairo-1.6.4.tar.gz) = 491984 +MD5 (pycairo-1.8.0.tar.gz) = 847f5377c32228a656819f5bd18eb6b4 +SHA256 (pycairo-1.8.0.tar.gz) = a2272dafceb25ed9fedd0b10429dfec9c412b3b36eb6137f79c87e7d004036d4 +SIZE (pycairo-1.8.0.tar.gz) = 517701 diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile index a66dba605f42..c960711ad177 100644 --- a/graphics/py-goocanvas/Makefile +++ b/graphics/py-goocanvas/Makefile @@ -3,14 +3,13 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-goocanvas/Makefile,v 1.4 2008/02/27 16:19:50 ahze Exp $ +# $MCom: ports/graphics/py-goocanvas/Makefile,v 1.6 2008/09/22 09:14:41 kwm Exp $ PORTNAME= goocanvas -PORTVERSION= 0.9.0 -PORTREVISION= 1 -CATEGORIES= graphics python -MASTER_SITES= BERLIOS -MASTER_SITE_SUBDIR= py${PORTNAME} +PORTVERSION= 0.12.0 +CATEGORIES= graphics +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/py${PORTNAME}/${PORTVERSION:C/..$//} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= py${PORTNAME}-${PORTVERSION} @@ -20,8 +19,10 @@ COMMENT= GooCanvas python bindings LIB_DEPENDS= goocanvas.3:${PORTSDIR}/graphics/goocanvas PLIST_FILES= %%PYTHON_SITELIBDIR%%/goocanvasmodule.la \ - %%PYTHON_SITELIBDIR%%/goocanvasmodule.so + %%PYTHON_SITELIBDIR%%/goocanvasmodule.so \ + libdata/pkgconfig/pygoocanvas.pc USE_PYTHON= yes +USE_BZIP2= yes USE_GNOME= gnomehack pygtk2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs diff --git a/graphics/py-goocanvas/distinfo b/graphics/py-goocanvas/distinfo index 63e62b0acb2a..7cc35ac3e75c 100644 --- a/graphics/py-goocanvas/distinfo +++ b/graphics/py-goocanvas/distinfo @@ -1,3 +1,3 @@ -MD5 (pygoocanvas-0.9.0.tar.gz) = 1988b7572d553d954ffd159e7e61cb17 -SHA256 (pygoocanvas-0.9.0.tar.gz) = 3fa0944b57253b9981a1ea1baa92fc03a0d746a49d779b9c5f51080959c7e011 -SIZE (pygoocanvas-0.9.0.tar.gz) = 430723 +MD5 (pygoocanvas-0.12.0.tar.bz2) = ced70070c6abc64866857c24f9b4e71e +SHA256 (pygoocanvas-0.12.0.tar.bz2) = 998f01e56bc3372b073da820436a1f2d2873a2f32f1164b85e2752244650546e +SIZE (pygoocanvas-0.12.0.tar.bz2) = 336149 diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile index 57ae8452c306..5f02c6c149d7 100644 --- a/graphics/ruby-cairo/Makefile +++ b/graphics/ruby-cairo/Makefile @@ -3,11 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/ruby-cairo/Makefile,v 1.1 2008/06/17 16:11:09 mezz Exp $ +# $MCom: ports/graphics/ruby-cairo/Makefile,v 1.9 2008/10/19 23:20:49 mezz Exp $ # PORTNAME= cairo -PORTVERSION= 1.6.3 +PORTVERSION= 1.8.0 CATEGORIES= graphics ruby MASTER_SITES= http://cairographics.org/releases/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/graphics/ruby-cairo/distinfo b/graphics/ruby-cairo/distinfo index c33ad8f0836c..088de5e1997d 100644 --- a/graphics/ruby-cairo/distinfo +++ b/graphics/ruby-cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (rcairo-1.6.3.tar.gz) = d7f798ab145f417e734d9d47f5adeb7e -SHA256 (rcairo-1.6.3.tar.gz) = c4b7f82b7b0e6109b3b906ae1d8ac82b2b183b2ed25369d374e2fa4b1242a8f8 -SIZE (rcairo-1.6.3.tar.gz) = 222796 +MD5 (rcairo-1.8.0.tar.gz) = 7ea9f0b174d379c6a0374f534c2a4e85 +SHA256 (rcairo-1.8.0.tar.gz) = 0bd588d45c3700615abb3a82df3f5e53d42eb0bfbafbad72170889d25575ce3c +SIZE (rcairo-1.8.0.tar.gz) = 278009 diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile index 6afb5bc2f191..a8cf987e80bd 100644 --- a/graphics/swfdec/Makefile +++ b/graphics/swfdec/Makefile @@ -4,12 +4,12 @@ # Whom: ijliao # # $FreeBSD$ -# +# $MCom: ports/graphics/swfdec/Makefile,v 1.28 2009/01/01 13:38:17 kwm Exp $ PORTNAME= swfdec -PORTVERSION= 0.6.8 +PORTVERSION= 0.8.4 CATEGORIES= graphics -MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.6/ +MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.8/ MAINTAINER= kwm@FreeBSD.org COMMENT= Flash Rendering Library @@ -17,33 +17,32 @@ COMMENT= Flash Rendering Library LIB_DEPENDS= oil-0.3.0:${PORTSDIR}/devel/liboil \ soup-2.4.1:${PORTSDIR}/devel/libsoup -USE_GNOME= gnomehack gtk20 -USE_AUTOTOOLS= libtool:15:env automake:19:env autoconf:262 -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-audio=oss USE_LDCONFIG= yes -INSTALLS_ICONS= yes - -CPPFLAGS= -I${LOCALBASE}/include - -OPTIONS= GSTREAMER "Support for decoding some codecs with GStreamer" off +USE_GNOME= gnomehack gtk20 ltverhack +USE_GSTREAMER= core good mp3 ffmpeg +USE_AUTOTOOLS= libtool:15 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib" PLIST_SUB= VERSION=${PORTVERSION:R} +OPTIONS= PULSEAUDIO "Enable the PulseAudio sound module" off + .include <bsd.port.pre.mk> -.if defined(WITH_GSTREAMER) -USE_GSTREAMER= yes +.if defined(WITH_PULSEAUDIO) +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +CONFIGURE_ARGS+= --with-audio=pulse .else -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ - mad.2:${PORTSDIR}/audio/libmad -CONFIGURE_ARGS+= --disable-gstreamer --enable-ffmpeg --enable-mad -CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg +CONFIGURE_ARGS+= --with-audio=oss .endif +post-extract: + @${CP} ${FILESDIR}/swfdec_playback_oss.c \ + ${WRKSRC}/swfdec-gtk + post-patch: - @${REINPLACE_CMD} -e 's|SWFDEC_LIBVERSION="0:0:0"|SWFDEC_LIBVERSION="1:0:0"|' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/graphics/swfdec/distinfo b/graphics/swfdec/distinfo index b072e8cdbd6a..9f92abedda34 100644 --- a/graphics/swfdec/distinfo +++ b/graphics/swfdec/distinfo @@ -1,3 +1,3 @@ -MD5 (swfdec-0.6.8.tar.gz) = 740caf52068556ffe151703342fb634b -SHA256 (swfdec-0.6.8.tar.gz) = dcbea3030b6fd3939256fbee4b8d5cf093399ff8597701abb92cb75e74d573fd -SIZE (swfdec-0.6.8.tar.gz) = 8775082 +MD5 (swfdec-0.8.4.tar.gz) = aece501d0e73f3e564200a44ec03c385 +SHA256 (swfdec-0.8.4.tar.gz) = 7a0fc63f25a6c85588fc094dd3433fbb43634d81a70164b3390fb8ef40cbd802 +SIZE (swfdec-0.8.4.tar.gz) = 9958443 diff --git a/graphics/swfdec/files/patch-configure b/graphics/swfdec/files/patch-configure new file mode 100644 index 000000000000..4f14187ab545 --- /dev/null +++ b/graphics/swfdec/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig 2008-08-14 12:43:55.000000000 -0400 ++++ configure 2008-08-14 12:45:51.000000000 -0400 +@@ -1563,7 +1563,7 @@ Optional Packages: + both] + --with-tags[=TAGS] include additional configurations [automatic] + --with-pkg-config-path colon-separated list of pkg-config(1) dirs +- --with-audio=[auto/pulse/none] ++ --with-audio=[auto/pulse/oss/none] + audio backend to use + --with-html-dir=PATH path to installed docs + +@@ -22752,6 +22752,12 @@ echo "$as_me: WARNING: no alsa audio sup + fi + fi + ++if test "$with_audio" = "oss"; then ++ AUDIO_TYPE=oss ++ AUDIO_CFLAGS= ++ AUDIO_LIBS= ++fi ++ + if test "$with_audio" = "pulse"; then + + pkg_failed=no diff --git a/graphics/swfdec/files/patch-swfdec-gtk_Makefile.in b/graphics/swfdec/files/patch-swfdec-gtk_Makefile.in new file mode 100644 index 000000000000..ddd87704a1f1 --- /dev/null +++ b/graphics/swfdec/files/patch-swfdec-gtk_Makefile.in @@ -0,0 +1,10 @@ +--- swfdec-gtk/Makefile.in.orig 2008-08-14 12:41:05.000000000 -0400 ++++ swfdec-gtk/Makefile.in 2008-08-14 12:45:58.000000000 -0400 +@@ -281,6 +282,7 @@ libswfdec_@SWFDEC_MAJORMINOR@include_HEA + + EXTRA_DIST = \ + swfdec_playback_alsa.c \ ++ swfdec_playback_oss.c \ + swfdec_playback_pulse.c \ + swfdec_playback_none.c + diff --git a/graphics/swfdec/files/swfdec_playback_oss.c b/graphics/swfdec/files/swfdec_playback_oss.c new file mode 100644 index 000000000000..160f26db9669 --- /dev/null +++ b/graphics/swfdec/files/swfdec_playback_oss.c @@ -0,0 +1,265 @@ +/* Swfdec + * Copyright © 2006 Benjamin Otte <otte@gnome.org> + * Copyright © 2007 Eric Anholt <eric@anholt.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <sys/ioctl.h> +#include <sys/soundcard.h> +#include <fcntl.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> + +#include "swfdec_playback.h" + +/** @file Implements swfdec audio playback by opening /dev/dsp per stream + * and playing out through that. + * + * Allowing multiple access to /dev/dsp is not required by the OSS API spec, + * but FreeBSD's sound system lets you, which is what this file was written + * for. + */ + +/*** DEFINITIONS ***/ + +struct _SwfdecPlayback { + SwfdecPlayer * player; + GList * streams; /* all Stream objects */ + GMainContext * context; /* context we work in */ +}; + +typedef struct { + SwfdecPlayback * sound; /* reference to sound object */ + SwfdecAudio * audio; /* the audio we play back */ + int dsp_fd; + int fragsize; /* Audio fragment size */ + GSource * source; /* source for writing data */ + guint offset; /* offset into sound */ +} Stream; + +/* Size of one of our audio samples, in bytes */ +#define SAMPLESIZE 2 +#define CHANNELS 2 + +/*** STREAMS ***/ + +static gboolean +handle_stream (GIOChannel *source, GIOCondition cond, gpointer data) +{ + Stream *stream = data; + char *frag = malloc(stream->fragsize); + + if (frag == NULL) { + g_printerr ("Failed to allocate fragment of size %d\n", + stream->fragsize); + return FALSE; + } + + while (TRUE) { + int ret; + audio_buf_info spaceinfo; + + ret = ioctl(stream->dsp_fd, SNDCTL_DSP_GETOSPACE, &spaceinfo); + if (ret == -1) { + g_printerr ("Failed to get output buffer availability\n"); + free(frag); + return FALSE; + } + + if (spaceinfo.fragments == 0) + break; + + memset (frag, 0, stream->fragsize); + swfdec_audio_render (stream->audio, (gint16 *)frag, stream->offset, + stream->fragsize / SAMPLESIZE / CHANNELS); + + ret = write (stream->dsp_fd, frag, stream->fragsize); + if (ret != stream->fragsize) { + g_printerr ("Failed to write fragment\n"); + free(frag); + return FALSE; + } + + stream->offset += stream->fragsize / SAMPLESIZE / CHANNELS; + } + + free(frag); + + return TRUE; +} + +static void +swfdec_playback_stream_open (SwfdecPlayback *sound, SwfdecAudio *audio) +{ + GIOChannel *channel; + Stream *stream; + guint rate; + int dsp_fd, ret, format, channels, fragsize; + + dsp_fd = open("/dev/dsp", O_WRONLY); + if (dsp_fd == -1) { + g_printerr ("Failed to open /dev/dsp\n"); + return; + } + + format = AFMT_S16_LE; + ret = ioctl(dsp_fd, SNDCTL_DSP_SETFMT, &format); + if (ret == -1) { + g_printerr ("Failed to set sound format\n"); + close(dsp_fd); + return; + } + + channels = 2; + ret = ioctl(dsp_fd, SNDCTL_DSP_CHANNELS, &channels); + if (ret == -1) { + g_printerr ("Failed to set stereo\n"); + close(dsp_fd); + return; + } + + rate = 44100; + ret = ioctl(dsp_fd, SNDCTL_DSP_SPEED, &rate); + if (ret == -1) { + g_printerr ("Failed to set rate\n"); + close(dsp_fd); + return; + } + + ret = ioctl(dsp_fd, SNDCTL_DSP_GETBLKSIZE, &fragsize); + if (ret == -1) { + g_printerr ("Failed to get fragment size\n"); + close(dsp_fd); + return; + } + + stream = g_new0 (Stream, 1); + stream->sound = sound; + stream->audio = g_object_ref (audio); + stream->dsp_fd = dsp_fd; + stream->fragsize = fragsize; + sound->streams = g_list_prepend (sound->streams, stream); + + channel = g_io_channel_unix_new (stream->dsp_fd); + stream->source = g_io_create_watch (channel, G_IO_OUT); + g_source_set_priority (stream->source, G_PRIORITY_HIGH); + g_source_set_callback (stream->source, (GSourceFunc) handle_stream, stream, + NULL); + g_io_channel_unref (channel); + g_source_attach (stream->source, stream->sound->context); + + return; +} + +static void +swfdec_playback_stream_close (Stream *stream) +{ + close (stream->dsp_fd); + g_source_destroy (stream->source); + g_source_unref (stream->source); + stream->sound->streams = g_list_remove (stream->sound->streams, stream); + g_object_unref (stream->audio); + g_free (stream); +} + +/*** SOUND ***/ + +static void +advance_before (SwfdecPlayer *player, guint msecs, guint audio_samples, gpointer data) +{ + SwfdecPlayback *sound = data; + GList *walk; + + for (walk = sound->streams; walk; walk = walk->next) { + Stream *stream = walk->data; + if (audio_samples >= stream->offset) { + stream->offset = 0; + } else { + stream->offset -= audio_samples; + } + } +} + +static void +audio_added (SwfdecPlayer *player, SwfdecAudio *audio, SwfdecPlayback *sound) +{ + swfdec_playback_stream_open (sound, audio); +} + +static void +audio_removed (SwfdecPlayer *player, SwfdecAudio *audio, SwfdecPlayback *sound) +{ + GList *walk; + + for (walk = sound->streams; walk; walk = walk->next) { + Stream *stream = walk->data; + if (stream->audio == audio) { + swfdec_playback_stream_close (stream); + return; + } + } + g_assert_not_reached (); +} + +SwfdecPlayback * +swfdec_playback_open (SwfdecPlayer *player, GMainContext *context) +{ + SwfdecPlayback *sound; + const GList *walk; + + g_return_val_if_fail (SWFDEC_IS_PLAYER (player), NULL); + g_return_val_if_fail (context != NULL, NULL); + + sound = g_new0 (SwfdecPlayback, 1); + sound->player = player; + g_signal_connect (player, "advance", G_CALLBACK (advance_before), sound); + g_signal_connect (player, "audio-added", G_CALLBACK (audio_added), sound); + g_signal_connect (player, "audio-removed", G_CALLBACK (audio_removed), sound); + for (walk = swfdec_player_get_audio (player); walk; walk = walk->next) { + swfdec_playback_stream_open (sound, walk->data); + } + g_main_context_ref (context); + sound->context = context; + return sound; +} + +void +swfdec_playback_close (SwfdecPlayback *sound) +{ +#define REMOVE_HANDLER_FULL(obj,func,data,count) G_STMT_START {\ + if (g_signal_handlers_disconnect_by_func ((obj), \ + G_CALLBACK (func), (data)) != (count)) { \ + g_assert_not_reached (); \ + } \ +} G_STMT_END +#define REMOVE_HANDLER(obj,func,data) REMOVE_HANDLER_FULL (obj, func, data, 1) + + while (sound->streams) + swfdec_playback_stream_close (sound->streams->data); + REMOVE_HANDLER (sound->player, advance_before, sound); + REMOVE_HANDLER (sound->player, audio_added, sound); + REMOVE_HANDLER (sound->player, audio_removed, sound); + g_main_context_unref (sound->context); + g_free (sound); +} + + diff --git a/graphics/swfdec/pkg-plist b/graphics/swfdec/pkg-plist index 4bece92d530e..9ae5e8ecc4b7 100644 --- a/graphics/swfdec/pkg-plist +++ b/graphics/swfdec/pkg-plist @@ -18,30 +18,32 @@ include/swfdec-%%VERSION%%/swfdec/swfdec_audio.h include/swfdec-%%VERSION%%/swfdec/swfdec_buffer.h include/swfdec-%%VERSION%%/swfdec/swfdec_enums.h include/swfdec-%%VERSION%%/swfdec/swfdec_file_loader.h +include/swfdec-%%VERSION%%/swfdec/swfdec_gc_object.h include/swfdec-%%VERSION%%/swfdec/swfdec_keys.h include/swfdec-%%VERSION%%/swfdec/swfdec_loader.h include/swfdec-%%VERSION%%/swfdec/swfdec_player.h include/swfdec-%%VERSION%%/swfdec/swfdec_player_scripting.h include/swfdec-%%VERSION%%/swfdec/swfdec_rectangle.h +include/swfdec-%%VERSION%%/swfdec/swfdec_renderer.h include/swfdec-%%VERSION%%/swfdec/swfdec_script.h include/swfdec-%%VERSION%%/swfdec/swfdec_socket.h include/swfdec-%%VERSION%%/swfdec/swfdec_stream.h include/swfdec-%%VERSION%%/swfdec/swfdec_system.h include/swfdec-%%VERSION%%/swfdec/swfdec_url.h +include/swfdec-%%VERSION%%/swfdec/swfdec_version.h lib/libswfdec-%%VERSION%%.a lib/libswfdec-%%VERSION%%.la lib/libswfdec-%%VERSION%%.so -lib/libswfdec-%%VERSION%%.so.90 +lib/libswfdec-%%VERSION%%.so.0 lib/libswfdec-gtk-%%VERSION%%.a lib/libswfdec-gtk-%%VERSION%%.la lib/libswfdec-gtk-%%VERSION%%.so -lib/libswfdec-gtk-%%VERSION%%.so.90 +lib/libswfdec-gtk-%%VERSION%%.so.0 libdata/pkgconfig/swfdec-%%VERSION%%.pc libdata/pkgconfig/swfdec-gtk-%%VERSION%%.pc share/gtk-doc/html/swfdec/SwfdecAsArray.html share/gtk-doc/html/swfdec/SwfdecAsContext.html share/gtk-doc/html/swfdec/SwfdecAsDebugger.html -share/gtk-doc/html/swfdec/SwfdecAsFrame.html share/gtk-doc/html/swfdec/SwfdecAsFunction.html share/gtk-doc/html/swfdec/SwfdecAsObject.html share/gtk-doc/html/swfdec/SwfdecAudio.html @@ -50,6 +52,7 @@ share/gtk-doc/html/swfdec/SwfdecGtkWidget.html share/gtk-doc/html/swfdec/SwfdecLoader.html share/gtk-doc/html/swfdec/SwfdecPlayer.html share/gtk-doc/html/swfdec/SwfdecPlayerScripting.html +share/gtk-doc/html/swfdec/SwfdecRenderer.html share/gtk-doc/html/swfdec/SwfdecSocket.html share/gtk-doc/html/swfdec/SwfdecStream.html share/gtk-doc/html/swfdec/SwfdecSystem.html @@ -60,25 +63,22 @@ share/gtk-doc/html/swfdec/ch04.html share/gtk-doc/html/swfdec/home.png share/gtk-doc/html/swfdec/index.html share/gtk-doc/html/swfdec/index.sgml +share/gtk-doc/html/swfdec/ix01.html share/gtk-doc/html/swfdec/left.png share/gtk-doc/html/swfdec/right.png share/gtk-doc/html/swfdec/style.css share/gtk-doc/html/swfdec/swfdec-Enumerations-and-Types.html share/gtk-doc/html/swfdec/swfdec-Gtk-extension-objects.html share/gtk-doc/html/swfdec/swfdec-Internals.html +share/gtk-doc/html/swfdec/swfdec-SwfdecAsFrame.html share/gtk-doc/html/swfdec/swfdec-SwfdecAsValue.html share/gtk-doc/html/swfdec/swfdec-SwfdecBuffer.html share/gtk-doc/html/swfdec/swfdec-SwfdecRectangle.html share/gtk-doc/html/swfdec/swfdec-SwfdecURL.html +share/gtk-doc/html/swfdec/swfdec-Version-Information.html share/gtk-doc/html/swfdec/swfdec.devhelp share/gtk-doc/html/swfdec/swfdec.devhelp2 share/gtk-doc/html/swfdec/up.png -share/icons/hicolor/16x16/apps/swfdec.png -share/icons/hicolor/22x22/apps/swfdec.png -share/icons/hicolor/24x24/apps/swfdec.png -share/icons/hicolor/32x32/apps/swfdec.png -share/icons/hicolor/48x48/apps/swfdec.png -share/icons/hicolor/scalable/apps/swfdec.svg @dirrm share/gtk-doc/html/swfdec @dirrm include/swfdec-%%VERSION%%/swfdec-gtk @dirrm include/swfdec-%%VERSION%%/swfdec diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index 53b435a04b15..0373e09c5e73 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/irc/xchat/Makefile,v 1.1 2006/10/26 08:33:06 marcus Exp $ +# $MCom: ports/irc/xchat/Makefile,v 1.7 2008/08/06 07:59:00 kwm Exp $ # PORTNAME= xchat PORTVERSION= 2.8.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc gnome ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ diff --git a/irc/xchat/files/patch-src_fe-gtk_xtext.h b/irc/xchat/files/patch-src_fe-gtk_xtext.h new file mode 100644 index 000000000000..f4a74269aeca --- /dev/null +++ b/irc/xchat/files/patch-src_fe-gtk_xtext.h @@ -0,0 +1,10 @@ +--- src/fe-gtk/xtext.h.orig 2008-08-06 09:47:05.000000000 +0200 ++++ src/fe-gtk/xtext.h 2008-08-06 09:51:01.000000000 +0200 +@@ -270,6 +270,6 @@ void gtk_xtext_set_wordwrap (GtkXText *x + xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext); + void gtk_xtext_buffer_free (xtext_buffer *buf); + void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render); +-GtkType gtk_xtext_get_type (void); ++GType gtk_xtext_get_type (void); + + #endif diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile index 5584c42a826d..217756ca61f3 100644 --- a/japanese/libtomoe-gtk/Makefile +++ b/japanese/libtomoe-gtk/Makefile @@ -8,7 +8,7 @@ PORTNAME= libtomoe-gtk PORTVERSION= 0.6.0 #PORTREVISION= 0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=tomoe @@ -24,17 +24,17 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes -OPTIONS= GUCHARMAP "Compile with gucharmap" on +#OPTIONS= GUCHARMAP "Compile with gucharmap" on .include <bsd.port.pre.mk> -.if defined(WITHOUT_GUCHARMAP) +#.if defined(WITHOUT_GUCHARMAP) CONFIGURE_ARGS+=--with-gucharmap=no PLIST_SUB+= GUCHARMAP="@comment " -.else -LIB_DEPENDS+= gucharmap.6:${PORTSDIR}/deskutils/gucharmap -PLIST_SUB+= GUCHARMAP="" -.endif +#.else +#LIB_DEPENDS+= gucharmap.6:${PORTSDIR}/deskutils/gucharmap +#PLIST_SUB+= GUCHARMAP="" +#.endif .if exists(${LOCALBASE}/libdata/pkgconfig/pytomoe.pc) USE_PYTHON= yes diff --git a/lang/vala/Makefile b/lang/vala/Makefile index 3770331ff40f..aec22e811374 100644 --- a/lang/vala/Makefile +++ b/lang/vala/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/lang/vala/Makefile,v 1.1 2007/11/30 19:17:16 marcus Exp $ +# $MCom: ports/lang/vala/Makefile,v 1.20 2008/11/03 22:50:31 mezz Exp $ # PORTNAME= vala -PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= lang gnome MASTER_SITES= GNOME @@ -28,13 +28,13 @@ USE_LDCONFIG= yes .include <bsd.port.pre.mk> .if defined(WITH_VAPIGEN) -CONFIGURE_ARGS+= --enable-vapigen +CONFIGURE_ARGS+=--enable-vapigen BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML -MAN1+= vala-gen-introspect.1 vapigen.1 +MAN1= vala-gen-introspect.1 vapigen.1 PLIST_SUB+= VAPIGEN="" .else -CONFIGURE_ARGS+= --disable-vapigen +CONFIGURE_ARGS+=--disable-vapigen PLIST_SUB+= VAPIGEN="@comment " .endif diff --git a/lang/vala/distinfo b/lang/vala/distinfo index bf1e48c475e4..709febd399f4 100644 --- a/lang/vala/distinfo +++ b/lang/vala/distinfo @@ -1,3 +1,3 @@ -MD5 (vala-0.2.0.tar.bz2) = deeb28d6bbad4e46ebbf01c8332fe7d0 -SHA256 (vala-0.2.0.tar.bz2) = 1cfe1ccec1f58842ec7371c6a5bee0d61dab6507dedea9228bed78fdddc65e29 -SIZE (vala-0.2.0.tar.bz2) = 1226455 +MD5 (vala-0.4.0.tar.bz2) = 9aea32dc66e42895d7cbebe79b6dc6d5 +SHA256 (vala-0.4.0.tar.bz2) = 0a08ba289566e4d69b937c6bc29e43ba99b445811583b08bdef8d4b52e8a7d0c +SIZE (vala-0.4.0.tar.bz2) = 1431282 diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist index 9d23a85e53f7..2657234948c0 100644 --- a/lang/vala/pkg-plist +++ b/lang/vala/pkg-plist @@ -1,8 +1,7 @@ -bin/valac %%VAPIGEN%%bin/vala-gen-introspect +bin/valac %%VAPIGEN%%bin/vapicheck %%VAPIGEN%%bin/vapigen -%%VAPIGEN%%lib/vala/gen-introspect include/vala-1.0/ccode/valaccodeassignment.h include/vala-1.0/ccode/valaccodebinaryexpression.h include/vala-1.0/ccode/valaccodeblock.h @@ -54,6 +53,7 @@ include/vala-1.0/ccode/valaccodewhilestatement.h include/vala-1.0/ccode/valaccodewriter.h include/vala-1.0/gee/arraylist.h include/vala-1.0/gee/collection.h +include/vala-1.0/gee/collectionobject.h include/vala-1.0/gee/hashmap.h include/vala-1.0/gee/hashset.h include/vala-1.0/gee/iterable.h @@ -68,49 +68,50 @@ include/vala-1.0/gee/set.h include/vala-1.0/gobject/valaccodearraycreationexpressionbinding.h include/vala-1.0/gobject/valaccodeassignmentbinding.h include/vala-1.0/gobject/valaccodebinding.h +include/vala-1.0/gobject/valaccodeclassbinding.h include/vala-1.0/gobject/valaccodecompiler.h +include/vala-1.0/gobject/valaccodecreationmethodbinding.h +include/vala-1.0/gobject/valaccodedynamicmethodbinding.h +include/vala-1.0/gobject/valaccodedynamicpropertybinding.h +include/vala-1.0/gobject/valaccodedynamicsignalbinding.h include/vala-1.0/gobject/valaccodeelementaccessbinding.h include/vala-1.0/gobject/valaccodeexpressionbinding.h include/vala-1.0/gobject/valaccodegenerator.h -include/vala-1.0/gobject/valaccodegeneratorclass.h -include/vala-1.0/gobject/valaccodegeneratorinterface.h -include/vala-1.0/gobject/valaccodegeneratorinvocationexpression.h -include/vala-1.0/gobject/valaccodegeneratormemberaccess.h -include/vala-1.0/gobject/valaccodegeneratormethod.h include/vala-1.0/gobject/valaccodegeneratorsignal.h include/vala-1.0/gobject/valaccodegeneratorsourcefile.h include/vala-1.0/gobject/valaccodegeneratorstruct.h +include/vala-1.0/gobject/valaccodeinterfacebinding.h +include/vala-1.0/gobject/valaccodeinvocationexpressionbinding.h +include/vala-1.0/gobject/valaccodememberaccessbinding.h include/vala-1.0/gobject/valaccodemethodbinding.h +include/vala-1.0/gobject/valaccodeobjecttypesymbolbinding.h +include/vala-1.0/gobject/valaccodetypesymbolbinding.h include/vala-1.0/gobject/valaclassregisterfunction.h -include/vala-1.0/gobject/valadbusbindingprovider.h -include/vala-1.0/gobject/valadbusmethod.h -include/vala-1.0/gobject/valadbussignal.h -include/vala-1.0/gobject/valagidlwriter.h +include/vala-1.0/gobject/valagirwriter.h include/vala-1.0/gobject/valainterfaceregisterfunction.h include/vala-1.0/gobject/valatyperegisterfunction.h include/vala-1.0/vala/vala.h include/vala-1.0/vala/valaaddressofexpression.h -include/vala-1.0/vala/valaarraytype.h include/vala-1.0/vala/valaarraycreationexpression.h include/vala-1.0/vala/valaarraylengthfield.h include/vala-1.0/vala/valaarraymovemethod.h include/vala-1.0/vala/valaarrayresizemethod.h +include/vala-1.0/vala/valaarraytype.h include/vala-1.0/vala/valaassignment.h include/vala-1.0/vala/valaattribute.h include/vala-1.0/vala/valaattributeprocessor.h include/vala-1.0/vala/valabaseaccess.h include/vala-1.0/vala/valabasicblock.h include/vala-1.0/vala/valabinaryexpression.h -include/vala-1.0/vala/valabindingprovider.h include/vala-1.0/vala/valablock.h include/vala-1.0/vala/valabooleanliteral.h include/vala-1.0/vala/valabreakstatement.h include/vala-1.0/vala/valacastexpression.h include/vala-1.0/vala/valacatchclause.h +include/vala-1.0/vala/valacfgbuilder.h include/vala-1.0/vala/valacharacterliteral.h include/vala-1.0/vala/valaclass.h include/vala-1.0/vala/valaclasstype.h -include/vala-1.0/vala/valacfgbuilder.h include/vala-1.0/vala/valacodebinding.h include/vala-1.0/vala/valacodecontext.h include/vala-1.0/vala/valacodegenerator.h @@ -126,21 +127,28 @@ include/vala-1.0/vala/valadeclarationstatement.h include/vala-1.0/vala/valadelegate.h include/vala-1.0/vala/valadelegatetype.h include/vala-1.0/vala/valadeletestatement.h -include/vala-1.0/vala/valaerrorcode.h -include/vala-1.0/vala/valaerrordomain.h -include/vala-1.0/vala/valaerrortype.h include/vala-1.0/vala/valadestructor.h include/vala-1.0/vala/valadostatement.h +include/vala-1.0/vala/valadynamicmethod.h +include/vala-1.0/vala/valadynamicproperty.h +include/vala-1.0/vala/valadynamicsignal.h include/vala-1.0/vala/valaelementaccess.h include/vala-1.0/vala/valaemptystatement.h include/vala-1.0/vala/valaenum.h include/vala-1.0/vala/valaenumvalue.h +include/vala-1.0/vala/valaerrorcode.h +include/vala-1.0/vala/valaerrordomain.h +include/vala-1.0/vala/valaerrortype.h include/vala-1.0/vala/valaexpression.h include/vala-1.0/vala/valaexpressionstatement.h include/vala-1.0/vala/valafield.h +include/vala-1.0/vala/valafieldprototype.h include/vala-1.0/vala/valaforeachstatement.h include/vala-1.0/vala/valaformalparameter.h include/vala-1.0/vala/valaforstatement.h +include/vala-1.0/vala/valagenieparser.h +include/vala-1.0/vala/valageniescanner.h +include/vala-1.0/vala/valagenietokentype.h include/vala-1.0/vala/valaifstatement.h include/vala-1.0/vala/valainitializerlist.h include/vala-1.0/vala/valainstancecast.h @@ -153,21 +161,22 @@ include/vala-1.0/vala/valainvalidtype.h include/vala-1.0/vala/valainvocationexpression.h include/vala-1.0/vala/valalambdaexpression.h include/vala-1.0/vala/valaliteral.h -include/vala-1.0/vala/valalocalvariabledeclaration.h +include/vala-1.0/vala/valalocalvariable.h include/vala-1.0/vala/valalockable.h include/vala-1.0/vala/valalockstatement.h include/vala-1.0/vala/valamember.h include/vala-1.0/vala/valamemberaccess.h include/vala-1.0/vala/valamemberinitializer.h -include/vala-1.0/vala/valamemorymanager.h include/vala-1.0/vala/valamethod.h include/vala-1.0/vala/valamethodtype.h include/vala-1.0/vala/valanamedargument.h include/vala-1.0/vala/valanamespace.h -include/vala-1.0/vala/valanamespacereference.h +include/vala-1.0/vala/valanullchecker.h include/vala-1.0/vala/valanullliteral.h include/vala-1.0/vala/valanulltype.h include/vala-1.0/vala/valaobjectcreationexpression.h +include/vala-1.0/vala/valaobjecttype.h +include/vala-1.0/vala/valaobjecttypesymbol.h include/vala-1.0/vala/valaparenthesizedexpression.h include/vala-1.0/vala/valaparser.h include/vala-1.0/vala/valapointerindirection.h @@ -180,6 +189,7 @@ include/vala-1.0/vala/valareferencetransferexpression.h include/vala-1.0/vala/valareferencetype.h include/vala-1.0/vala/valareport.h include/vala-1.0/vala/valareturnstatement.h +include/vala-1.0/vala/valascanner.h include/vala-1.0/vala/valascope.h include/vala-1.0/vala/valasemanticanalyzer.h include/vala-1.0/vala/valasignal.h @@ -187,6 +197,7 @@ include/vala-1.0/vala/valasignaltype.h include/vala-1.0/vala/valasizeofexpression.h include/vala-1.0/vala/valasourcefile.h include/vala-1.0/vala/valasourcefilecycle.h +include/vala-1.0/vala/valasourcelocation.h include/vala-1.0/vala/valasourcereference.h include/vala-1.0/vala/valastatement.h include/vala-1.0/vala/valastringliteral.h @@ -197,7 +208,9 @@ include/vala-1.0/vala/valaswitchstatement.h include/vala-1.0/vala/valasymbol.h include/vala-1.0/vala/valasymbolresolver.h include/vala-1.0/vala/valathrowstatement.h +include/vala-1.0/vala/valatokentype.h include/vala-1.0/vala/valatrystatement.h +include/vala-1.0/vala/valatuple.h include/vala-1.0/vala/valatypecheck.h include/vala-1.0/vala/valatypeofexpression.h include/vala-1.0/vala/valatypeparameter.h @@ -206,14 +219,16 @@ include/vala-1.0/vala/valatypesymbol.h include/vala-1.0/vala/valaunaryexpression.h include/vala-1.0/vala/valaunresolvedsymbol.h include/vala-1.0/vala/valaunresolvedtype.h +include/vala-1.0/vala/valausingdirective.h include/vala-1.0/vala/valavaluetype.h -include/vala-1.0/vala/valavariabledeclarator.h include/vala-1.0/vala/valavoidtype.h include/vala-1.0/vala/valawhilestatement.h lib/libvala.la lib/libvala.so lib/libvala.so.0 libdata/pkgconfig/vala-1.0.pc +%%VAPIGEN%%lib/vala/gen-introspect +share/devhelp/books/vala/attributes.html share/devhelp/books/vala/classes.html share/devhelp/books/vala/default.css share/devhelp/books/vala/delegates.html @@ -222,6 +237,7 @@ share/devhelp/books/vala/exceptions.html share/devhelp/books/vala/expressions.html share/devhelp/books/vala/index.html share/devhelp/books/vala/interfaces.html +share/devhelp/books/vala/methods.html share/devhelp/books/vala/namespaces.html share/devhelp/books/vala/overview.html share/devhelp/books/vala/statements.html @@ -237,6 +253,7 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/gconf-2.0.vapi %%DATADIR%%/vapi/gdk-2.0.deps %%DATADIR%%/vapi/gdk-2.0.vapi +%%DATADIR%%/vapi/gdk-pixbuf-2.0.deps %%DATADIR%%/vapi/gdk-pixbuf-2.0.vapi %%DATADIR%%/vapi/gdk-x11-2.0.deps %%DATADIR%%/vapi/gdk-x11-2.0.vapi @@ -244,12 +261,16 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/gio-unix-2.0.deps %%DATADIR%%/vapi/gio-unix-2.0.vapi %%DATADIR%%/vapi/glib-2.0.vapi +%%DATADIR%%/vapi/gmodule-2.0.vapi +%%DATADIR%%/vapi/gnet-2.0.vapi %%DATADIR%%/vapi/gnome-desktop-2.0.deps %%DATADIR%%/vapi/gnome-desktop-2.0.vapi %%DATADIR%%/vapi/gnome-keyring-1.vapi %%DATADIR%%/vapi/gnome-vfs-2.0.vapi %%DATADIR%%/vapi/goocanvas.deps %%DATADIR%%/vapi/goocanvas.vapi +%%DATADIR%%/vapi/gsl.vapi +%%DATADIR%%/vapi/gstreamer-0.10.deps %%DATADIR%%/vapi/gstreamer-0.10.vapi %%DATADIR%%/vapi/gstreamer-audio-0.10.deps %%DATADIR%%/vapi/gstreamer-audio-0.10.vapi @@ -297,6 +318,7 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/hildon-fm-2.vapi %%DATADIR%%/vapi/json-glib-1.0.vapi %%DATADIR%%/vapi/libbonoboui-2.0.vapi +%%DATADIR%%/vapi/libepc-1.0.vapi %%DATADIR%%/vapi/libftdi.deps %%DATADIR%%/vapi/libftdi.vapi %%DATADIR%%/vapi/libglade-2.0.deps @@ -305,11 +327,15 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/libgnome-menu.vapi %%DATADIR%%/vapi/libgnomeui-2.0.deps %%DATADIR%%/vapi/libgnomeui-2.0.vapi +%%DATADIR%%/vapi/libgsf-1.deps +%%DATADIR%%/vapi/libgsf-1.vapi %%DATADIR%%/vapi/libnotify.deps %%DATADIR%%/vapi/libnotify.vapi %%DATADIR%%/vapi/liboobs-1.vapi %%DATADIR%%/vapi/libpanelapplet-2.0.deps %%DATADIR%%/vapi/libpanelapplet-2.0.vapi +%%DATADIR%%/vapi/libsexy.deps +%%DATADIR%%/vapi/libsexy.vapi %%DATADIR%%/vapi/libsoup-2.2.vapi %%DATADIR%%/vapi/libsoup-2.4.deps %%DATADIR%%/vapi/libsoup-2.4.vapi @@ -317,6 +343,7 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/libwnck-1.0.deps %%DATADIR%%/vapi/libwnck-1.0.vapi %%DATADIR%%/vapi/libxml-2.0.vapi +%%DATADIR%%/vapi/loudmouth-1.0.vapi %%DATADIR%%/vapi/pango.deps %%DATADIR%%/vapi/pango.vapi %%DATADIR%%/vapi/pangocairo.deps @@ -326,10 +353,15 @@ share/devhelp/books/vala/vala.devhelp2 %%DATADIR%%/vapi/sdl-gfx.vapi %%DATADIR%%/vapi/sdl-image.vapi %%DATADIR%%/vapi/sdl-mixer.vapi +%%DATADIR%%/vapi/sdl-net.vapi %%DATADIR%%/vapi/sdl-ttf.vapi %%DATADIR%%/vapi/sdl.vapi %%DATADIR%%/vapi/sqlite3.vapi %%DATADIR%%/vapi/taglib_c.vapi +%%DATADIR%%/vapi/tiff.vapi +%%DATADIR%%/vapi/tracker-indexer-module-1.0.vapi +%%DATADIR%%/vapi/unique-1.0.deps +%%DATADIR%%/vapi/unique-1.0.vapi %%DATADIR%%/vapi/vala-1.0.vapi %%DATADIR%%/vapi/vte.deps %%DATADIR%%/vapi/vte.vapi @@ -340,6 +372,7 @@ share/devhelp/books/vala/vala.devhelp2 @dirrmtry share/devhelp/books @dirrmtry share/devhelp %%VAPIGEN%%@dirrm lib/vala +@dirrm lib/pkgconfig @dirrm include/vala-1.0/vala @dirrm include/vala-1.0/gobject @dirrm include/vala-1.0/gee diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index 5d24f5dc10dd..e37b0b4f4d0d 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger, based off kiesel's ximian-exchange port # # $FreeBSD$ -# $MCom: ports/mail/evolution-exchange/Makefile,v 1.110 2008/03/13 03:13:38 marcus Exp $ +# $MCom: ports/mail/evolution-exchange/Makefile,v 1.129 2008/11/25 05:34:10 mezz Exp $ # PORTNAME= evolution-exchange -PORTVERSION= 2.22.3 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -25,7 +24,7 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_BDB= 41 USE_OPENLDAP= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnometarget ltasneededhack +USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ @@ -33,8 +32,8 @@ CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ --disable-compile-warnings \ --with-libdb=${LOCALBASE} -EVO_VERSION= 2.22 -VERSION= 2.22 +EVO_VERSION= 2.24 +VERSION= 2.24 PLIST_SUB= VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \ EDS_VERSION="1.2" @@ -61,9 +60,6 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" IGNORE= build fails when ${LOCALBASE}/include/mapi.h exists in system, run pkg_info -W ${LOCALBASE}/include/mapi.h to find the offending port and uninstall it, then install ${PORTNAME} and reinstall the port that installed mapi.h .endif -post-extract: - @${RM} -f ${WRKSRC}/storage/*.server - post-patch: @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \ ${WRKSRC}/configure diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo index d8bca3e29e90..00b4d272a34e 100644 --- a/mail/evolution-exchange/distinfo +++ b/mail/evolution-exchange/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-exchange-2.22.3.tar.bz2) = 40f2134314189e8c03b390be66b6a03e -SHA256 (gnome2/evolution-exchange-2.22.3.tar.bz2) = 6c00be9ba87a7c9370cb99bbab030ac220ab396888fdc17e6eb2b2b12939cf89 -SIZE (gnome2/evolution-exchange-2.22.3.tar.bz2) = 1082324 +MD5 (gnome2/evolution-exchange-2.24.2.tar.bz2) = 718b08eabd8965b18990838ffe1a1bb9 +SHA256 (gnome2/evolution-exchange-2.24.2.tar.bz2) = 7486a9878ca932d0716cf1ced15bf3dc4e332b10b16648784bbfd4c55f4d5fb1 +SIZE (gnome2/evolution-exchange-2.24.2.tar.bz2) = 939118 diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist index cf897a665f7d..141c0232c604 100644 --- a/mail/evolution-exchange/pkg-plist +++ b/mail/evolution-exchange/pkg-plist @@ -104,6 +104,7 @@ share/locale/id/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/it/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ka/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo +share/locale/kn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ku/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @@ -131,7 +132,7 @@ share/locale/sk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/sl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo +share/locale/sr@latin/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ta/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/te/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @@ -155,6 +156,8 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile index f53c8b69a59d..e7ec284cdcd8 100644 --- a/mail/evolution-sharp/Makefile +++ b/mail/evolution-sharp/Makefile @@ -7,8 +7,7 @@ # PORTNAME= evolution-sharp -PORTVERSION= 0.16.0 -PORTREVISION= 3 +PORTVERSION= 0.18.1 CATEGORIES= mail gnome MASTER_SITES= GNOME diff --git a/mail/evolution-sharp/distinfo b/mail/evolution-sharp/distinfo index 994ee95e2f22..adcb78423e4d 100644 --- a/mail/evolution-sharp/distinfo +++ b/mail/evolution-sharp/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-sharp-0.16.0.tar.bz2) = 866d3bca8a7e564035f42fc7f9096fe2 -SHA256 (evolution-sharp-0.16.0.tar.bz2) = 1d938bfa24f2fd1013841a56f845620fe879b850f1d5ffb00978a4e577d9342c -SIZE (evolution-sharp-0.16.0.tar.bz2) = 270752 +MD5 (evolution-sharp-0.18.1.tar.bz2) = 85fb9417093e54ef1da7c8248f94472e +SHA256 (evolution-sharp-0.18.1.tar.bz2) = bf0258f2d73a7bacafb94dde87b4806f4b6bf9d94a96d98fa1cea09026d215c4 +SIZE (evolution-sharp-0.18.1.tar.bz2) = 317001 diff --git a/mail/evolution-sharp/files/patch-evolution-sharp.pc.in b/mail/evolution-sharp/files/patch-evolution-sharp.pc.in deleted file mode 100644 index d193e9977102..000000000000 --- a/mail/evolution-sharp/files/patch-evolution-sharp.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- trunk/evolution-sharp.pc.in 2008/02/23 03:46:27 160 -+++ evolution-sharp.pc.in 2008/03/27 08:42:33 168 -@@ -1,5 +1,5 @@ - prefix=@prefix@ --libdir=@libdir@ -+libdir=${prefix}/lib - - Name: Evolution# - Description: Evolution# - Evolution .NET Binding diff --git a/mail/evolution-sharp/files/patch-evolution::Makefile.in b/mail/evolution-sharp/files/patch-evolution::Makefile.in index 62ddce2c928b..0ce01248649e 100644 --- a/mail/evolution-sharp/files/patch-evolution::Makefile.in +++ b/mail/evolution-sharp/files/patch-evolution::Makefile.in @@ -1,11 +1,11 @@ ---- evolution/Makefile.in.orig 2008-03-26 20:44:07.000000000 -0500 -+++ evolution/Makefile.in 2008-03-26 20:45:49.000000000 -0500 -@@ -463,8 +463,8 @@ +--- evolution/Makefile.in.orig 2008-09-09 01:50:18.000000000 -0500 ++++ evolution/Makefile.in 2008-09-09 01:51:13.000000000 -0500 +@@ -467,8 +467,8 @@ install-data-local: @if test -n '$(TARGET)'; then \ -- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ -- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ +- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib"; \ +- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(prefix)/lib"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(prefix)/lib || exit 1; \ fi diff --git a/mail/evolution-sharp/pkg-plist b/mail/evolution-sharp/pkg-plist index 5a689cfc0a10..597309803921 100644 --- a/mail/evolution-sharp/pkg-plist +++ b/mail/evolution-sharp/pkg-plist @@ -2,11 +2,11 @@ lib/libevolutionglue.a lib/libevolutionglue.la lib/libevolutionglue.so lib/mono/evolution-sharp/evolution-sharp.dll -lib/mono/gac/evolution-sharp/3.0.0.0__457eed85bd9370df/evolution-sharp.dll -lib/mono/gac/evolution-sharp/3.0.0.0__457eed85bd9370df/evolution-sharp.dll.config -lib/mono/gac/evolution-sharp/3.0.0.0__457eed85bd9370df/evolution-sharp.dll.mdb +lib/mono/gac/evolution-sharp/5.0.0.0__c46a23b774189844/evolution-sharp.dll +lib/mono/gac/evolution-sharp/5.0.0.0__c46a23b774189844/evolution-sharp.dll.config +lib/mono/gac/evolution-sharp/5.0.0.0__c46a23b774189844/evolution-sharp.dll.mdb libdata/pkgconfig/evolution-sharp.pc share/gapi-2.0/evolution-api.xml -@dirrm lib/mono/gac/evolution-sharp/3.0.0.0__457eed85bd9370df +@dirrm lib/mono/gac/evolution-sharp/5.0.0.0__c46a23b774189844 @dirrm lib/mono/gac/evolution-sharp @dirrm lib/mono/evolution-sharp diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index b335de7216be..15c0b0090fa1 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,12 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/evolution/Makefile,v 1.168 2008/03/14 05:32:17 marcus Exp $ +# $MCom: ports/mail/evolution/Makefile,v 1.186 2008/11/25 05:29:01 mezz Exp $ # PORTNAME= evolution -PORTVERSION= 2.22.3.1 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -39,13 +38,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= apps_evolution_addressbook.schemas \ apps-evolution-attachment-reminder.schemas \ apps_evolution_calendar.schemas \ + apps_evolution_email_custom_header.schemas \ apps-evolution-mail-notification.schemas \ apps-evolution-mail-prompts-checkdefault.schemas \ apps_evolution_shell.schemas \ + apps-evolution-template-placeholders.schemas \ bogo-junk-plugin.schemas \ evolution-mail.schemas -EVO_VERSION= 2.22 +EVO_VERSION= 2.24 PLIST_SUB= VERSION=${EVO_VERSION} \ PORTVERSION=2.12 @@ -102,6 +103,5 @@ post-patch: post-install: install-ldconfig-file ${MKDIR} ${PREFIX}/include/evolution-${EVO_VERSION}/composer ${INSTALL_DATA} ${WRKSRC}/composer/e-msg*.h ${PREFIX}/include/evolution-${EVO_VERSION}/composer - ${INSTALL_DATA} ${WRKSRC}/composer/Editor.h ${PREFIX}/include/evolution-${EVO_VERSION}/composer .include <bsd.port.post.mk> diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index 24e499742602..916e90898e15 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-2.22.3.1.tar.bz2) = 5be2cb0584344cfe7bb4944c2fe468be -SHA256 (gnome2/evolution-2.22.3.1.tar.bz2) = d7e455fb1e54e21b05b419814e8b7a38bd76cec93e8531a99d27045493a5a756 -SIZE (gnome2/evolution-2.22.3.1.tar.bz2) = 30988398 +MD5 (gnome2/evolution-2.24.2.tar.bz2) = 2b6621e8b71b06db57b776f66798f3b4 +SHA256 (gnome2/evolution-2.24.2.tar.bz2) = 27e7dbcb6379e43e0a11fc9a4112bed52ea6ca19f8a693ee9dcc6f46b1369807 +SIZE (gnome2/evolution-2.24.2.tar.bz2) = 32620836 diff --git a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in b/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in index 1a1cdba37469..2ecb540021ca 100644 --- a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in +++ b/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in @@ -1,10 +1,10 @@ ---- plugins/exchange-operations/Makefile.in.orig 2008-03-11 17:54:08.000000000 -0400 -+++ plugins/exchange-operations/Makefile.in 2008-03-11 17:54:38.000000000 -0400 -@@ -461,6 +461,7 @@ liborg_gnome_exchange_operations_la_LIBA +--- plugins/exchange-operations/Makefile.in.orig 2008-04-27 23:58:09.000000000 -0400 ++++ plugins/exchange-operations/Makefile.in 2008-04-28 00:02:31.000000000 -0400 +@@ -463,6 +463,7 @@ liborg_gnome_exchange_operations_la_LIBA $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ + -Wl,--no-as-needed,$(top_builddir)/addressbook/gui/component/.libs/libevolution-addressbook.so \ - $(CAMEL_EXCHANGE_LIBS) + $(CAMEL_EXCHANGE_LIBS) \ + $(EVOLUTION_MAIL_LIBS) - liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 15891d9fb310..6b16d67f5abb 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -2,10 +2,11 @@ bin/evolution include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-menu.h include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-popup.h +include/evolution-%%VERSION%%/calendar/gui/dialogs/comp-editor-page.h +include/evolution-%%VERSION%%/calendar/gui/dialogs/comp-editor.h include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h -include/evolution-%%VERSION%%/composer/Editor.h -include/evolution-%%VERSION%%/composer/e-msg-composer-hdrs.h -include/evolution-%%VERSION%%/composer/e-msg-composer-select-file.h +include/evolution-%%VERSION%%/calendar/gui/e-cal-popup.h +include/evolution-%%VERSION%%/calendar/gui/itip-utils.h include/evolution-%%VERSION%%/composer/e-msg-composer.h include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h @@ -29,6 +30,7 @@ include/evolution-%%VERSION%%/e-util/e-import.h include/evolution-%%VERSION%%/e-util/e-logger.h include/evolution-%%VERSION%%/e-util/e-menu.h include/evolution-%%VERSION%%/e-util/e-mktemp.h +include/evolution-%%VERSION%%/e-util/e-plugin-ui.h include/evolution-%%VERSION%%/e-util/e-plugin.h include/evolution-%%VERSION%%/e-util/e-popup.h include/evolution-%%VERSION%%/e-util/e-print.h @@ -70,7 +72,6 @@ include/evolution-%%VERSION%%/mail/em-popup.h include/evolution-%%VERSION%%/mail/em-stripsig-filter.h include/evolution-%%VERSION%%/mail/em-sync-stream.h include/evolution-%%VERSION%%/mail/em-utils.h -include/evolution-%%VERSION%%/mail/em-vfs-stream.h include/evolution-%%VERSION%%/mail/mail-autofilter.h include/evolution-%%VERSION%%/mail/mail-component.h include/evolution-%%VERSION%%/mail/mail-config.h @@ -119,6 +120,7 @@ include/evolution-%%VERSION%%/misc/e-image-chooser.h include/evolution-%%VERSION%%/misc/e-info-label.h include/evolution-%%VERSION%%/misc/e-map.h include/evolution-%%VERSION%%/misc/e-multi-config-dialog.h +include/evolution-%%VERSION%%/misc/e-online-button.h %%PILOT:%%include/evolution-%%VERSION%%/misc/e-pilot-settings.h include/evolution-%%VERSION%%/misc/e-popup-menu.h include/evolution-%%VERSION%%/misc/e-printable.h @@ -138,7 +140,6 @@ include/evolution-%%VERSION%%/misc/e-unicode.h include/evolution-%%VERSION%%/misc/e-url-entry.h include/evolution-%%VERSION%%/shell/Evolution.h include/evolution-%%VERSION%%/shell/e-component-view.h -include/evolution-%%VERSION%%/shell/e-shell-utils.h include/evolution-%%VERSION%%/shell/e-user-creatable-items-handler.h include/evolution-%%VERSION%%/shell/es-event.h include/evolution-%%VERSION%%/shell/es-menu.h @@ -149,14 +150,11 @@ include/evolution-%%VERSION%%/shell/evolution-shell-component-utils.h include/evolution-%%VERSION%%/table/e-cell-checkbox.h include/evolution-%%VERSION%%/table/e-cell-combo.h include/evolution-%%VERSION%%/table/e-cell-date.h -include/evolution-%%VERSION%%/table/e-cell-float.h include/evolution-%%VERSION%%/table/e-cell-hbox.h include/evolution-%%VERSION%%/table/e-cell-number.h include/evolution-%%VERSION%%/table/e-cell-pixbuf.h include/evolution-%%VERSION%%/table/e-cell-popup.h -include/evolution-%%VERSION%%/table/e-cell-progress.h include/evolution-%%VERSION%%/table/e-cell-size.h -include/evolution-%%VERSION%%/table/e-cell-spin-button.h include/evolution-%%VERSION%%/table/e-cell-text.h include/evolution-%%VERSION%%/table/e-cell-toggle.h include/evolution-%%VERSION%%/table/e-cell-tree.h @@ -352,6 +350,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.a +lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.la +lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.so @@ -364,15 +365,15 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.a -lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.la -lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-hula-account-setup.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-mail-attachments-import-ics.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.a +lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.la +lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so @@ -412,9 +413,6 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so -lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.a -lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.la -lib/evolution/%%VERSION%%/plugins/liborg-gnome-print-message.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.so @@ -430,6 +428,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.a +lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.la +lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.so lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-backup-restore.xml @@ -441,18 +442,18 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-email-custom-header.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-attachment-reminder.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-google.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-hula-account-setup.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-mail-attachments-import-ics.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-webdav.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-ab-subscription.xml lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-cal-subscription.xml lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-operations.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-tasks-subscription.xml -lib/evolution/%%VERSION%%/plugins/org-gnome-face-ui.xml lib/evolution/%%VERSION%%/plugins/org-gnome-face.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-folder-permissions.xml lib/evolution/%%VERSION%%/plugins/org-gnome-folder-subscription.xml @@ -471,14 +472,14 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.eplug -lib/evolution/%%VERSION%%/plugins/org-gnome-print-message.xml lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-publish-calendar.xml lib/evolution/%%VERSION%%/plugins/org-gnome-sa-junk-plugin.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-templates.eplug +lib/evolution/%%VERSION%%/plugins/templates.glade libdata/bonobo/servers/GNOME_Evolution_Addressbook.server libdata/bonobo/servers/GNOME_Evolution_Calendar.server libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server @@ -496,10 +497,13 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/addresstypes.xml %%DATADIR%%/%%VERSION%%/caltypes.xml %%DATADIR%%/%%VERSION%%/default/C/mail/local/Inbox +%%DATADIR%%/%%VERSION%%/default/cs/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/de/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/es/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/fi/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/fr/mail/local/Inbox +%%DATADIR%%/%%VERSION%%/default/hu/mail/local/Inbox +%%DATADIR%%/%%VERSION%%/default/it/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/ja/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/ko/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/lt/mail/local/Inbox @@ -507,6 +511,8 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/default/nl/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/pl/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/pt/mail/local/Inbox +%%DATADIR%%/%%VERSION%%/default/sr/mail/local/Inbox +%%DATADIR%%/%%VERSION%%/default/sr@latin/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/sv/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/zh_CN/mail/local/Inbox %%DATADIR%%/%%VERSION%%/ecps/medbook.ecps @@ -555,6 +561,7 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/glade/e-timezone-dialog.glade %%DATADIR%%/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade %%DATADIR%%/%%VERSION%%/glade/eab-contact-duplicate-detected.glade +%%DATADIR%%/%%VERSION%%/glade/email-custom-header.glade %%DATADIR%%/%%VERSION%%/glade/event-page.glade %%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade %%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade @@ -580,6 +587,7 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/glade/mail-dialogs.glade %%DATADIR%%/%%VERSION%%/glade/meeting-page.glade %%DATADIR%%/%%VERSION%%/glade/memo-page.glade +%%DATADIR%%/%%VERSION%%/glade/org-gnome-email-custom-header.glade %%DATADIR%%/%%VERSION%%/glade/properties.glade %%DATADIR%%/%%VERSION%%/glade/proxy-add-dialog.glade %%DATADIR%%/%%VERSION%%/glade/proxy-listing.glade @@ -610,6 +618,7 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-month.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-week.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-workweek.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps/contact-editor.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-inbox.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-outbox.png %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-sent.png @@ -619,15 +628,18 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-month.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-week.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-workweek.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps/contact-editor.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-inbox.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-outbox.png %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places/mail-sent.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/go-today.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/query-free-busy.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-day.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-list.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-month.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-week.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/view-calendar-workweek.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps/contact-editor.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places/mail-inbox.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places/mail-outbox.png %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places/mail-sent.png @@ -636,23 +648,24 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/actions/view-calendar-month.png %%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/actions/view-calendar-week.png %%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/actions/view-calendar-workweek.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/apps/contact-editor.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/status/offline.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/status/online.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/apps/contact-editor.png %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/categories/preferences-autocompletion.png %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/categories/preferences-calendar-and-tasks.png %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/categories/preferences-certificates.png %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/categories/preferences-composer.png %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/categories/preferences-mail-accounts.png %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/categories/preferences-mail.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/categories/preferences-system-network-proxy.png %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/actions/view-calendar-day.svg %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/actions/view-calendar-list.svg %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/actions/view-calendar-month.svg %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/actions/view-calendar-week.svg %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/actions/view-calendar-workweek.svg -%%DATADIR%%/%%VERSION%%/images/evolution-contacts-mini.png %%DATADIR%%/%%VERSION%%/images/minus.png -%%DATADIR%%/%%VERSION%%/images/offline.png -%%DATADIR%%/%%VERSION%%/images/online.png %%DATADIR%%/%%VERSION%%/images/plus.png -%%DATADIR%%/%%VERSION%%/images/query-free-busy.png %%DATADIR%%/%%VERSION%%/images/world_map-960.png %%DATADIR%%/%%VERSION%%/memotypes.xml %%DATADIR%%/%%VERSION%%/searchtypes.xml @@ -660,19 +673,12 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/tasktypes.xml %%DATADIR%%/%%VERSION%%/ui/evolution-addressbook.xml %%DATADIR%%/%%VERSION%%/ui/evolution-calendar.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-composer-entries.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-editor.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-event-editor.xml +%%DATADIR%%/%%VERSION%%/ui/evolution-composer.ui %%DATADIR%%/%%VERSION%%/ui/evolution-mail-global.xml %%DATADIR%%/%%VERSION%%/ui/evolution-mail-list.xml %%DATADIR%%/%%VERSION%%/ui/evolution-mail-message.xml %%DATADIR%%/%%VERSION%%/ui/evolution-mail-messagedisplay.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-memo-editor.xml %%DATADIR%%/%%VERSION%%/ui/evolution-memos.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-message-composer.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-signature-editor.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-subscribe.xml -%%DATADIR%%/%%VERSION%%/ui/evolution-task-editor.xml %%DATADIR%%/%%VERSION%%/ui/evolution-tasks.xml %%DATADIR%%/%%VERSION%%/ui/evolution.xml %%DATADIR%%/%%VERSION%%/vfoldertypes.xml @@ -705,10 +711,11 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/weather/category_weather_sun_16.png %%DATADIR%%/%%VERSION%%/weather/category_weather_tstorm_16.png share/gnome/help/evolution/C/evolution.xml +share/gnome/help/evolution/C/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/C/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/C/figures/account_editor_a.png share/gnome/help/evolution/C/figures/addrs_book_a.png -share/gnome/help/evolution/C/figures/attach_reminder_a.png.png +share/gnome/help/evolution/C/figures/attach_reminder_a.png share/gnome/help/evolution/C/figures/calendar.png share/gnome/help/evolution/C/figures/categories_a.png share/gnome/help/evolution/C/figures/collap_head_a.png @@ -825,10 +832,11 @@ share/gnome/help/evolution/C/figures/sub-pub-fold.png share/gnome/help/evolution/C/figures/ver_view_a.png share/gnome/help/evolution/C/figures/vfolder-createrule-fig.png share/gnome/help/evolution/cs/evolution.xml +share/gnome/help/evolution/cs/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/cs/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/cs/figures/account_editor_a.png share/gnome/help/evolution/cs/figures/addrs_book_a.png -share/gnome/help/evolution/cs/figures/attach_reminder_a.png.png +share/gnome/help/evolution/cs/figures/attach_reminder_a.png share/gnome/help/evolution/cs/figures/calendar.png share/gnome/help/evolution/cs/figures/categories_a.png share/gnome/help/evolution/cs/figures/collap_head_a.png @@ -945,10 +953,11 @@ share/gnome/help/evolution/cs/figures/sub-pub-fold.png share/gnome/help/evolution/cs/figures/ver_view_a.png share/gnome/help/evolution/cs/figures/vfolder-createrule-fig.png share/gnome/help/evolution/de/evolution.xml +share/gnome/help/evolution/de/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/de/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/de/figures/account_editor_a.png share/gnome/help/evolution/de/figures/addrs_book_a.png -share/gnome/help/evolution/de/figures/attach_reminder_a.png.png +share/gnome/help/evolution/de/figures/attach_reminder_a.png share/gnome/help/evolution/de/figures/calendar.png share/gnome/help/evolution/de/figures/categories_a.png share/gnome/help/evolution/de/figures/collap_head_a.png @@ -1065,10 +1074,11 @@ share/gnome/help/evolution/de/figures/sub-pub-fold.png share/gnome/help/evolution/de/figures/ver_view_a.png share/gnome/help/evolution/de/figures/vfolder-createrule-fig.png share/gnome/help/evolution/el/evolution.xml +share/gnome/help/evolution/el/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/el/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/el/figures/account_editor_a.png share/gnome/help/evolution/el/figures/addrs_book_a.png -share/gnome/help/evolution/el/figures/attach_reminder_a.png.png +share/gnome/help/evolution/el/figures/attach_reminder_a.png share/gnome/help/evolution/el/figures/calendar.png share/gnome/help/evolution/el/figures/categories_a.png share/gnome/help/evolution/el/figures/collap_head_a.png @@ -1185,10 +1195,11 @@ share/gnome/help/evolution/el/figures/sub-pub-fold.png share/gnome/help/evolution/el/figures/ver_view_a.png share/gnome/help/evolution/el/figures/vfolder-createrule-fig.png share/gnome/help/evolution/en_GB/evolution.xml +share/gnome/help/evolution/en_GB/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/en_GB/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/en_GB/figures/account_editor_a.png share/gnome/help/evolution/en_GB/figures/addrs_book_a.png -share/gnome/help/evolution/en_GB/figures/attach_reminder_a.png.png +share/gnome/help/evolution/en_GB/figures/attach_reminder_a.png share/gnome/help/evolution/en_GB/figures/calendar.png share/gnome/help/evolution/en_GB/figures/categories_a.png share/gnome/help/evolution/en_GB/figures/collap_head_a.png @@ -1305,10 +1316,11 @@ share/gnome/help/evolution/en_GB/figures/sub-pub-fold.png share/gnome/help/evolution/en_GB/figures/ver_view_a.png share/gnome/help/evolution/en_GB/figures/vfolder-createrule-fig.png share/gnome/help/evolution/es/evolution.xml +share/gnome/help/evolution/es/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/es/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/es/figures/account_editor_a.png share/gnome/help/evolution/es/figures/addrs_book_a.png -share/gnome/help/evolution/es/figures/attach_reminder_a.png.png +share/gnome/help/evolution/es/figures/attach_reminder_a.png share/gnome/help/evolution/es/figures/calendar.png share/gnome/help/evolution/es/figures/categories_a.png share/gnome/help/evolution/es/figures/collap_head_a.png @@ -1425,10 +1437,11 @@ share/gnome/help/evolution/es/figures/sub-pub-fold.png share/gnome/help/evolution/es/figures/ver_view_a.png share/gnome/help/evolution/es/figures/vfolder-createrule-fig.png share/gnome/help/evolution/fr/evolution.xml +share/gnome/help/evolution/fr/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/fr/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/fr/figures/account_editor_a.png share/gnome/help/evolution/fr/figures/addrs_book_a.png -share/gnome/help/evolution/fr/figures/attach_reminder_a.png.png +share/gnome/help/evolution/fr/figures/attach_reminder_a.png share/gnome/help/evolution/fr/figures/calendar.png share/gnome/help/evolution/fr/figures/categories_a.png share/gnome/help/evolution/fr/figures/collap_head_a.png @@ -1545,10 +1558,11 @@ share/gnome/help/evolution/fr/figures/sub-pub-fold.png share/gnome/help/evolution/fr/figures/ver_view_a.png share/gnome/help/evolution/fr/figures/vfolder-createrule-fig.png share/gnome/help/evolution/mk/evolution.xml +share/gnome/help/evolution/mk/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/mk/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/mk/figures/account_editor_a.png share/gnome/help/evolution/mk/figures/addrs_book_a.png -share/gnome/help/evolution/mk/figures/attach_reminder_a.png.png +share/gnome/help/evolution/mk/figures/attach_reminder_a.png share/gnome/help/evolution/mk/figures/calendar.png share/gnome/help/evolution/mk/figures/categories_a.png share/gnome/help/evolution/mk/figures/collap_head_a.png @@ -1665,10 +1679,11 @@ share/gnome/help/evolution/mk/figures/sub-pub-fold.png share/gnome/help/evolution/mk/figures/ver_view_a.png share/gnome/help/evolution/mk/figures/vfolder-createrule-fig.png share/gnome/help/evolution/oc/evolution.xml +share/gnome/help/evolution/oc/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/oc/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/oc/figures/account_editor_a.png share/gnome/help/evolution/oc/figures/addrs_book_a.png -share/gnome/help/evolution/oc/figures/attach_reminder_a.png.png +share/gnome/help/evolution/oc/figures/attach_reminder_a.png share/gnome/help/evolution/oc/figures/calendar.png share/gnome/help/evolution/oc/figures/categories_a.png share/gnome/help/evolution/oc/figures/collap_head_a.png @@ -1785,10 +1800,11 @@ share/gnome/help/evolution/oc/figures/sub-pub-fold.png share/gnome/help/evolution/oc/figures/ver_view_a.png share/gnome/help/evolution/oc/figures/vfolder-createrule-fig.png share/gnome/help/evolution/ru/evolution.xml +share/gnome/help/evolution/ru/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/ru/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/ru/figures/account_editor_a.png share/gnome/help/evolution/ru/figures/addrs_book_a.png -share/gnome/help/evolution/ru/figures/attach_reminder_a.png.png +share/gnome/help/evolution/ru/figures/attach_reminder_a.png share/gnome/help/evolution/ru/figures/calendar.png share/gnome/help/evolution/ru/figures/categories_a.png share/gnome/help/evolution/ru/figures/collap_head_a.png @@ -1905,10 +1921,11 @@ share/gnome/help/evolution/ru/figures/sub-pub-fold.png share/gnome/help/evolution/ru/figures/ver_view_a.png share/gnome/help/evolution/ru/figures/vfolder-createrule-fig.png share/gnome/help/evolution/sv/evolution.xml +share/gnome/help/evolution/sv/figures/Screenshot-Evolution-mailer-Preferences.png share/gnome/help/evolution/sv/figures/Screenshot-Free-Busy.png share/gnome/help/evolution/sv/figures/account_editor_a.png share/gnome/help/evolution/sv/figures/addrs_book_a.png -share/gnome/help/evolution/sv/figures/attach_reminder_a.png.png +share/gnome/help/evolution/sv/figures/attach_reminder_a.png share/gnome/help/evolution/sv/figures/calendar.png share/gnome/help/evolution/sv/figures/categories_a.png share/gnome/help/evolution/sv/figures/collap_head_a.png @@ -2024,15 +2041,28 @@ share/gnome/help/evolution/sv/figures/sub-others-folder.png share/gnome/help/evolution/sv/figures/sub-pub-fold.png share/gnome/help/evolution/sv/figures/ver_view_a.png share/gnome/help/evolution/sv/figures/vfolder-createrule-fig.png +share/icons/hicolor/16x16/apps/evolution-mail.png +share/icons/hicolor/16x16/apps/evolution-memos.png +share/icons/hicolor/16x16/apps/evolution-tasks.png share/icons/hicolor/16x16/apps/evolution.png +share/icons/hicolor/22x22/apps/evolution-mail.png +share/icons/hicolor/22x22/apps/evolution-memos.png +share/icons/hicolor/22x22/apps/evolution-tasks.png share/icons/hicolor/22x22/apps/evolution.png +share/icons/hicolor/24x24/apps/evolution-mail.png +share/icons/hicolor/24x24/apps/evolution-memos.png +share/icons/hicolor/24x24/apps/evolution-tasks.png share/icons/hicolor/24x24/apps/evolution.png +share/icons/hicolor/32x32/apps/evolution-mail.png +share/icons/hicolor/32x32/apps/evolution-memos.png +share/icons/hicolor/32x32/apps/evolution-tasks.png share/icons/hicolor/32x32/apps/evolution.png +share/icons/hicolor/48x48/apps/evolution-mail.png +share/icons/hicolor/48x48/apps/evolution-memos.png +share/icons/hicolor/48x48/apps/evolution-tasks.png share/icons/hicolor/48x48/apps/evolution.png share/icons/hicolor/scalable/apps/evolution.svg -share/idl/evolution-%%VERSION%%/Composer.idl share/idl/evolution-%%VERSION%%/Evolution-Component.idl -share/idl/evolution-%%VERSION%%/Evolution-Composer.idl share/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl share/idl/evolution-%%VERSION%%/Evolution-Mail.idl share/idl/evolution-%%VERSION%%/Evolution-Shell.idl @@ -2041,6 +2071,7 @@ share/idl/evolution-%%VERSION%%/evolution-calendar.idl share/locale/am/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/ast/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/be@latin/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -2094,6 +2125,7 @@ share/locale/oc/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/or/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/pa/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/pl/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/ps/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/pt/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/pt_BR/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ro/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -2104,7 +2136,7 @@ share/locale/sk/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sl/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/sr@latin/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ta/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/te/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -2168,16 +2200,22 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/actions @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/categories +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48/apps @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/48x48 +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/status +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/apps @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/actions @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/32x32 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/apps @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/apps @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/apps @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor @@ -2204,6 +2242,12 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/default/sv/mail/local @dirrm %%DATADIR%%/%%VERSION%%/default/sv/mail @dirrm %%DATADIR%%/%%VERSION%%/default/sv +@dirrm %%DATADIR%%/%%VERSION%%/default/sr@latin/mail/local +@dirrm %%DATADIR%%/%%VERSION%%/default/sr@latin/mail +@dirrm %%DATADIR%%/%%VERSION%%/default/sr@latin +@dirrm %%DATADIR%%/%%VERSION%%/default/sr/mail/local +@dirrm %%DATADIR%%/%%VERSION%%/default/sr/mail +@dirrm %%DATADIR%%/%%VERSION%%/default/sr @dirrm %%DATADIR%%/%%VERSION%%/default/pt/mail/local @dirrm %%DATADIR%%/%%VERSION%%/default/pt/mail @dirrm %%DATADIR%%/%%VERSION%%/default/pt @@ -2225,6 +2269,12 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/default/ja/mail/local @dirrm %%DATADIR%%/%%VERSION%%/default/ja/mail @dirrm %%DATADIR%%/%%VERSION%%/default/ja +@dirrm %%DATADIR%%/%%VERSION%%/default/it/mail/local +@dirrm %%DATADIR%%/%%VERSION%%/default/it/mail +@dirrm %%DATADIR%%/%%VERSION%%/default/it +@dirrm %%DATADIR%%/%%VERSION%%/default/hu/mail/local +@dirrm %%DATADIR%%/%%VERSION%%/default/hu/mail +@dirrm %%DATADIR%%/%%VERSION%%/default/hu @dirrm %%DATADIR%%/%%VERSION%%/default/fr/mail/local @dirrm %%DATADIR%%/%%VERSION%%/default/fr/mail @dirrm %%DATADIR%%/%%VERSION%%/default/fr @@ -2237,6 +2287,9 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/default/de/mail/local @dirrm %%DATADIR%%/%%VERSION%%/default/de/mail @dirrm %%DATADIR%%/%%VERSION%%/default/de +@dirrm %%DATADIR%%/%%VERSION%%/default/cs/mail/local +@dirrm %%DATADIR%%/%%VERSION%%/default/cs/mail +@dirrm %%DATADIR%%/%%VERSION%%/default/cs @dirrm %%DATADIR%%/%%VERSION%%/default/C/mail/local @dirrm %%DATADIR%%/%%VERSION%%/default/C/mail @dirrm %%DATADIR%%/%%VERSION%%/default/C @@ -2259,6 +2312,7 @@ share/omf/evolution/evolution-sv.omf @dirrm include/evolution-%%VERSION%%/e-util @dirrm include/evolution-%%VERSION%%/e-conduit @dirrm include/evolution-%%VERSION%%/composer +@dirrm include/evolution-%%VERSION%%/calendar/gui/dialogs @dirrm include/evolution-%%VERSION%%/calendar/gui @dirrm include/evolution-%%VERSION%%/calendar @dirrm include/evolution-%%VERSION%%/addressbook/gui/widgets @@ -2271,10 +2325,14 @@ share/omf/evolution/evolution-sv.omf @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -2287,5 +2345,7 @@ share/omf/evolution/evolution-sv.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index e3a95bb645dc..7adf2541a713 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/math/gcalctool/Makefile,v 1.92 2008/03/10 15:55:04 ahze Exp $ +# $MCom: ports/math/gcalctool/Makefile,v 1.106 2008/11/25 16:31:13 marcus Exp $ # PORTNAME= gcalctool -PORTVERSION= 5.22.3 +PORTVERSION= 5.24.2 PORTEPOCH= 2 CATEGORIES= math gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo index 0688ff0a02be..0b6c40665228 100644 --- a/math/gcalctool/distinfo +++ b/math/gcalctool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gcalctool-5.22.3.tar.bz2) = 654a2d30f2a1c1b0e7b677fa772f87a3 -SHA256 (gnome2/gcalctool-5.22.3.tar.bz2) = ef61430800f5e286d448d232d3ddd6205c18de4800bd5c4c2231d6bfd963b6fe -SIZE (gnome2/gcalctool-5.22.3.tar.bz2) = 1495748 +MD5 (gnome2/gcalctool-5.24.2.tar.bz2) = a784f13120115cf94cf88f87d32baf9c +SHA256 (gnome2/gcalctool-5.24.2.tar.bz2) = 65e4c2cf4e83ca231d971e182cf8c7f6277411a76c2b0f6a72d089892522a255 +SIZE (gnome2/gcalctool-5.24.2.tar.bz2) = 1694083 diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist index cbb7c6d2b0b9..c27628c66b3f 100644 --- a/math/gcalctool/pkg-plist +++ b/math/gcalctool/pkg-plist @@ -15,7 +15,12 @@ share/gnome/help/gcalctool/bg/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/bg/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/bg/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/bg/gcalctool.xml -share/gnome/help/gcalctool/bg/legal.xml +share/gnome/help/gcalctool/ca/figures/gcalctool_advanced_window.png +share/gnome/help/gcalctool/ca/figures/gcalctool_basic_window.png +share/gnome/help/gcalctool/ca/figures/gcalctool_financial_window.png +share/gnome/help/gcalctool/ca/figures/gcalctool_menu_symbol.png +share/gnome/help/gcalctool/ca/figures/gcalctool_scientific_window.png +share/gnome/help/gcalctool/ca/gcalctool.xml share/gnome/help/gcalctool/de/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/de/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/de/figures/gcalctool_financial_window.png @@ -40,12 +45,12 @@ share/gnome/help/gcalctool/it/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/it/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/it/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/it/gcalctool.xml +share/gnome/help/gcalctool/ja/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/ja/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/ja/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/ja/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/ja/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/ja/gcalctool.xml -share/gnome/help/gcalctool/ja/legal.xml share/gnome/help/gcalctool/ko/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/ko/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/ko/figures/gcalctool_financial_window.png @@ -64,30 +69,36 @@ share/gnome/help/gcalctool/pt_BR/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/pt_BR/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/pt_BR/gcalctool.xml +share/gnome/help/gcalctool/ru/figures/gcalctool_advanced_window.png +share/gnome/help/gcalctool/ru/figures/gcalctool_basic_window.png +share/gnome/help/gcalctool/ru/figures/gcalctool_financial_window.png +share/gnome/help/gcalctool/ru/figures/gcalctool_menu_symbol.png +share/gnome/help/gcalctool/ru/figures/gcalctool_scientific_window.png +share/gnome/help/gcalctool/ru/gcalctool.xml share/gnome/help/gcalctool/sv/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/sv/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/sv/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/sv/gcalctool.xml +share/gnome/help/gcalctool/zh_CN/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/zh_CN/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/zh_CN/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/zh_CN/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/zh_CN/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/zh_CN/gcalctool.xml -share/gnome/help/gcalctool/zh_CN/legal.xml +share/gnome/help/gcalctool/zh_HK/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/zh_HK/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/zh_HK/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/zh_HK/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/zh_HK/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/zh_HK/gcalctool.xml -share/gnome/help/gcalctool/zh_HK/legal.xml +share/gnome/help/gcalctool/zh_TW/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/zh_TW/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/zh_TW/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/zh_TW/gcalctool.xml -share/gnome/help/gcalctool/zh_TW/legal.xml share/locale/af/LC_MESSAGES/gcalctool.mo share/locale/am/LC_MESSAGES/gcalctool.mo share/locale/ar/LC_MESSAGES/gcalctool.mo @@ -155,7 +166,7 @@ share/locale/sk/LC_MESSAGES/gcalctool.mo share/locale/sl/LC_MESSAGES/gcalctool.mo share/locale/sq/LC_MESSAGES/gcalctool.mo share/locale/sr/LC_MESSAGES/gcalctool.mo -share/locale/sr@Latn/LC_MESSAGES/gcalctool.mo +share/locale/sr@latin/LC_MESSAGES/gcalctool.mo share/locale/sv/LC_MESSAGES/gcalctool.mo share/locale/ta/LC_MESSAGES/gcalctool.mo share/locale/te/LC_MESSAGES/gcalctool.mo @@ -170,6 +181,7 @@ share/locale/zh_HK/LC_MESSAGES/gcalctool.mo share/locale/zh_TW/LC_MESSAGES/gcalctool.mo share/omf/gcalctool/gcalctool-C.omf share/omf/gcalctool/gcalctool-bg.omf +share/omf/gcalctool/gcalctool-ca.omf share/omf/gcalctool/gcalctool-de.omf share/omf/gcalctool/gcalctool-es.omf share/omf/gcalctool/gcalctool-fr.omf @@ -178,6 +190,7 @@ share/omf/gcalctool/gcalctool-ja.omf share/omf/gcalctool/gcalctool-ko.omf share/omf/gcalctool/gcalctool-oc.omf share/omf/gcalctool/gcalctool-pt_BR.omf +share/omf/gcalctool/gcalctool-ru.omf share/omf/gcalctool/gcalctool-sv.omf share/omf/gcalctool/gcalctool-zh_CN.omf share/omf/gcalctool/gcalctool-zh_HK.omf @@ -191,6 +204,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf @dirrm share/gnome/help/gcalctool/zh_CN @dirrm share/gnome/help/gcalctool/sv/figures @dirrm share/gnome/help/gcalctool/sv +@dirrm share/gnome/help/gcalctool/ru/figures +@dirrm share/gnome/help/gcalctool/ru @dirrm share/gnome/help/gcalctool/pt_BR/figures @dirrm share/gnome/help/gcalctool/pt_BR @dirrm share/gnome/help/gcalctool/oc/figures @@ -207,6 +222,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf @dirrm share/gnome/help/gcalctool/es @dirrm share/gnome/help/gcalctool/de/figures @dirrm share/gnome/help/gcalctool/de +@dirrm share/gnome/help/gcalctool/ca/figures +@dirrm share/gnome/help/gcalctool/ca @dirrm share/gnome/help/gcalctool/bg/figures @dirrm share/gnome/help/gcalctool/bg @dirrm share/gnome/help/gcalctool/C/figures @@ -220,6 +237,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 999e8b85cfa4..72647b7839ac 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -3,12 +3,11 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/math/gnumeric/Makefile,v 1.42 2008/03/11 12:45:31 ahze Exp $ +# $MCom: ports/math/gnumeric/Makefile,v 1.46 2008/10/20 21:37:28 kwm Exp $ # PORTNAME= gnumeric -PORTVERSION= 1.8.3 -PORTREVISION= 1 +PORTVERSION= 1.9.3 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -17,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The GNOME 2 spreadsheet -LIB_DEPENDS= goffice-0.6.6:${PORTSDIR}/devel/goffice \ +LIB_DEPENDS= goffice-0.8.7:${PORTSDIR}/devel/goffice \ psiconv.10:${PORTSDIR}/converters/psiconv USE_BZIP2= yes @@ -29,6 +28,7 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomehier \ USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes +INSTALLS_ICONS= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-guile --with-bonobo CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ @@ -38,7 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ GCONF_SCHEMAS= gnumeric-dialogs.schemas gnumeric-general.schemas \ gnumeric-plugins.schemas -MAN1= gnumeric.1 ssconvert.1 ssindex.1 +MAN1= gnumeric.1 ssconvert.1 ssindex.1 ssgrep.1 PLIST_SUB= VERSION=${PORTVERSION} diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index ed5a0f3927d3..0f28e41aaafe 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnumeric-1.8.3.tar.bz2) = 3ce6ba6483ccd6fe9974cface582337a -SHA256 (gnome2/gnumeric-1.8.3.tar.bz2) = 173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07 -SIZE (gnome2/gnumeric-1.8.3.tar.bz2) = 14087309 +MD5 (gnome2/gnumeric-1.9.3.tar.bz2) = 75f7ea180af40103ecf6a16b68cd5c9c +SHA256 (gnome2/gnumeric-1.9.3.tar.bz2) = b456d85770af3734a6974900ac45604f40c37217f87b4ea4b4595ed85465914f +SIZE (gnome2/gnumeric-1.9.3.tar.bz2) = 15294207 diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index dd8c2595dc48..904b10617b49 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -2,122 +2,123 @@ bin/gnumeric bin/gnumeric-%%VERSION%% bin/ssconvert bin/ssindex -include/libspreadsheet-1.8/spreadsheet/application.h -include/libspreadsheet-1.8/spreadsheet/auto-format.h -include/libspreadsheet-1.8/spreadsheet/cell-draw.h -include/libspreadsheet-1.8/spreadsheet/cell.h -include/libspreadsheet-1.8/spreadsheet/cellspan.h -include/libspreadsheet-1.8/spreadsheet/clipboard.h -include/libspreadsheet-1.8/spreadsheet/cmd-edit.h -include/libspreadsheet-1.8/spreadsheet/collect.h -include/libspreadsheet-1.8/spreadsheet/colrow.h -include/libspreadsheet-1.8/spreadsheet/command-context-stderr.h -include/libspreadsheet-1.8/spreadsheet/command-context.h -include/libspreadsheet-1.8/spreadsheet/commands.h -include/libspreadsheet-1.8/spreadsheet/complete-sheet.h -include/libspreadsheet-1.8/spreadsheet/complete.h -include/libspreadsheet-1.8/spreadsheet/complex.h -include/libspreadsheet-1.8/spreadsheet/consolidate.h -include/libspreadsheet-1.8/spreadsheet/dependent.h -include/libspreadsheet-1.8/spreadsheet/expr-impl.h -include/libspreadsheet-1.8/spreadsheet/expr-name.h -include/libspreadsheet-1.8/spreadsheet/expr.h -include/libspreadsheet-1.8/spreadsheet/file-autoft.h -include/libspreadsheet-1.8/spreadsheet/format-template.h -include/libspreadsheet-1.8/spreadsheet/func-builtin.h -include/libspreadsheet-1.8/spreadsheet/func.h -include/libspreadsheet-1.8/spreadsheet/gnm-datetime.h -include/libspreadsheet-1.8/spreadsheet/gnm-format.h -include/libspreadsheet-1.8/spreadsheet/gnm-graph-window.h -include/libspreadsheet-1.8/spreadsheet/gnm-pane.h -include/libspreadsheet-1.8/spreadsheet/gnm-plugin.h -include/libspreadsheet-1.8/spreadsheet/gnm-so-filled.h -include/libspreadsheet-1.8/spreadsheet/gnm-so-line.h -include/libspreadsheet-1.8/spreadsheet/gnm-so-polygon.h -include/libspreadsheet-1.8/spreadsheet/gnm-style-impl.h -include/libspreadsheet-1.8/spreadsheet/gnumeric-gconf.h -include/libspreadsheet-1.8/spreadsheet/gnumeric-simple-canvas.h -include/libspreadsheet-1.8/spreadsheet/gnumeric.h -include/libspreadsheet-1.8/spreadsheet/graph.h -include/libspreadsheet-1.8/spreadsheet/gui-clipboard.h -include/libspreadsheet-1.8/spreadsheet/gui-file.h -include/libspreadsheet-1.8/spreadsheet/gui-gnumeric.h -include/libspreadsheet-1.8/spreadsheet/gui-util.h -include/libspreadsheet-1.8/spreadsheet/gutils.h -include/libspreadsheet-1.8/spreadsheet/history.h -include/libspreadsheet-1.8/spreadsheet/hlink-impl.h -include/libspreadsheet-1.8/spreadsheet/hlink.h -include/libspreadsheet-1.8/spreadsheet/input-msg.h -include/libspreadsheet-1.8/spreadsheet/item-acetate.h -include/libspreadsheet-1.8/spreadsheet/item-bar.h -include/libspreadsheet-1.8/spreadsheet/item-cursor.h -include/libspreadsheet-1.8/spreadsheet/item-debug.h -include/libspreadsheet-1.8/spreadsheet/item-edit.h -include/libspreadsheet-1.8/spreadsheet/item-grid.h -include/libspreadsheet-1.8/spreadsheet/libgnumeric.h -include/libspreadsheet-1.8/spreadsheet/mathfunc.h -include/libspreadsheet-1.8/spreadsheet/mstyle.h -include/libspreadsheet-1.8/spreadsheet/number-match.h -include/libspreadsheet-1.8/spreadsheet/numbers.h -include/libspreadsheet-1.8/spreadsheet/parse-util.h -include/libspreadsheet-1.8/spreadsheet/pattern.h -include/libspreadsheet-1.8/spreadsheet/position.h -include/libspreadsheet-1.8/spreadsheet/preview-grid.h -include/libspreadsheet-1.8/spreadsheet/print-cell.h -include/libspreadsheet-1.8/spreadsheet/print-info.h -include/libspreadsheet-1.8/spreadsheet/print.h -include/libspreadsheet-1.8/spreadsheet/rangefunc-strings.h -include/libspreadsheet-1.8/spreadsheet/rangefunc.h -include/libspreadsheet-1.8/spreadsheet/ranges.h -include/libspreadsheet-1.8/spreadsheet/regression.h -include/libspreadsheet-1.8/spreadsheet/rendered-value.h -include/libspreadsheet-1.8/spreadsheet/search.h -include/libspreadsheet-1.8/spreadsheet/selection.h -include/libspreadsheet-1.8/spreadsheet/session.h -include/libspreadsheet-1.8/spreadsheet/sheet-autofill.h -include/libspreadsheet-1.8/spreadsheet/sheet-control-gui-priv.h -include/libspreadsheet-1.8/spreadsheet/sheet-control-gui.h -include/libspreadsheet-1.8/spreadsheet/sheet-control-priv.h -include/libspreadsheet-1.8/spreadsheet/sheet-control.h -include/libspreadsheet-1.8/spreadsheet/sheet-filter-combo.h -include/libspreadsheet-1.8/spreadsheet/sheet-filter.h -include/libspreadsheet-1.8/spreadsheet/sheet-merge.h -include/libspreadsheet-1.8/spreadsheet/sheet-object-cell-comment.h -include/libspreadsheet-1.8/spreadsheet/sheet-object-graph.h -include/libspreadsheet-1.8/spreadsheet/sheet-object-image.h -include/libspreadsheet-1.8/spreadsheet/sheet-object-impl.h -include/libspreadsheet-1.8/spreadsheet/sheet-object-widget.h -include/libspreadsheet-1.8/spreadsheet/sheet-object.h -include/libspreadsheet-1.8/spreadsheet/sheet-private.h -include/libspreadsheet-1.8/spreadsheet/sheet-style.h -include/libspreadsheet-1.8/spreadsheet/sheet-view.h -include/libspreadsheet-1.8/spreadsheet/sheet.h -include/libspreadsheet-1.8/spreadsheet/solver.h -include/libspreadsheet-1.8/spreadsheet/sort.h -include/libspreadsheet-1.8/spreadsheet/stf-export.h -include/libspreadsheet-1.8/spreadsheet/stf-parse.h -include/libspreadsheet-1.8/spreadsheet/stf.h -include/libspreadsheet-1.8/spreadsheet/str.h -include/libspreadsheet-1.8/spreadsheet/style-border.h -include/libspreadsheet-1.8/spreadsheet/style-color.h -include/libspreadsheet-1.8/spreadsheet/style-conditions.h -include/libspreadsheet-1.8/spreadsheet/style-font.h -include/libspreadsheet-1.8/spreadsheet/style.h -include/libspreadsheet-1.8/spreadsheet/symbol.h -include/libspreadsheet-1.8/spreadsheet/validation-combo.h -include/libspreadsheet-1.8/spreadsheet/validation.h -include/libspreadsheet-1.8/spreadsheet/value.h -include/libspreadsheet-1.8/spreadsheet/wbc-gtk-impl.h -include/libspreadsheet-1.8/spreadsheet/wbc-gtk.h -include/libspreadsheet-1.8/spreadsheet/workbook-cmd-format.h -include/libspreadsheet-1.8/spreadsheet/workbook-control-priv.h -include/libspreadsheet-1.8/spreadsheet/workbook-control.h -include/libspreadsheet-1.8/spreadsheet/workbook-priv.h -include/libspreadsheet-1.8/spreadsheet/workbook-view.h -include/libspreadsheet-1.8/spreadsheet/workbook.h -include/libspreadsheet-1.8/spreadsheet/xml-io-version.h -include/libspreadsheet-1.8/spreadsheet/xml-io.h -include/libspreadsheet-1.8/spreadsheet/xml-sax.h +bin/ssgrep +include/libspreadsheet-1.10/spreadsheet/application.h +include/libspreadsheet-1.10/spreadsheet/auto-format.h +include/libspreadsheet-1.10/spreadsheet/cell-draw.h +include/libspreadsheet-1.10/spreadsheet/cell.h +include/libspreadsheet-1.10/spreadsheet/cellspan.h +include/libspreadsheet-1.10/spreadsheet/clipboard.h +include/libspreadsheet-1.10/spreadsheet/cmd-edit.h +include/libspreadsheet-1.10/spreadsheet/collect.h +include/libspreadsheet-1.10/spreadsheet/colrow.h +include/libspreadsheet-1.10/spreadsheet/command-context-stderr.h +include/libspreadsheet-1.10/spreadsheet/command-context.h +include/libspreadsheet-1.10/spreadsheet/commands.h +include/libspreadsheet-1.10/spreadsheet/complete-sheet.h +include/libspreadsheet-1.10/spreadsheet/complete.h +include/libspreadsheet-1.10/spreadsheet/complex.h +include/libspreadsheet-1.10/spreadsheet/consolidate.h +include/libspreadsheet-1.10/spreadsheet/dependent.h +include/libspreadsheet-1.10/spreadsheet/expr-impl.h +include/libspreadsheet-1.10/spreadsheet/expr-name.h +include/libspreadsheet-1.10/spreadsheet/expr.h +include/libspreadsheet-1.10/spreadsheet/file-autoft.h +include/libspreadsheet-1.10/spreadsheet/format-template.h +include/libspreadsheet-1.10/spreadsheet/func-builtin.h +include/libspreadsheet-1.10/spreadsheet/func.h +include/libspreadsheet-1.10/spreadsheet/gnm-datetime.h +include/libspreadsheet-1.10/spreadsheet/gnm-format.h +include/libspreadsheet-1.10/spreadsheet/gnm-graph-window.h +include/libspreadsheet-1.10/spreadsheet/gnm-pane.h +include/libspreadsheet-1.10/spreadsheet/gnm-plugin.h +include/libspreadsheet-1.10/spreadsheet/gnm-so-filled.h +include/libspreadsheet-1.10/spreadsheet/gnm-so-line.h +include/libspreadsheet-1.10/spreadsheet/gnm-so-polygon.h +include/libspreadsheet-1.10/spreadsheet/gnm-style-impl.h +include/libspreadsheet-1.10/spreadsheet/gnumeric-gconf.h +include/libspreadsheet-1.10/spreadsheet/gnumeric-simple-canvas.h +include/libspreadsheet-1.10/spreadsheet/gnumeric.h +include/libspreadsheet-1.10/spreadsheet/graph.h +include/libspreadsheet-1.10/spreadsheet/gui-clipboard.h +include/libspreadsheet-1.10/spreadsheet/gui-file.h +include/libspreadsheet-1.10/spreadsheet/gui-gnumeric.h +include/libspreadsheet-1.10/spreadsheet/gui-util.h +include/libspreadsheet-1.10/spreadsheet/gutils.h +include/libspreadsheet-1.10/spreadsheet/history.h +include/libspreadsheet-1.10/spreadsheet/hlink-impl.h +include/libspreadsheet-1.10/spreadsheet/hlink.h +include/libspreadsheet-1.10/spreadsheet/input-msg.h +include/libspreadsheet-1.10/spreadsheet/item-acetate.h +include/libspreadsheet-1.10/spreadsheet/item-bar.h +include/libspreadsheet-1.10/spreadsheet/item-cursor.h +include/libspreadsheet-1.10/spreadsheet/item-debug.h +include/libspreadsheet-1.10/spreadsheet/item-edit.h +include/libspreadsheet-1.10/spreadsheet/item-grid.h +include/libspreadsheet-1.10/spreadsheet/libgnumeric.h +include/libspreadsheet-1.10/spreadsheet/mathfunc.h +include/libspreadsheet-1.10/spreadsheet/mstyle.h +include/libspreadsheet-1.10/spreadsheet/number-match.h +include/libspreadsheet-1.10/spreadsheet/numbers.h +include/libspreadsheet-1.10/spreadsheet/parse-util.h +include/libspreadsheet-1.10/spreadsheet/pattern.h +include/libspreadsheet-1.10/spreadsheet/position.h +include/libspreadsheet-1.10/spreadsheet/preview-grid.h +include/libspreadsheet-1.10/spreadsheet/print-cell.h +include/libspreadsheet-1.10/spreadsheet/print-info.h +include/libspreadsheet-1.10/spreadsheet/print.h +include/libspreadsheet-1.10/spreadsheet/rangefunc-strings.h +include/libspreadsheet-1.10/spreadsheet/rangefunc.h +include/libspreadsheet-1.10/spreadsheet/ranges.h +include/libspreadsheet-1.10/spreadsheet/regression.h +include/libspreadsheet-1.10/spreadsheet/rendered-value.h +include/libspreadsheet-1.10/spreadsheet/search.h +include/libspreadsheet-1.10/spreadsheet/selection.h +include/libspreadsheet-1.10/spreadsheet/session.h +include/libspreadsheet-1.10/spreadsheet/sheet-autofill.h +include/libspreadsheet-1.10/spreadsheet/sheet-control-gui-priv.h +include/libspreadsheet-1.10/spreadsheet/sheet-control-gui.h +include/libspreadsheet-1.10/spreadsheet/sheet-control-priv.h +include/libspreadsheet-1.10/spreadsheet/sheet-control.h +include/libspreadsheet-1.10/spreadsheet/sheet-filter-combo.h +include/libspreadsheet-1.10/spreadsheet/sheet-filter.h +include/libspreadsheet-1.10/spreadsheet/sheet-merge.h +include/libspreadsheet-1.10/spreadsheet/sheet-object-cell-comment.h +include/libspreadsheet-1.10/spreadsheet/sheet-object-graph.h +include/libspreadsheet-1.10/spreadsheet/sheet-object-image.h +include/libspreadsheet-1.10/spreadsheet/sheet-object-impl.h +include/libspreadsheet-1.10/spreadsheet/sheet-object-widget.h +include/libspreadsheet-1.10/spreadsheet/sheet-object.h +include/libspreadsheet-1.10/spreadsheet/sheet-private.h +include/libspreadsheet-1.10/spreadsheet/sheet-style.h +include/libspreadsheet-1.10/spreadsheet/sheet-view.h +include/libspreadsheet-1.10/spreadsheet/sheet.h +include/libspreadsheet-1.10/spreadsheet/solver.h +include/libspreadsheet-1.10/spreadsheet/sort.h +include/libspreadsheet-1.10/spreadsheet/stf-export.h +include/libspreadsheet-1.10/spreadsheet/stf-parse.h +include/libspreadsheet-1.10/spreadsheet/stf.h +include/libspreadsheet-1.10/spreadsheet/str.h +include/libspreadsheet-1.10/spreadsheet/style-border.h +include/libspreadsheet-1.10/spreadsheet/style-color.h +include/libspreadsheet-1.10/spreadsheet/style-conditions.h +include/libspreadsheet-1.10/spreadsheet/style-font.h +include/libspreadsheet-1.10/spreadsheet/style.h +include/libspreadsheet-1.10/spreadsheet/symbol.h +include/libspreadsheet-1.10/spreadsheet/validation-combo.h +include/libspreadsheet-1.10/spreadsheet/validation.h +include/libspreadsheet-1.10/spreadsheet/value.h +include/libspreadsheet-1.10/spreadsheet/wbc-gtk-impl.h +include/libspreadsheet-1.10/spreadsheet/wbc-gtk.h +include/libspreadsheet-1.10/spreadsheet/workbook-cmd-format.h +include/libspreadsheet-1.10/spreadsheet/workbook-control-priv.h +include/libspreadsheet-1.10/spreadsheet/workbook-control.h +include/libspreadsheet-1.10/spreadsheet/workbook-priv.h +include/libspreadsheet-1.10/spreadsheet/workbook-view.h +include/libspreadsheet-1.10/spreadsheet/workbook.h +include/libspreadsheet-1.10/spreadsheet/xml-io-version.h +include/libspreadsheet-1.10/spreadsheet/xml-io.h +include/libspreadsheet-1.10/spreadsheet/xml-sax.h lib/gnumeric/%%VERSION%%/include/gnumeric-features.h lib/gnumeric/%%VERSION%%/plugins/applix/applix.la lib/gnumeric/%%VERSION%%/plugins/applix/applix.so @@ -248,10 +249,11 @@ lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so lib/libspreadsheet-%%VERSION%%.so lib/libspreadsheet.la lib/libspreadsheet.so -libdata/pkgconfig/libspreadsheet-1.8.pc +libdata/pkgconfig/libspreadsheet-1.10.pc @exec update-desktop-database > /dev/null || /usr/bin/true share/applications/gnumeric.desktop share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml +share/gnumeric/%%VERSION%%/Gnumeric-embed.xml share/gnumeric/%%VERSION%%/autoformat-templates/3D/.category share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml @@ -307,6 +309,7 @@ share/gnumeric/%%VERSION%%/glade/dialog-stf.glade share/gnumeric/%%VERSION%%/glade/dialog-zoom.glade share/gnumeric/%%VERSION%%/glade/doc-meta-data.glade share/gnumeric/%%VERSION%%/glade/exp-smoothing.glade +share/gnumeric/%%VERSION%%/glade/frequency.glade share/gnumeric/%%VERSION%%/glade/fill-series.glade share/gnumeric/%%VERSION%%/glade/font-sel.glade share/gnumeric/%%VERSION%%/glade/formula-guru.glade @@ -319,6 +322,7 @@ share/gnumeric/%%VERSION%%/glade/hf-dt-format.glade share/gnumeric/%%VERSION%%/glade/histogram.glade share/gnumeric/%%VERSION%%/glade/hyperlink.glade share/gnumeric/%%VERSION%%/glade/insert-cells.glade +share/gnumeric/%%VERSION%%/glade/kaplan-meier.glade share/gnumeric/%%VERSION%%/glade/mean-tests.glade share/gnumeric/%%VERSION%%/glade/merge.glade share/gnumeric/%%VERSION%%/glade/moving-averages.glade @@ -409,18 +413,37 @@ share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex1-options.png share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex1.png share/gnome/help/gnumeric/C/figures/analysistools-descstats-ex2.png share/gnome/help/gnumeric/C/figures/analysistools-descstats.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-a-holt-winters-formula.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-a-holt-winters-stderr.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-holt-formula.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-holt-stderr.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-hunter-formula.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-hunter-stderr.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-m-holt-winters-formula.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-m-holt-winters-stderr.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-roberts-formula.png +share/gnome/help/gnumeric/C/figures/analysistools-exp-smoothing-roberts-stderr.png share/gnome/help/gnumeric/C/figures/analysistools-fourier-formula.png share/gnome/help/gnumeric/C/figures/analysistools-fourier.png share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex1.png share/gnome/help/gnumeric/C/figures/analysistools-ftest-ex2.png share/gnome/help/gnumeric/C/figures/analysistools-ftest.png share/gnome/help/gnumeric/C/figures/analysistools-histogram-bins.png +share/gnome/help/gnumeric/C/figures/analysistools-histogram-cutoffs.png +share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex4.png +share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex5.png share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex1.png share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex2.png share/gnome/help/gnumeric/C/figures/analysistools-histogram-ex3.png +share/gnome/help/gnumeric/C/figures/analysistools-histogram-graphs.png share/gnome/help/gnumeric/C/figures/analysistools-histogram.png share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex1.png share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex2.png +share/gnome/help/gnumeric/C/figures/analysistools-moving-average-ex3.png +share/gnome/help/gnumeric/C/figures/analysistools-moving-average-formula-central.png +share/gnome/help/gnumeric/C/figures/analysistools-moving-average-formula-spencer.png +share/gnome/help/gnumeric/C/figures/analysistools-moving-average-formula-weighted.png +share/gnome/help/gnumeric/C/figures/analysistools-moving-average-options.png share/gnome/help/gnumeric/C/figures/analysistools-moving-average.png share/gnome/help/gnumeric/C/figures/analysistools-outputoptions.png share/gnome/help/gnumeric/C/figures/analysistools-random-ex1.png @@ -439,6 +462,12 @@ share/gnome/help/gnumeric/C/figures/analysistools-sampling-ex2.png share/gnome/help/gnumeric/C/figures/analysistools-sampling.png share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex1.png share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex2.png +share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex3.png +share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex4.png +share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex5.png +share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex6.png +share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex7.png +share/gnome/help/gnumeric/C/figures/analysistools-smoothing-ex8.png share/gnome/help/gnumeric/C/figures/analysistools-smoothing.png share/gnome/help/gnumeric/C/figures/analysistools-tools.png share/gnome/help/gnumeric/C/figures/analysistools-ttest-equal-ex1.png @@ -749,6 +778,12 @@ share/gnome/help/gnumeric/C/quick-start.xml share/gnome/help/gnumeric/C/welcome.xml share/gnome/help/gnumeric/C/workbooks.xml share/gnome/help/gnumeric/C/worksheets.xml +share/icons/hicolor/16x16/apps/gnumeric.png +share/icons/hicolor/22x22/apps/gnumeric.png +share/icons/hicolor/24x24/apps/gnumeric.png +share/icons/hicolor/32x32/apps/gnumeric.png +share/icons/hicolor/48x48/apps/gnumeric.png +share/icons/hicolor/scalable/apps/gnumeric.svg share/mime-info/gnumeric.mime share/omf/gnumeric/gnumeric-C.omf share/pixmaps/gnome-application-vnd.lotus-1-2-3.png @@ -756,14 +791,12 @@ share/pixmaps/gnome-application-x-applix-spreadsheet.png share/pixmaps/gnome-application-x-generic-spreadsheet.png share/pixmaps/gnome-application-x-gnumeric.png share/pixmaps/gnome-application-x-xls.png -share/pixmaps/gnome-gnumeric.png share/pixmaps/gnumeric/down-right.png share/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png share/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png share/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png share/pixmaps/gnumeric/gnome-application-x-gnumeric.png share/pixmaps/gnumeric/gnome-application-x-xls.png -share/pixmaps/gnumeric/gnome-gnumeric.png share/pixmaps/gnumeric/gnumeric-about.png share/pixmaps/gnumeric/orient-horizontal.png share/pixmaps/gnumeric/orient-vertical.png @@ -935,8 +968,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo @dirrm lib/gnumeric/%%VERSION%%/include @dirrm lib/gnumeric/%%VERSION%% @dirrm lib/gnumeric -@dirrm include/libspreadsheet-1.8/spreadsheet -@dirrm include/libspreadsheet-1.8 +@dirrm include/libspreadsheet-1.10/spreadsheet +@dirrm include/libspreadsheet-1.10 @unexec update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/applications @dirrmtry share/locale/te/LC_MESSAGES diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile index a87b14f0eed1..86557ab19a23 100644 --- a/misc/gnome-devel-docs/Makefile +++ b/misc/gnome-devel-docs/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.3 2008/03/11 04:00:33 mezz Exp $ +# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.8 2008/12/18 04:06:57 mezz Exp $ # PORTNAME= gnome-devel-docs -PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTVERSION= 2.24.1 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +21,7 @@ RUN_DEPENDS= gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnometarget +USE_GNOME= gnomehier INSTALLS_OMF= yes .include <bsd.port.mk> diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo index 3e10d12e378d..20370c2cd81f 100644 --- a/misc/gnome-devel-docs/distinfo +++ b/misc/gnome-devel-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-devel-docs-2.22.0.tar.bz2) = fde987f35c495fa16b9af1de9a6aed7b -SHA256 (gnome2/gnome-devel-docs-2.22.0.tar.bz2) = 96f0489d51c10855b6dda303d5b58fccac4f162bc39ffd5d4f23905ae7d07a82 -SIZE (gnome2/gnome-devel-docs-2.22.0.tar.bz2) = 2732641 +MD5 (gnome2/gnome-devel-docs-2.24.1.tar.bz2) = 8bee78fac9f816e485cb888cd65f2a9e +SHA256 (gnome2/gnome-devel-docs-2.24.1.tar.bz2) = 49b1a3b0205db641783b8033a95d5b7faf7831a537c9d4521c081d0c90fd8390 +SIZE (gnome2/gnome-devel-docs-2.24.1.tar.bz2) = 3012400 diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist index fa595e2d0494..c7193d9b6aa0 100644 --- a/misc/gnome-devel-docs/pkg-plist +++ b/misc/gnome-devel-docs/pkg-plist @@ -97,24 +97,6 @@ share/gnome/help/hig-book/C/hig-ch-principles.xml share/gnome/help/hig-book/C/hig-ch-toolbars.xml share/gnome/help/hig-book/C/hig-ch-whatsnew.xml share/gnome/help/hig-book/C/hig-ch-windows.xml -share/gnome/help/hig-book/C/images/EvoToolbar.png -share/gnome/help/hig-book/C/images/GtkToolbar.png -share/gnome/help/hig-book/C/images/GtkToolbar_browserdefault.png -share/gnome/help/hig-book/C/images/GtkToolbar_gedit.png -share/gnome/help/hig-book/C/images/GtkToolbar_productivitydefault.png -share/gnome/help/hig-book/C/images/abiword-icon.png -share/gnome/help/hig-book/C/images/action-icon.png -share/gnome/help/hig-book/C/images/application-edit-menu.png -share/gnome/help/hig-book/C/images/application-icons.png -share/gnome/help/hig-book/C/images/application-menubar.png -share/gnome/help/hig-book/C/images/browser-toolbar.png -share/gnome/help/hig-book/C/images/busy-pointers.png -share/gnome/help/hig-book/C/images/caution.png -share/gnome/help/hig-book/C/images/checkbox-menu.png -share/gnome/help/hig-book/C/images/checkbox_label.png -share/gnome/help/hig-book/C/images/colour_and_arrows.png -share/gnome/help/hig-book/C/images/colour_only.png -share/gnome/help/hig-book/C/images/command-menu.png share/gnome/help/hig-book/C/images/controls-buttons.png share/gnome/help/hig-book/C/images/controls-check-box-ambiguous.png share/gnome/help/hig-book/C/images/controls-check-boxes-mixed.png @@ -129,6 +111,9 @@ share/gnome/help/hig-book/C/images/controls-notebook-tabs.png share/gnome/help/hig-book/C/images/controls-notebook.png share/gnome/help/hig-book/C/images/controls-old-frames.png share/gnome/help/hig-book/C/images/controls-option-menu.png +share/gnome/help/hig-book/C/images/controls-progress-indeterminate.png +share/gnome/help/hig-book/C/images/controls-progress-time.png +share/gnome/help/hig-book/C/images/controls-progress-typical.png share/gnome/help/hig-book/C/images/controls-radio-button-mixed.png share/gnome/help/hig-book/C/images/controls-radio-buttons.png share/gnome/help/hig-book/C/images/controls-sensitivity.png @@ -144,51 +129,9 @@ share/gnome/help/hig-book/C/images/controls-toggle-button-mixed.png share/gnome/help/hig-book/C/images/controls-toggle-buttons.png share/gnome/help/hig-book/C/images/controls-tree-checkbox.png share/gnome/help/hig-book/C/images/controls-tree.png -share/gnome/help/hig-book/C/images/depend1.png -share/gnome/help/hig-book/C/images/depend1a.png -share/gnome/help/hig-book/C/images/depend2.png -share/gnome/help/hig-book/C/images/depend2a.png -share/gnome/help/hig-book/C/images/depend3.png share/gnome/help/hig-book/C/images/desktop-applications-menu.png -share/gnome/help/hig-book/C/images/df.png -share/gnome/help/hig-book/C/images/dragcursor-augmented.png -share/gnome/help/hig-book/C/images/dragcursor-copy.png -share/gnome/help/hig-book/C/images/dragcursor-link.png -share/gnome/help/hig-book/C/images/dragcursor-move.png -share/gnome/help/hig-book/C/images/dragcursor-nodrop.png -share/gnome/help/hig-book/C/images/dragcursor-rmb.png -share/gnome/help/hig-book/C/images/earthDeutan.png -share/gnome/help/hig-book/C/images/earthNorm.png -share/gnome/help/hig-book/C/images/earthTritan.png -share/gnome/help/hig-book/C/images/evolution-icon.png -share/gnome/help/hig-book/C/images/file-menu.png -share/gnome/help/hig-book/C/images/floppy-dissected.png -share/gnome/help/hig-book/C/images/fontsel-icon.png -share/gnome/help/hig-book/C/images/fontsel-suggestion.png -share/gnome/help/hig-book/C/images/gdiskfree-menu.png -share/gnome/help/hig-book/C/images/gdiskfree.png -share/gnome/help/hig-book/C/images/gedit-icon.png -share/gnome/help/hig-book/C/images/generic-bookmarks-menu.png -share/gnome/help/hig-book/C/images/generic-browser-go-menu.png -share/gnome/help/hig-book/C/images/generic-document-go-menu.png -share/gnome/help/hig-book/C/images/generic-format-menu.png -share/gnome/help/hig-book/C/images/generic-help-menu.png -share/gnome/help/hig-book/C/images/generic-insert-menu.png -share/gnome/help/hig-book/C/images/generic-view-menu.png -share/gnome/help/hig-book/C/images/generic-windows-menu.png -share/gnome/help/hig-book/C/images/gide-icon.png -share/gnome/help/hig-book/C/images/glyph-icon.png -share/gnome/help/hig-book/C/images/gnome-http-url.png -share/gnome/help/hig-book/C/images/gnome-package.png -share/gnome/help/hig-book/C/images/gnome-text-x-readme.png -share/gnome/help/hig-book/C/images/gnumeric-icon.png -share/gnome/help/hig-book/C/images/highcontrast-book-blur.png -share/gnome/help/hig-book/C/images/highcontrast-book.png -share/gnome/help/hig-book/C/images/highcontrast-cdrom-blur.png -share/gnome/help/hig-book/C/images/highcontrast-cdrom.png -share/gnome/help/hig-book/C/images/highcontrast-copy-blur.png -share/gnome/help/hig-book/C/images/highcontrast-copy.png -share/gnome/help/hig-book/C/images/highcontrast-metaphors.png +share/gnome/help/hig-book/C/images/feedback-checklist-running.png +share/gnome/help/hig-book/C/images/feedback-pointers-busy.png share/gnome/help/hig-book/C/images/icon-design-process-1.png share/gnome/help/hig-book/C/images/icon-design-process-10.png share/gnome/help/hig-book/C/images/icon-design-process-11.png @@ -201,98 +144,113 @@ share/gnome/help/hig-book/C/images/icon-design-process-6.png share/gnome/help/hig-book/C/images/icon-design-process-7.png share/gnome/help/hig-book/C/images/icon-design-process-8.png share/gnome/help/hig-book/C/images/icon-design-process-9.png -share/gnome/help/hig-book/C/images/icon-style-aqua.png -share/gnome/help/hig-book/C/images/icon-style-gnome.png -share/gnome/help/hig-book/C/images/icon-style-java.png -share/gnome/help/hig-book/C/images/icon_perspective_shelf.png -share/gnome/help/hig-book/C/images/icon_perspective_table.png -share/gnome/help/hig-book/C/images/icons_labels.png -share/gnome/help/hig-book/C/images/important.png -share/gnome/help/hig-book/C/images/installer-icon.png -share/gnome/help/hig-book/C/images/label_above.png -share/gnome/help/hig-book/C/images/label_below.png -share/gnome/help/hig-book/C/images/label_left.png -share/gnome/help/hig-book/C/images/label_right.png -share/gnome/help/hig-book/C/images/large_icon_label.png -share/gnome/help/hig-book/C/images/layout1.png -share/gnome/help/hig-book/C/images/layout2.png -share/gnome/help/hig-book/C/images/layout_callouts.png -share/gnome/help/hig-book/C/images/levels-lowcontrast.png -share/gnome/help/hig-book/C/images/list_control_label.png -share/gnome/help/hig-book/C/images/log-icon.png -share/gnome/help/hig-book/C/images/manual-alert-spacing.png -share/gnome/help/hig-book/C/images/manual-button-ordering.png -share/gnome/help/hig-book/C/images/menu-icons.png -share/gnome/help/hig-book/C/images/mnemonics_and_shortcuts.png -share/gnome/help/hig-book/C/images/nautilus-icon.png -share/gnome/help/hig-book/C/images/note.png -share/gnome/help/hig-book/C/images/object-icon.png -share/gnome/help/hig-book/C/images/object-icons.png -share/gnome/help/hig-book/C/images/object-menu.png -share/gnome/help/hig-book/C/images/object-menubar.png -share/gnome/help/hig-book/C/images/other_labels.png -share/gnome/help/hig-book/C/images/palette-1.png -share/gnome/help/hig-book/C/images/palette-10.png -share/gnome/help/hig-book/C/images/palette-11.png -share/gnome/help/hig-book/C/images/palette-12.png -share/gnome/help/hig-book/C/images/palette-13.png -share/gnome/help/hig-book/C/images/palette-14.png -share/gnome/help/hig-book/C/images/palette-15.png -share/gnome/help/hig-book/C/images/palette-16.png -share/gnome/help/hig-book/C/images/palette-17.png -share/gnome/help/hig-book/C/images/palette-18.png -share/gnome/help/hig-book/C/images/palette-19.png -share/gnome/help/hig-book/C/images/palette-2.png -share/gnome/help/hig-book/C/images/palette-20.png -share/gnome/help/hig-book/C/images/palette-21.png -share/gnome/help/hig-book/C/images/palette-22.png -share/gnome/help/hig-book/C/images/palette-23.png -share/gnome/help/hig-book/C/images/palette-24.png -share/gnome/help/hig-book/C/images/palette-25.png -share/gnome/help/hig-book/C/images/palette-26.png -share/gnome/help/hig-book/C/images/palette-27.png -share/gnome/help/hig-book/C/images/palette-28.png -share/gnome/help/hig-book/C/images/palette-29.png -share/gnome/help/hig-book/C/images/palette-3.png -share/gnome/help/hig-book/C/images/palette-30.png -share/gnome/help/hig-book/C/images/palette-31.png -share/gnome/help/hig-book/C/images/palette-32.png -share/gnome/help/hig-book/C/images/palette-4.png -share/gnome/help/hig-book/C/images/palette-5.png -share/gnome/help/hig-book/C/images/palette-6.png -share/gnome/help/hig-book/C/images/palette-7.png -share/gnome/help/hig-book/C/images/palette-8.png -share/gnome/help/hig-book/C/images/palette-9.png -share/gnome/help/hig-book/C/images/pointingdevices.png -share/gnome/help/hig-book/C/images/popup-menu.png -share/gnome/help/hig-book/C/images/progress-checklist-with-bar.png -share/gnome/help/hig-book/C/images/progress-checklist.png -share/gnome/help/hig-book/C/images/progress-indeterminate.png -share/gnome/help/hig-book/C/images/progress-proportion.png -share/gnome/help/hig-book/C/images/progress-time.png -share/gnome/help/hig-book/C/images/progress-typical-time.png -share/gnome/help/hig-book/C/images/quit1.png -share/gnome/help/hig-book/C/images/quit2.png -share/gnome/help/hig-book/C/images/radio_button_label.png -share/gnome/help/hig-book/C/images/radiobutton-menu.png -share/gnome/help/hig-book/C/images/rubberband.png -share/gnome/help/hig-book/C/images/rubberband_dia.png -share/gnome/help/hig-book/C/images/save1.png -share/gnome/help/hig-book/C/images/save2.png -share/gnome/help/hig-book/C/images/shutdown-icon.png -share/gnome/help/hig-book/C/images/size-48x48.png -share/gnome/help/hig-book/C/images/small_icon_label.png -share/gnome/help/hig-book/C/images/sodipodi-icon.png -share/gnome/help/hig-book/C/images/softwareupdateicon.png -share/gnome/help/hig-book/C/images/stock_save.png -share/gnome/help/hig-book/C/images/submenu.png -share/gnome/help/hig-book/C/images/textbox_label.png -share/gnome/help/hig-book/C/images/tip.png -share/gnome/help/hig-book/C/images/toolbar-icons.png -share/gnome/help/hig-book/C/images/toolbar-silhouette.png -share/gnome/help/hig-book/C/images/underline-icon.png -share/gnome/help/hig-book/C/images/view-toolbar.png -share/gnome/help/hig-book/C/images/warning.png +share/gnome/help/hig-book/C/images/icons-applications.png +share/gnome/help/hig-book/C/images/icons-evolution.png +share/gnome/help/hig-book/C/images/icons-floppy-dissected.png +share/gnome/help/hig-book/C/images/icons-font-selection-good.png +share/gnome/help/hig-book/C/images/icons-font-selection-poor.png +share/gnome/help/hig-book/C/images/icons-gedit.png +share/gnome/help/hig-book/C/images/icons-gnumeric.png +share/gnome/help/hig-book/C/images/icons-hc-book-blur.png +share/gnome/help/hig-book/C/images/icons-hc-book.png +share/gnome/help/hig-book/C/images/icons-hc-cdrom-blur.png +share/gnome/help/hig-book/C/images/icons-hc-cdrom.png +share/gnome/help/hig-book/C/images/icons-hc-copy-blur.png +share/gnome/help/hig-book/C/images/icons-hc-copy.png +share/gnome/help/hig-book/C/images/icons-hc-metaphors.png +share/gnome/help/hig-book/C/images/icons-lowcontrast-levels.png +share/gnome/help/hig-book/C/images/icons-menu.png +share/gnome/help/hig-book/C/images/icons-nautilus.png +share/gnome/help/hig-book/C/images/icons-objects.png +share/gnome/help/hig-book/C/images/icons-perspective-shelf.png +share/gnome/help/hig-book/C/images/icons-perspective-table.png +share/gnome/help/hig-book/C/images/icons-shut-down.png +share/gnome/help/hig-book/C/images/icons-silhouette.png +share/gnome/help/hig-book/C/images/icons-sodipodi.png +share/gnome/help/hig-book/C/images/icons-style-aqua.png +share/gnome/help/hig-book/C/images/icons-style-gnome.png +share/gnome/help/hig-book/C/images/icons-style-java.png +share/gnome/help/hig-book/C/images/icons-system-log.png +share/gnome/help/hig-book/C/images/icons-toolbar.png +share/gnome/help/hig-book/C/images/icons-underline-text.png +share/gnome/help/hig-book/C/images/icons-word-processor.png +share/gnome/help/hig-book/C/images/input-accesskeys-shortcuts.png +share/gnome/help/hig-book/C/images/input-drag-cursor-copy.png +share/gnome/help/hig-book/C/images/input-drag-cursor-link.png +share/gnome/help/hig-book/C/images/input-drag-cursor-move.png +share/gnome/help/hig-book/C/images/input-drag-cursor-nodrop.png +share/gnome/help/hig-book/C/images/input-drag-cursor-query.png +share/gnome/help/hig-book/C/images/input-drag-cursor.png +share/gnome/help/hig-book/C/images/input-drag-select-files.png +share/gnome/help/hig-book/C/images/input-drag-select-graphics.png +share/gnome/help/hig-book/C/images/input-pointing-devices.png +share/gnome/help/hig-book/C/images/menus-application.png +share/gnome/help/hig-book/C/images/menus-bookmarks.png +share/gnome/help/hig-book/C/images/menus-checkbox-group.png +share/gnome/help/hig-book/C/images/menus-command-group.png +share/gnome/help/hig-book/C/images/menus-dropdown.png +share/gnome/help/hig-book/C/images/menus-edit.png +share/gnome/help/hig-book/C/images/menus-file.png +share/gnome/help/hig-book/C/images/menus-format.png +share/gnome/help/hig-book/C/images/menus-go-browser.png +share/gnome/help/hig-book/C/images/menus-go-document.png +share/gnome/help/hig-book/C/images/menus-help.png +share/gnome/help/hig-book/C/images/menus-insert.png +share/gnome/help/hig-book/C/images/menus-popup.png +share/gnome/help/hig-book/C/images/menus-radiobutton-group.png +share/gnome/help/hig-book/C/images/menus-submenu.png +share/gnome/help/hig-book/C/images/menus-view.png +share/gnome/help/hig-book/C/images/menus-windows.png +share/gnome/help/hig-book/C/images/toolbars-configure-menu.png +share/gnome/help/hig-book/C/images/toolbars-labels-below.png +share/gnome/help/hig-book/C/images/toolbars-labels-beside.png +share/gnome/help/hig-book/C/images/toolbars-mail.png +share/gnome/help/hig-book/C/images/visdes-button-label.png +share/gnome/help/hig-book/C/images/visdes-colorblind-deutan.png +share/gnome/help/hig-book/C/images/visdes-colorblind-normal.png +share/gnome/help/hig-book/C/images/visdes-colorblind-tritan.png +share/gnome/help/hig-book/C/images/visdes-large-icon-label.png +share/gnome/help/hig-book/C/images/visdes-layout-annotated.png +share/gnome/help/hig-book/C/images/visdes-layout-good.png +share/gnome/help/hig-book/C/images/visdes-layout-poor.png +share/gnome/help/hig-book/C/images/visdes-list-label.png +share/gnome/help/hig-book/C/images/visdes-other-labels.png +share/gnome/help/hig-book/C/images/visdes-palette-1.png +share/gnome/help/hig-book/C/images/visdes-palette-10.png +share/gnome/help/hig-book/C/images/visdes-palette-11.png +share/gnome/help/hig-book/C/images/visdes-palette-12.png +share/gnome/help/hig-book/C/images/visdes-palette-13.png +share/gnome/help/hig-book/C/images/visdes-palette-14.png +share/gnome/help/hig-book/C/images/visdes-palette-15.png +share/gnome/help/hig-book/C/images/visdes-palette-16.png +share/gnome/help/hig-book/C/images/visdes-palette-17.png +share/gnome/help/hig-book/C/images/visdes-palette-18.png +share/gnome/help/hig-book/C/images/visdes-palette-19.png +share/gnome/help/hig-book/C/images/visdes-palette-2.png +share/gnome/help/hig-book/C/images/visdes-palette-20.png +share/gnome/help/hig-book/C/images/visdes-palette-21.png +share/gnome/help/hig-book/C/images/visdes-palette-22.png +share/gnome/help/hig-book/C/images/visdes-palette-23.png +share/gnome/help/hig-book/C/images/visdes-palette-24.png +share/gnome/help/hig-book/C/images/visdes-palette-25.png +share/gnome/help/hig-book/C/images/visdes-palette-26.png +share/gnome/help/hig-book/C/images/visdes-palette-27.png +share/gnome/help/hig-book/C/images/visdes-palette-28.png +share/gnome/help/hig-book/C/images/visdes-palette-29.png +share/gnome/help/hig-book/C/images/visdes-palette-3.png +share/gnome/help/hig-book/C/images/visdes-palette-30.png +share/gnome/help/hig-book/C/images/visdes-palette-31.png +share/gnome/help/hig-book/C/images/visdes-palette-32.png +share/gnome/help/hig-book/C/images/visdes-palette-4.png +share/gnome/help/hig-book/C/images/visdes-palette-5.png +share/gnome/help/hig-book/C/images/visdes-palette-6.png +share/gnome/help/hig-book/C/images/visdes-palette-7.png +share/gnome/help/hig-book/C/images/visdes-palette-8.png +share/gnome/help/hig-book/C/images/visdes-palette-9.png +share/gnome/help/hig-book/C/images/visdes-palette.png +share/gnome/help/hig-book/C/images/visdes-radiobutton-label.png +share/gnome/help/hig-book/C/images/visdes-small-icon-label.png +share/gnome/help/hig-book/C/images/visdes-textbox-label.png share/gnome/help/hig-book/C/images/windows-alert-authentication.png share/gnome/help/hig-book/C/images/windows-alert-buttons.png share/gnome/help/hig-book/C/images/windows-alert-confirmation.png @@ -318,8 +276,14 @@ share/gnome/help/hig-book/C/images/windows-sdi.png share/gnome/help/hig-book/C/images/windows-titlebar.png share/gnome/help/hig-book/C/images/windows-toolbox-large.png share/gnome/help/hig-book/C/images/windows-toolbox-small.png -share/gnome/help/hig-book/C/images/ximian-palette.png share/gnome/help/integration-guide/C/integration-guide.xml +share/gnome/help/integration-guide/es/integration-guide.xml +share/gnome/help/optimization-guide/C/figures/massif-after.png +share/gnome/help/optimization-guide/C/figures/massif-before.png +share/gnome/help/optimization-guide/C/optimization-guide.xml +share/gnome/help/optimization-guide/C/optimization-harmful.xml +share/gnome/help/optimization-guide/C/optimization-intro.xml +share/gnome/help/optimization-guide/C/optimization-massif.xml share/gnome/help/platform-overview/C/apx-modules.xml share/gnome/help/platform-overview/C/bindings.xml share/gnome/help/platform-overview/C/core-tech.xml @@ -396,6 +360,8 @@ share/omf/gdp-handbook/gdp-handbook-C.omf share/omf/gdp-style-guide/gdp-style-guide-C.omf share/omf/hig-book/hig-book-C.omf share/omf/integration-guide/integration-guide-C.omf +share/omf/integration-guide/integration-guide-es.omf +share/omf/optimization-guide/optimization-guide-C.omf share/omf/platform-overview/platform-overview-C.omf share/omf/platform-overview/platform-overview-es.omf share/omf/platform-overview/platform-overview-fr.omf @@ -403,6 +369,7 @@ share/omf/platform-overview/platform-overview-it.omf share/omf/platform-overview/platform-overview-oc.omf share/omf/platform-overview/platform-overview-ru.omf @dirrm share/omf/platform-overview +@dirrm share/omf/optimization-guide @dirrm share/omf/integration-guide @dirrm share/omf/hig-book @dirrm share/omf/gdp-style-guide @@ -420,6 +387,10 @@ share/omf/platform-overview/platform-overview-ru.omf @dirrm share/gnome/help/platform-overview/C/figures @dirrm share/gnome/help/platform-overview/C @dirrm share/gnome/help/platform-overview +@dirrm share/gnome/help/optimization-guide/C/figures +@dirrm share/gnome/help/optimization-guide/C +@dirrm share/gnome/help/optimization-guide +@dirrm share/gnome/help/integration-guide/es @dirrm share/gnome/help/integration-guide/C @dirrm share/gnome/help/integration-guide @dirrm share/gnome/help/hig-book/C/images diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 7feea4bf4435..dc8284fb42dc 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.113 2008/03/11 17:31:58 mezz Exp $ +# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.123 2008/09/29 16:17:39 marcus Exp $ # PORTNAME= gnome-icon-theme -PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTVERSION= 2.24.0 +PORTREVISION= 2 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_GNOME= gnomehack intlhack gnometarget gtk20 +USE_GNOME= gnomehack intlhack gtk20 INSTALLS_ICONS= yes CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo index 8741f3f0af06..5852c1efc661 100644 --- a/misc/gnome-icon-theme/distinfo +++ b/misc/gnome-icon-theme/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-icon-theme-2.22.0.tar.bz2) = a4c03092da28ad53ed3867aef83f29d9 -SHA256 (gnome2/gnome-icon-theme-2.22.0.tar.bz2) = 98e4202a7745e0533c7a665fc6d2cc6b4ee851debf159a61d8de706b952ac748 -SIZE (gnome2/gnome-icon-theme-2.22.0.tar.bz2) = 3666577 +MD5 (gnome2/gnome-icon-theme-2.24.0.tar.bz2) = 17ba571e5dd83434dc5b2b06ada7b56e +SHA256 (gnome2/gnome-icon-theme-2.24.0.tar.bz2) = b71f89f9ead65a7d3ccb92f6a6c2fb1719be25d6661dd67a14b5d820ee6831b2 +SIZE (gnome2/gnome-icon-theme-2.24.0.tar.bz2) = 3486226 diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist index cab97f2a7163..61585e0842b6 100644 --- a/misc/gnome-icon-theme/pkg-plist +++ b/misc/gnome-icon-theme/pkg-plist @@ -9,6 +9,8 @@ share/icons/gnome/16x16/actions/bookmark-new.png share/icons/gnome/16x16/actions/bookmark_add.png share/icons/gnome/16x16/actions/bookmarks_list_add.png share/icons/gnome/16x16/actions/bottom.png +share/icons/gnome/16x16/actions/call-start.png +share/icons/gnome/16x16/actions/call-stop.png share/icons/gnome/16x16/actions/centrejust.png share/icons/gnome/16x16/actions/contact-new.png share/icons/gnome/16x16/actions/document-new.png @@ -67,6 +69,7 @@ share/icons/gnome/16x16/actions/gnome-lockscreen.png share/icons/gnome/16x16/actions/gnome-logout.png share/icons/gnome/16x16/actions/gnome-run.png share/icons/gnome/16x16/actions/gnome-searchtool.png +share/icons/gnome/16x16/actions/gnome-shutdown.png share/icons/gnome/16x16/actions/gnome-stock-mail-fwd.png share/icons/gnome/16x16/actions/gnome-stock-mail-new.png share/icons/gnome/16x16/actions/gnome-stock-mail-rpl.png @@ -158,6 +161,7 @@ share/icons/gnome/16x16/actions/gtk-undo-ltr.png share/icons/gnome/16x16/actions/gtk-unindent-ltr.png share/icons/gnome/16x16/actions/gtk-unindent-rtl.png share/icons/gnome/16x16/actions/gtk-zoom-100.png +share/icons/gnome/16x16/actions/gtk-zoom-fit.png share/icons/gnome/16x16/actions/gtk-zoom-in.png share/icons/gnome/16x16/actions/gtk-zoom-out.png share/icons/gnome/16x16/actions/help-about.png @@ -295,11 +299,13 @@ share/icons/gnome/16x16/actions/stock_up.png share/icons/gnome/16x16/actions/stock_zoom-1.png share/icons/gnome/16x16/actions/stock_zoom-in.png share/icons/gnome/16x16/actions/stock_zoom-out.png +share/icons/gnome/16x16/actions/stock_zoom-page.png share/icons/gnome/16x16/actions/stop.png share/icons/gnome/16x16/actions/system-lock-screen.png share/icons/gnome/16x16/actions/system-log-out.png share/icons/gnome/16x16/actions/system-run.png share/icons/gnome/16x16/actions/system-search.png +share/icons/gnome/16x16/actions/system-shutdown.png share/icons/gnome/16x16/actions/tab-new.png share/icons/gnome/16x16/actions/tab_new.png share/icons/gnome/16x16/actions/text_bold.png @@ -318,6 +324,7 @@ share/icons/gnome/16x16/actions/view-sort-descending.png share/icons/gnome/16x16/actions/viewmag+.png share/icons/gnome/16x16/actions/viewmag-.png share/icons/gnome/16x16/actions/viewmag1.png +share/icons/gnome/16x16/actions/viewmagfit.png share/icons/gnome/16x16/actions/window-close.png share/icons/gnome/16x16/actions/window-new.png share/icons/gnome/16x16/actions/window_fullscreen.png @@ -325,6 +332,7 @@ share/icons/gnome/16x16/actions/window_new.png share/icons/gnome/16x16/actions/window_nofullscreen.png share/icons/gnome/16x16/actions/xfce-system-exit.png share/icons/gnome/16x16/actions/xfce-system-lock.png +share/icons/gnome/16x16/actions/zoom-best-fit.png share/icons/gnome/16x16/actions/zoom-fit-best.png share/icons/gnome/16x16/actions/zoom-in.png share/icons/gnome/16x16/actions/zoom-original.png @@ -342,7 +350,6 @@ share/icons/gnome/16x16/apps/accessories-text-editor.png share/icons/gnome/16x16/apps/applets-screenshooter.png share/icons/gnome/16x16/apps/arts.png share/icons/gnome/16x16/apps/background.png -share/icons/gnome/16x16/apps/boot.png share/icons/gnome/16x16/apps/calc.png share/icons/gnome/16x16/apps/config-language.png share/icons/gnome/16x16/apps/config-users.png @@ -359,8 +366,6 @@ share/icons/gnome/16x16/apps/gnome-settings-background.png share/icons/gnome/16x16/apps/gnome-settings-font.png share/icons/gnome/16x16/apps/gnome-settings-keybindings.png share/icons/gnome/16x16/apps/gnome-settings-theme.png -share/icons/gnome/16x16/apps/gnome-settings-ui-behavior.png -share/icons/gnome/16x16/apps/gnome-shutdown.png share/icons/gnome/16x16/apps/gnome-terminal.png share/icons/gnome/16x16/apps/gnome-window-manager.png share/icons/gnome/16x16/apps/gtk-help.png @@ -410,7 +415,7 @@ share/icons/gnome/16x16/apps/style.png share/icons/gnome/16x16/apps/susehelpcenter.png share/icons/gnome/16x16/apps/system-config-users.png share/icons/gnome/16x16/apps/system-file-manager.png -share/icons/gnome/16x16/apps/system-software-installer.png +share/icons/gnome/16x16/apps/system-software-install.png share/icons/gnome/16x16/apps/system-software-update.png share/icons/gnome/16x16/apps/system-users.png share/icons/gnome/16x16/apps/terminal.png @@ -724,6 +729,8 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kspread.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-kword.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lha.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lhz.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png +share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-lzma.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-ms-dos-executable.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-perl.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-php.png @@ -827,6 +834,8 @@ share/icons/gnome/16x16/places/gnome-stock-trash.png share/icons/gnome/16x16/places/gtk-directory.icon share/icons/gnome/16x16/places/gtk-directory.png share/icons/gnome/16x16/places/gtk-network.png +share/icons/gnome/16x16/places/inode-directory.icon +share/icons/gnome/16x16/places/inode-directory.png share/icons/gnome/16x16/places/network-server.png share/icons/gnome/16x16/places/network-workgroup.png share/icons/gnome/16x16/places/network.png @@ -838,6 +847,7 @@ share/icons/gnome/16x16/places/start-here.png share/icons/gnome/16x16/places/stock_folder.icon share/icons/gnome/16x16/places/stock_folder.png share/icons/gnome/16x16/places/trashcan_empty.png +share/icons/gnome/16x16/places/user-bookmarks.png share/icons/gnome/16x16/places/user-desktop.png share/icons/gnome/16x16/places/user-home.png share/icons/gnome/16x16/places/user-trash.png @@ -1370,7 +1380,6 @@ share/icons/gnome/16x16/stock/image/stock_wallpaper-center.png share/icons/gnome/16x16/stock/image/stock_wallpaper-fill.png share/icons/gnome/16x16/stock/image/stock_wallpaper-scale.png share/icons/gnome/16x16/stock/image/stock_wallpaper-tile.png -share/icons/gnome/16x16/stock/io/stock_bluetooth.png share/icons/gnome/16x16/stock/io/stock_export.png share/icons/gnome/16x16/stock/io/stock_insert-file.png share/icons/gnome/16x16/stock/io/stock_network-printer.png @@ -1741,6 +1750,8 @@ share/icons/gnome/22x22/actions/bookmark-new.png share/icons/gnome/22x22/actions/bookmark_add.png share/icons/gnome/22x22/actions/bookmarks_list_add.png share/icons/gnome/22x22/actions/bottom.png +share/icons/gnome/22x22/actions/call-start.png +share/icons/gnome/22x22/actions/call-stop.png share/icons/gnome/22x22/actions/centrejust.png share/icons/gnome/22x22/actions/contact-new.png share/icons/gnome/22x22/actions/document-new.png @@ -1799,6 +1810,7 @@ share/icons/gnome/22x22/actions/gnome-lockscreen.png share/icons/gnome/22x22/actions/gnome-logout.png share/icons/gnome/22x22/actions/gnome-run.png share/icons/gnome/22x22/actions/gnome-searchtool.png +share/icons/gnome/22x22/actions/gnome-shutdown.png share/icons/gnome/22x22/actions/gnome-stock-mail-fwd.png share/icons/gnome/22x22/actions/gnome-stock-mail-new.png share/icons/gnome/22x22/actions/gnome-stock-mail-rpl.png @@ -1890,6 +1902,7 @@ share/icons/gnome/22x22/actions/gtk-undo-ltr.png share/icons/gnome/22x22/actions/gtk-unindent-ltr.png share/icons/gnome/22x22/actions/gtk-unindent-rtl.png share/icons/gnome/22x22/actions/gtk-zoom-100.png +share/icons/gnome/22x22/actions/gtk-zoom-fit.png share/icons/gnome/22x22/actions/gtk-zoom-in.png share/icons/gnome/22x22/actions/gtk-zoom-out.png share/icons/gnome/22x22/actions/help-about.png @@ -2027,11 +2040,13 @@ share/icons/gnome/22x22/actions/stock_up.png share/icons/gnome/22x22/actions/stock_zoom-1.png share/icons/gnome/22x22/actions/stock_zoom-in.png share/icons/gnome/22x22/actions/stock_zoom-out.png +share/icons/gnome/22x22/actions/stock_zoom-page.png share/icons/gnome/22x22/actions/stop.png share/icons/gnome/22x22/actions/system-lock-screen.png share/icons/gnome/22x22/actions/system-log-out.png share/icons/gnome/22x22/actions/system-run.png share/icons/gnome/22x22/actions/system-search.png +share/icons/gnome/22x22/actions/system-shutdown.png share/icons/gnome/22x22/actions/tab-new.png share/icons/gnome/22x22/actions/tab_new.png share/icons/gnome/22x22/actions/text_bold.png @@ -2050,6 +2065,7 @@ share/icons/gnome/22x22/actions/view-sort-descending.png share/icons/gnome/22x22/actions/viewmag+.png share/icons/gnome/22x22/actions/viewmag-.png share/icons/gnome/22x22/actions/viewmag1.png +share/icons/gnome/22x22/actions/viewmagfit.png share/icons/gnome/22x22/actions/window-close.png share/icons/gnome/22x22/actions/window-new.png share/icons/gnome/22x22/actions/window_fullscreen.png @@ -2057,6 +2073,7 @@ share/icons/gnome/22x22/actions/window_new.png share/icons/gnome/22x22/actions/window_nofullscreen.png share/icons/gnome/22x22/actions/xfce-system-exit.png share/icons/gnome/22x22/actions/xfce-system-lock.png +share/icons/gnome/22x22/actions/zoom-best-fit.png share/icons/gnome/22x22/actions/zoom-fit-best.png share/icons/gnome/22x22/actions/zoom-in.png share/icons/gnome/22x22/actions/zoom-original.png @@ -2074,7 +2091,6 @@ share/icons/gnome/22x22/apps/accessories-text-editor.png share/icons/gnome/22x22/apps/applets-screenshooter.png share/icons/gnome/22x22/apps/arts.png share/icons/gnome/22x22/apps/background.png -share/icons/gnome/22x22/apps/boot.png share/icons/gnome/22x22/apps/calc.png share/icons/gnome/22x22/apps/config-language.png share/icons/gnome/22x22/apps/config-users.png @@ -2091,8 +2107,6 @@ share/icons/gnome/22x22/apps/gnome-settings-background.png share/icons/gnome/22x22/apps/gnome-settings-font.png share/icons/gnome/22x22/apps/gnome-settings-keybindings.png share/icons/gnome/22x22/apps/gnome-settings-theme.png -share/icons/gnome/22x22/apps/gnome-settings-ui-behavior.png -share/icons/gnome/22x22/apps/gnome-shutdown.png share/icons/gnome/22x22/apps/gnome-terminal.png share/icons/gnome/22x22/apps/gnome-window-manager.png share/icons/gnome/22x22/apps/gtk-help.png @@ -2141,7 +2155,7 @@ share/icons/gnome/22x22/apps/style.png share/icons/gnome/22x22/apps/susehelpcenter.png share/icons/gnome/22x22/apps/system-config-users.png share/icons/gnome/22x22/apps/system-file-manager.png -share/icons/gnome/22x22/apps/system-software-installer.png +share/icons/gnome/22x22/apps/system-software-install.png share/icons/gnome/22x22/apps/system-software-update.png share/icons/gnome/22x22/apps/system-users.png share/icons/gnome/22x22/apps/terminal.png @@ -2453,6 +2467,8 @@ share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-kspread.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-kword.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-lha.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-lhz.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png +share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-lzma.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-ms-dos-executable.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-perl.png share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-php.png @@ -2556,6 +2572,8 @@ share/icons/gnome/22x22/places/gnome-stock-trash.png share/icons/gnome/22x22/places/gtk-directory.icon share/icons/gnome/22x22/places/gtk-directory.png share/icons/gnome/22x22/places/gtk-network.png +share/icons/gnome/22x22/places/inode-directory.icon +share/icons/gnome/22x22/places/inode-directory.png share/icons/gnome/22x22/places/network-server.png share/icons/gnome/22x22/places/network-workgroup.png share/icons/gnome/22x22/places/network.png @@ -2567,6 +2585,7 @@ share/icons/gnome/22x22/places/start-here.png share/icons/gnome/22x22/places/stock_folder.icon share/icons/gnome/22x22/places/stock_folder.png share/icons/gnome/22x22/places/trashcan_empty.png +share/icons/gnome/22x22/places/user-bookmarks.png share/icons/gnome/22x22/places/user-desktop.png share/icons/gnome/22x22/places/user-home.png share/icons/gnome/22x22/places/user-trash.png @@ -2704,6 +2723,8 @@ share/icons/gnome/24x24/actions/bookmark-new.png share/icons/gnome/24x24/actions/bookmark_add.png share/icons/gnome/24x24/actions/bookmarks_list_add.png share/icons/gnome/24x24/actions/bottom.png +share/icons/gnome/24x24/actions/call-start.png +share/icons/gnome/24x24/actions/call-stop.png share/icons/gnome/24x24/actions/centrejust.png share/icons/gnome/24x24/actions/contact-new.png share/icons/gnome/24x24/actions/document-new.png @@ -2762,6 +2783,7 @@ share/icons/gnome/24x24/actions/gnome-lockscreen.png share/icons/gnome/24x24/actions/gnome-logout.png share/icons/gnome/24x24/actions/gnome-run.png share/icons/gnome/24x24/actions/gnome-searchtool.png +share/icons/gnome/24x24/actions/gnome-shutdown.png share/icons/gnome/24x24/actions/gnome-stock-mail-fwd.png share/icons/gnome/24x24/actions/gnome-stock-mail-new.png share/icons/gnome/24x24/actions/gnome-stock-mail-rpl.png @@ -2853,6 +2875,7 @@ share/icons/gnome/24x24/actions/gtk-undo-ltr.png share/icons/gnome/24x24/actions/gtk-unindent-ltr.png share/icons/gnome/24x24/actions/gtk-unindent-rtl.png share/icons/gnome/24x24/actions/gtk-zoom-100.png +share/icons/gnome/24x24/actions/gtk-zoom-fit.png share/icons/gnome/24x24/actions/gtk-zoom-in.png share/icons/gnome/24x24/actions/gtk-zoom-out.png share/icons/gnome/24x24/actions/help-about.png @@ -2990,11 +3013,13 @@ share/icons/gnome/24x24/actions/stock_up.png share/icons/gnome/24x24/actions/stock_zoom-1.png share/icons/gnome/24x24/actions/stock_zoom-in.png share/icons/gnome/24x24/actions/stock_zoom-out.png +share/icons/gnome/24x24/actions/stock_zoom-page.png share/icons/gnome/24x24/actions/stop.png share/icons/gnome/24x24/actions/system-lock-screen.png share/icons/gnome/24x24/actions/system-log-out.png share/icons/gnome/24x24/actions/system-run.png share/icons/gnome/24x24/actions/system-search.png +share/icons/gnome/24x24/actions/system-shutdown.png share/icons/gnome/24x24/actions/tab-new.png share/icons/gnome/24x24/actions/tab_new.png share/icons/gnome/24x24/actions/text_bold.png @@ -3013,6 +3038,7 @@ share/icons/gnome/24x24/actions/view-sort-descending.png share/icons/gnome/24x24/actions/viewmag+.png share/icons/gnome/24x24/actions/viewmag-.png share/icons/gnome/24x24/actions/viewmag1.png +share/icons/gnome/24x24/actions/viewmagfit.png share/icons/gnome/24x24/actions/window-close.png share/icons/gnome/24x24/actions/window-new.png share/icons/gnome/24x24/actions/window_fullscreen.png @@ -3020,6 +3046,7 @@ share/icons/gnome/24x24/actions/window_new.png share/icons/gnome/24x24/actions/window_nofullscreen.png share/icons/gnome/24x24/actions/xfce-system-exit.png share/icons/gnome/24x24/actions/xfce-system-lock.png +share/icons/gnome/24x24/actions/zoom-best-fit.png share/icons/gnome/24x24/actions/zoom-fit-best.png share/icons/gnome/24x24/actions/zoom-in.png share/icons/gnome/24x24/actions/zoom-original.png @@ -3034,50 +3061,26 @@ share/icons/gnome/24x24/apps/accessories-calculator.png share/icons/gnome/24x24/apps/accessories-character-map.png share/icons/gnome/24x24/apps/accessories-dictionary.png share/icons/gnome/24x24/apps/accessories-text-editor.png -share/icons/gnome/24x24/apps/administration.png -share/icons/gnome/24x24/apps/advanced-directory.png -share/icons/gnome/24x24/apps/apacheconf.png share/icons/gnome/24x24/apps/applets-screenshooter.png share/icons/gnome/24x24/apps/arts.png share/icons/gnome/24x24/apps/background.png -share/icons/gnome/24x24/apps/boot.png share/icons/gnome/24x24/apps/calc.png -share/icons/gnome/24x24/apps/character-picker.png share/icons/gnome/24x24/apps/config-language.png share/icons/gnome/24x24/apps/config-users.png -share/icons/gnome/24x24/apps/display-capplet.png -share/icons/gnome/24x24/apps/evolution-calendar.png -share/icons/gnome/24x24/apps/evolution-mail.png -share/icons/gnome/24x24/apps/evolution-tasks.png share/icons/gnome/24x24/apps/file-manager.png share/icons/gnome/24x24/apps/fonts.png -share/icons/gnome/24x24/apps/gdm.png -share/icons/gnome/24x24/apps/gnome-amusements.png -share/icons/gnome/24x24/apps/gnome-audio.png share/icons/gnome/24x24/apps/gnome-calculator.png share/icons/gnome/24x24/apps/gnome-character-map.png -share/icons/gnome/24x24/apps/gnome-cpu.png -share/icons/gnome/24x24/apps/gnome-desktop-config.png -share/icons/gnome/24x24/apps/gnome-eyes.png -share/icons/gnome/24x24/apps/gnome-favorites.png -share/icons/gnome/24x24/apps/gnome-finance.png share/icons/gnome/24x24/apps/gnome-help.png -share/icons/gnome/24x24/apps/gnome-mini-commander.png share/icons/gnome/24x24/apps/gnome-mixer.png share/icons/gnome/24x24/apps/gnome-monitor.png -share/icons/gnome/24x24/apps/gnome-networktool.png share/icons/gnome/24x24/apps/gnome-remote-desktop.png share/icons/gnome/24x24/apps/gnome-settings-accessibility-technologies.png share/icons/gnome/24x24/apps/gnome-settings-background.png share/icons/gnome/24x24/apps/gnome-settings-font.png share/icons/gnome/24x24/apps/gnome-settings-keybindings.png -share/icons/gnome/24x24/apps/gnome-settings-sound.png share/icons/gnome/24x24/apps/gnome-settings-theme.png -share/icons/gnome/24x24/apps/gnome-settings-ui-behavior.png -share/icons/gnome/24x24/apps/gnome-shutdown.png -share/icons/gnome/24x24/apps/gnome-status.png share/icons/gnome/24x24/apps/gnome-terminal.png -share/icons/gnome/24x24/apps/gnome-unknown.png share/icons/gnome/24x24/apps/gnome-window-manager.png share/icons/gnome/24x24/apps/gtk-help.png share/icons/gnome/24x24/apps/gucharmap.png @@ -3107,17 +3110,7 @@ share/icons/gnome/24x24/apps/locale.png share/icons/gnome/24x24/apps/logviewer.png share/icons/gnome/24x24/apps/multimedia-volume-control.png share/icons/gnome/24x24/apps/multimedia.png -share/icons/gnome/24x24/apps/ooo_calc.png -share/icons/gnome/24x24/apps/ooo_draw.png -share/icons/gnome/24x24/apps/ooo_gulls.png -share/icons/gnome/24x24/apps/ooo_impress.png -share/icons/gnome/24x24/apps/ooo_math.png -share/icons/gnome/24x24/apps/ooo_printeradmin.png -share/icons/gnome/24x24/apps/ooo_template.png -share/icons/gnome/24x24/apps/ooo_web.png -share/icons/gnome/24x24/apps/ooo_writer.png share/icons/gnome/24x24/apps/openterm.png -share/icons/gnome/24x24/apps/postscript-viewer.png share/icons/gnome/24x24/apps/preferences-desktop-accessibility.png share/icons/gnome/24x24/apps/preferences-desktop-font.png share/icons/gnome/24x24/apps/preferences-desktop-keyboard-shortcuts.png @@ -3130,14 +3123,12 @@ share/icons/gnome/24x24/apps/preferences-desktop-wallpaper.png share/icons/gnome/24x24/apps/preferences-system-windows.png share/icons/gnome/24x24/apps/redhat-filemanager.png share/icons/gnome/24x24/apps/screensaver.png -share/icons/gnome/24x24/apps/shares.png -share/icons/gnome/24x24/apps/stock-ticker.png share/icons/gnome/24x24/apps/stock_help.png share/icons/gnome/24x24/apps/style.png share/icons/gnome/24x24/apps/susehelpcenter.png share/icons/gnome/24x24/apps/system-config-users.png share/icons/gnome/24x24/apps/system-file-manager.png -share/icons/gnome/24x24/apps/system-software-installer.png +share/icons/gnome/24x24/apps/system-software-install.png share/icons/gnome/24x24/apps/system-software-update.png share/icons/gnome/24x24/apps/system-users.png share/icons/gnome/24x24/apps/terminal.png @@ -3451,6 +3442,8 @@ share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-kspread.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-kword.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-lha.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-lhz.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png +share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-lzma.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-ms-dos-executable.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-perl.png share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-php.png @@ -3554,6 +3547,8 @@ share/icons/gnome/24x24/places/gnome-stock-trash.png share/icons/gnome/24x24/places/gtk-directory.icon share/icons/gnome/24x24/places/gtk-directory.png share/icons/gnome/24x24/places/gtk-network.png +share/icons/gnome/24x24/places/inode-directory.icon +share/icons/gnome/24x24/places/inode-directory.png share/icons/gnome/24x24/places/network-server.png share/icons/gnome/24x24/places/network-workgroup.png share/icons/gnome/24x24/places/network.png @@ -3565,6 +3560,7 @@ share/icons/gnome/24x24/places/start-here.png share/icons/gnome/24x24/places/stock_folder.icon share/icons/gnome/24x24/places/stock_folder.png share/icons/gnome/24x24/places/trashcan_empty.png +share/icons/gnome/24x24/places/user-bookmarks.png share/icons/gnome/24x24/places/user-desktop.png share/icons/gnome/24x24/places/user-home.png share/icons/gnome/24x24/places/user-trash.png @@ -4041,7 +4037,6 @@ share/icons/gnome/24x24/stock/image/stock_rotation-mode.png share/icons/gnome/24x24/stock/image/stock_shadow.png share/icons/gnome/24x24/stock/image/stock_show-draw-functions.png share/icons/gnome/24x24/stock/image/stock_toggle-graphics.png -share/icons/gnome/24x24/stock/io/stock_bluetooth.png share/icons/gnome/24x24/stock/io/stock_export.png share/icons/gnome/24x24/stock/io/stock_insert-file.png share/icons/gnome/24x24/stock/io/stock_network-printer.png @@ -4323,6 +4318,8 @@ share/icons/gnome/32x32/actions/bookmark-new.png share/icons/gnome/32x32/actions/bookmark_add.png share/icons/gnome/32x32/actions/bookmarks_list_add.png share/icons/gnome/32x32/actions/bottom.png +share/icons/gnome/32x32/actions/call-start.png +share/icons/gnome/32x32/actions/call-stop.png share/icons/gnome/32x32/actions/centrejust.png share/icons/gnome/32x32/actions/contact-new.png share/icons/gnome/32x32/actions/document-new.png @@ -4471,6 +4468,7 @@ share/icons/gnome/32x32/actions/gtk-undo-ltr.png share/icons/gnome/32x32/actions/gtk-unindent-ltr.png share/icons/gnome/32x32/actions/gtk-unindent-rtl.png share/icons/gnome/32x32/actions/gtk-zoom-100.png +share/icons/gnome/32x32/actions/gtk-zoom-fit.png share/icons/gnome/32x32/actions/gtk-zoom-in.png share/icons/gnome/32x32/actions/gtk-zoom-out.png share/icons/gnome/32x32/actions/help-about.png @@ -4603,6 +4601,7 @@ share/icons/gnome/32x32/actions/stock_up.png share/icons/gnome/32x32/actions/stock_zoom-1.png share/icons/gnome/32x32/actions/stock_zoom-in.png share/icons/gnome/32x32/actions/stock_zoom-out.png +share/icons/gnome/32x32/actions/stock_zoom-page.png share/icons/gnome/32x32/actions/stop.png share/icons/gnome/32x32/actions/system-lock-screen.png share/icons/gnome/32x32/actions/system-log-out.png @@ -4624,6 +4623,7 @@ share/icons/gnome/32x32/actions/view-sort-descending.png share/icons/gnome/32x32/actions/viewmag+.png share/icons/gnome/32x32/actions/viewmag-.png share/icons/gnome/32x32/actions/viewmag1.png +share/icons/gnome/32x32/actions/viewmagfit.png share/icons/gnome/32x32/actions/window-close.png share/icons/gnome/32x32/actions/window-new.png share/icons/gnome/32x32/actions/window_fullscreen.png @@ -4631,6 +4631,7 @@ share/icons/gnome/32x32/actions/window_new.png share/icons/gnome/32x32/actions/window_nofullscreen.png share/icons/gnome/32x32/actions/xfce-system-exit.png share/icons/gnome/32x32/actions/xfce-system-lock.png +share/icons/gnome/32x32/actions/zoom-best-fit.png share/icons/gnome/32x32/actions/zoom-fit-best.png share/icons/gnome/32x32/actions/zoom-in.png share/icons/gnome/32x32/actions/zoom-original.png @@ -4663,7 +4664,6 @@ share/icons/gnome/32x32/apps/gnome-settings-background.png share/icons/gnome/32x32/apps/gnome-settings-font.png share/icons/gnome/32x32/apps/gnome-settings-keybindings.png share/icons/gnome/32x32/apps/gnome-settings-theme.png -share/icons/gnome/32x32/apps/gnome-settings-ui-behavior.png share/icons/gnome/32x32/apps/gnome-terminal.png share/icons/gnome/32x32/apps/gnome-window-manager.png share/icons/gnome/32x32/apps/gtk-help.png @@ -4706,7 +4706,7 @@ share/icons/gnome/32x32/apps/style.png share/icons/gnome/32x32/apps/susehelpcenter.png share/icons/gnome/32x32/apps/system-config-users.png share/icons/gnome/32x32/apps/system-file-manager.png -share/icons/gnome/32x32/apps/system-software-installer.png +share/icons/gnome/32x32/apps/system-software-install.png share/icons/gnome/32x32/apps/system-software-update.png share/icons/gnome/32x32/apps/system-users.png share/icons/gnome/32x32/apps/terminal.png @@ -5017,6 +5017,8 @@ share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-kspread.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-kword.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-lha.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-lhz.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png +share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-lzma.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-ms-dos-executable.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-perl.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-php.png @@ -5120,6 +5122,8 @@ share/icons/gnome/32x32/places/gnome-stock-trash.png share/icons/gnome/32x32/places/gtk-directory.icon share/icons/gnome/32x32/places/gtk-directory.png share/icons/gnome/32x32/places/gtk-network.png +share/icons/gnome/32x32/places/inode-directory.icon +share/icons/gnome/32x32/places/inode-directory.png share/icons/gnome/32x32/places/network-server.png share/icons/gnome/32x32/places/network-workgroup.png share/icons/gnome/32x32/places/network.png @@ -5131,6 +5135,7 @@ share/icons/gnome/32x32/places/start-here.png share/icons/gnome/32x32/places/stock_folder.icon share/icons/gnome/32x32/places/stock_folder.png share/icons/gnome/32x32/places/trashcan_empty.png +share/icons/gnome/32x32/places/user-bookmarks.png share/icons/gnome/32x32/places/user-desktop.png share/icons/gnome/32x32/places/user-home.png share/icons/gnome/32x32/places/user-trash.png @@ -5269,95 +5274,18 @@ share/icons/gnome/48x48/actions/stock_mail-send-receive.png share/icons/gnome/48x48/actions/stock_new-appointment.png share/icons/gnome/48x48/actions/stock_not-spam.png share/icons/gnome/48x48/actions/stock_spam.png +share/icons/gnome/48x48/animations/gnome-searchtool-animation-rest.png +share/icons/gnome/48x48/animations/gnome-searchtool-animation.png share/icons/gnome/48x48/animations/gnome-spinner-rest.png share/icons/gnome/48x48/animations/gnome-spinner.png share/icons/gnome/48x48/animations/process-idle.png share/icons/gnome/48x48/animations/process-working.png -share/icons/gnome/48x48/apps/administration.png -share/icons/gnome/48x48/apps/advanced-directory.png -share/icons/gnome/48x48/apps/apacheconf.png share/icons/gnome/48x48/apps/applets-screenshooter.png -share/icons/gnome/48x48/apps/character-picker.png -share/icons/gnome/48x48/apps/config-date.png -share/icons/gnome/48x48/apps/config-xfree.png -share/icons/gnome/48x48/apps/disks.png -share/icons/gnome/48x48/apps/eyes.png -share/icons/gnome/48x48/apps/gdm.png -share/icons/gnome/48x48/apps/gnome-amusements.png -share/icons/gnome/48x48/apps/gnome-audio.png -share/icons/gnome/48x48/apps/gnome-desktop-config.png -share/icons/gnome/48x48/apps/gnome-favorites.png -share/icons/gnome/48x48/apps/gnome-finance.png -share/icons/gnome/48x48/apps/gnome-grecord.png -share/icons/gnome/48x48/apps/gnome-networktool.png -share/icons/gnome/48x48/apps/gnome-pdf.png -share/icons/gnome/48x48/apps/gnome-searchtool-animation-rest.png -share/icons/gnome/48x48/apps/gnome-searchtool-animation.png -share/icons/gnome/48x48/apps/gnome-server-config.png -share/icons/gnome/48x48/apps/gnome-settings-accessibility-keyboard.png -share/icons/gnome/48x48/apps/gnome-settings-default-applications.png -share/icons/gnome/48x48/apps/gnome-settings-sound.png -share/icons/gnome/48x48/apps/gnome-system-config.png -share/icons/gnome/48x48/apps/gnome-unknown.png -share/icons/gnome/48x48/apps/hint.png -share/icons/gnome/48x48/apps/hwbrowser.png -share/icons/gnome/48x48/apps/im.png -share/icons/gnome/48x48/apps/launcher-program.png -share/icons/gnome/48x48/apps/network-config.png share/icons/gnome/48x48/apps/palm-pilot-sync.png share/icons/gnome/48x48/apps/palm-pilot.png -share/icons/gnome/48x48/apps/postscript-viewer.png -share/icons/gnome/48x48/apps/serviceconf.png -share/icons/gnome/48x48/apps/stock-ticker.png share/icons/gnome/48x48/apps/visor.png share/icons/gnome/48x48/devices/gnome-dev-jazdisk.png share/icons/gnome/48x48/devices/media-jaz.png -share/icons/gnome/48x48/emblems/emblem-OK.icon -share/icons/gnome/48x48/emblems/emblem-OK.png -share/icons/gnome/48x48/emblems/emblem-art.icon -share/icons/gnome/48x48/emblems/emblem-art.png -share/icons/gnome/48x48/emblems/emblem-camera.icon -share/icons/gnome/48x48/emblems/emblem-camera.png -share/icons/gnome/48x48/emblems/emblem-certified.icon -share/icons/gnome/48x48/emblems/emblem-certified.png -share/icons/gnome/48x48/emblems/emblem-cool.icon -share/icons/gnome/48x48/emblems/emblem-cool.png -share/icons/gnome/48x48/emblems/emblem-danger.icon -share/icons/gnome/48x48/emblems/emblem-danger.png -share/icons/gnome/48x48/emblems/emblem-desktop.icon -share/icons/gnome/48x48/emblems/emblem-desktop.png -share/icons/gnome/48x48/emblems/emblem-distinguished.icon -share/icons/gnome/48x48/emblems/emblem-distinguished.png -share/icons/gnome/48x48/emblems/emblem-draft.icon -share/icons/gnome/48x48/emblems/emblem-draft.png -share/icons/gnome/48x48/emblems/emblem-handshake.icon -share/icons/gnome/48x48/emblems/emblem-handshake.png -share/icons/gnome/48x48/emblems/emblem-marketing.icon -share/icons/gnome/48x48/emblems/emblem-marketing.png -share/icons/gnome/48x48/emblems/emblem-money.icon -share/icons/gnome/48x48/emblems/emblem-money.png -share/icons/gnome/48x48/emblems/emblem-multimedia.icon -share/icons/gnome/48x48/emblems/emblem-multimedia.png -share/icons/gnome/48x48/emblems/emblem-note.icon -share/icons/gnome/48x48/emblems/emblem-note.png -share/icons/gnome/48x48/emblems/emblem-ohno.icon -share/icons/gnome/48x48/emblems/emblem-ohno.png -share/icons/gnome/48x48/emblems/emblem-people.icon -share/icons/gnome/48x48/emblems/emblem-people.png -share/icons/gnome/48x48/emblems/emblem-personal.icon -share/icons/gnome/48x48/emblems/emblem-personal.png -share/icons/gnome/48x48/emblems/emblem-pictures.icon -share/icons/gnome/48x48/emblems/emblem-pictures.png -share/icons/gnome/48x48/emblems/emblem-plan.icon -share/icons/gnome/48x48/emblems/emblem-plan.png -share/icons/gnome/48x48/emblems/emblem-presentation.icon -share/icons/gnome/48x48/emblems/emblem-presentation.png -share/icons/gnome/48x48/emblems/emblem-sales.icon -share/icons/gnome/48x48/emblems/emblem-sales.png -share/icons/gnome/48x48/emblems/emblem-sound.icon -share/icons/gnome/48x48/emblems/emblem-sound.png -share/icons/gnome/48x48/emblems/emblem-trash.icon -share/icons/gnome/48x48/emblems/emblem-trash.png share/icons/gnome/48x48/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/48x48/filesystems/gnome-fs-bookmark.png share/icons/gnome/48x48/stock/code/stock_script.png @@ -5401,7 +5329,6 @@ share/icons/gnome/48x48/stock/generic/stock_summary.png share/icons/gnome/48x48/stock/generic/stock_timezone.png share/icons/gnome/48x48/stock/generic/stock_unknown.png share/icons/gnome/48x48/stock/generic/stock_web-calendar.png -share/icons/gnome/48x48/stock/io/stock_bluetooth.png share/icons/gnome/48x48/stock/io/stock_network-printer.png share/icons/gnome/48x48/stock/io/stock_print-driver.png share/icons/gnome/48x48/stock/io/stock_print-duplex-no-tumble.png @@ -5455,6 +5382,8 @@ share/icons/gnome/scalable/actions/bookmark-new.svg share/icons/gnome/scalable/actions/bookmark_add.svg share/icons/gnome/scalable/actions/bookmarks_list_add.svg share/icons/gnome/scalable/actions/bottom.svg +share/icons/gnome/scalable/actions/call-start.svg +share/icons/gnome/scalable/actions/call-stop.svg share/icons/gnome/scalable/actions/centrejust.svg share/icons/gnome/scalable/actions/contact-new.svg share/icons/gnome/scalable/actions/document-new.svg @@ -5513,6 +5442,7 @@ share/icons/gnome/scalable/actions/gnome-lockscreen.svg share/icons/gnome/scalable/actions/gnome-logout.svg share/icons/gnome/scalable/actions/gnome-run.svg share/icons/gnome/scalable/actions/gnome-searchtool.svg +share/icons/gnome/scalable/actions/gnome-shutdown.svg share/icons/gnome/scalable/actions/gnome-stock-mail-fwd.svg share/icons/gnome/scalable/actions/gnome-stock-mail-new.svg share/icons/gnome/scalable/actions/gnome-stock-mail-rpl.svg @@ -5603,6 +5533,7 @@ share/icons/gnome/scalable/actions/gtk-undo-ltr.svg share/icons/gnome/scalable/actions/gtk-unindent-ltr.svg share/icons/gnome/scalable/actions/gtk-unindent-rtl.svg share/icons/gnome/scalable/actions/gtk-zoom-100.svg +share/icons/gnome/scalable/actions/gtk-zoom-fit.svg share/icons/gnome/scalable/actions/gtk-zoom-in.svg share/icons/gnome/scalable/actions/gtk-zoom-out.svg share/icons/gnome/scalable/actions/help-about.svg @@ -5735,11 +5666,13 @@ share/icons/gnome/scalable/actions/stock_up.svg share/icons/gnome/scalable/actions/stock_zoom-1.svg share/icons/gnome/scalable/actions/stock_zoom-in.svg share/icons/gnome/scalable/actions/stock_zoom-out.svg +share/icons/gnome/scalable/actions/stock_zoom-page.svg share/icons/gnome/scalable/actions/stop.svg share/icons/gnome/scalable/actions/system-lock-screen.svg share/icons/gnome/scalable/actions/system-log-out.svg share/icons/gnome/scalable/actions/system-run.svg share/icons/gnome/scalable/actions/system-search.svg +share/icons/gnome/scalable/actions/system-shutdown.svg share/icons/gnome/scalable/actions/text_bold.svg share/icons/gnome/scalable/actions/text_italic.svg share/icons/gnome/scalable/actions/text_strike.svg @@ -5756,6 +5689,7 @@ share/icons/gnome/scalable/actions/view-sort-descending.svg share/icons/gnome/scalable/actions/viewmag+.svg share/icons/gnome/scalable/actions/viewmag-.svg share/icons/gnome/scalable/actions/viewmag1.svg +share/icons/gnome/scalable/actions/viewmagfit.svg share/icons/gnome/scalable/actions/window-close.svg share/icons/gnome/scalable/actions/window-new.svg share/icons/gnome/scalable/actions/window_fullscreen.svg @@ -5763,6 +5697,7 @@ share/icons/gnome/scalable/actions/window_new.svg share/icons/gnome/scalable/actions/window_nofullscreen.svg share/icons/gnome/scalable/actions/xfce-system-exit.svg share/icons/gnome/scalable/actions/xfce-system-lock.svg +share/icons/gnome/scalable/actions/zoom-best-fit.svg share/icons/gnome/scalable/actions/zoom-fit-best.svg share/icons/gnome/scalable/actions/zoom-in.svg share/icons/gnome/scalable/actions/zoom-original.svg @@ -5791,8 +5726,6 @@ share/icons/gnome/scalable/apps/gnome-settings-background.svg share/icons/gnome/scalable/apps/gnome-settings-font.svg share/icons/gnome/scalable/apps/gnome-settings-keybindings.svg share/icons/gnome/scalable/apps/gnome-settings-theme.svg -share/icons/gnome/scalable/apps/gnome-settings-ui-behavior.svg -share/icons/gnome/scalable/apps/gnome-shutdown.svg share/icons/gnome/scalable/apps/gnome-terminal.svg share/icons/gnome/scalable/apps/gnome-window-manager.svg share/icons/gnome/scalable/apps/gtk-help.svg @@ -5841,7 +5774,7 @@ share/icons/gnome/scalable/apps/style.svg share/icons/gnome/scalable/apps/susehelpcenter.svg share/icons/gnome/scalable/apps/system-config-users.svg share/icons/gnome/scalable/apps/system-file-manager.svg -share/icons/gnome/scalable/apps/system-software-installer.svg +share/icons/gnome/scalable/apps/system-software-install.svg share/icons/gnome/scalable/apps/system-software-update.svg share/icons/gnome/scalable/apps/system-users.svg share/icons/gnome/scalable/apps/terminal.svg @@ -6024,6 +5957,8 @@ share/icons/gnome/scalable/devices/yast_mouse.svg share/icons/gnome/scalable/devices/yast_printer.svg share/icons/gnome/scalable/devices/yast_soundcard.svg share/icons/gnome/scalable/emblems/emblem-default.svg +share/icons/gnome/scalable/emblems/emblem-desktop.icon +share/icons/gnome/scalable/emblems/emblem-desktop.svg share/icons/gnome/scalable/emblems/emblem-documents.icon share/icons/gnome/scalable/emblems/emblem-documents.svg share/icons/gnome/scalable/emblems/emblem-downloads.icon @@ -6170,6 +6105,8 @@ share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-kspread.svg share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-kword.svg share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lha.svg share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lhz.svg +share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lzma-compressed-tar.svg +share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-lzma.svg share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-ms-dos-executable.svg share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-perl.svg share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-php.svg @@ -6282,6 +6219,8 @@ share/icons/gnome/scalable/places/gnome-stock-trash.svg share/icons/gnome/scalable/places/gtk-directory.icon share/icons/gnome/scalable/places/gtk-directory.svg share/icons/gnome/scalable/places/gtk-network.svg +share/icons/gnome/scalable/places/inode-directory.icon +share/icons/gnome/scalable/places/inode-directory.svg share/icons/gnome/scalable/places/network-server.svg share/icons/gnome/scalable/places/network-workgroup.svg share/icons/gnome/scalable/places/network.icon @@ -6294,6 +6233,7 @@ share/icons/gnome/scalable/places/start-here.svg share/icons/gnome/scalable/places/stock_folder.icon share/icons/gnome/scalable/places/stock_folder.svg share/icons/gnome/scalable/places/trashcan_empty.svg +share/icons/gnome/scalable/places/user-bookmarks.svg share/icons/gnome/scalable/places/user-desktop.svg share/icons/gnome/scalable/places/user-home.svg share/icons/gnome/scalable/places/user-trash.svg @@ -6425,30 +6365,8 @@ share/icons/gnome/scalable/status/weather-snow.svg share/icons/gnome/scalable/status/weather-storm.svg share/icons/gnome/scalable/status/xfce-trash_full.svg share/icons/gnome/scalable/stock/generic/stock_person.svg -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/xh/LC_MESSAGES -@dirrmtry share/locale/xh -@dirrmtry share/locale/te/LC_MESSAGES -@dirrmtry share/locale/te -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg @dirrmtry share/locale/fur/LC_MESSAGES @dirrmtry share/locale/fur -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@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/icons/gnome/scalable/stock/generic @dirrmtry share/icons/gnome/scalable/stock @dirrmtry share/icons/gnome/scalable/status @@ -6471,7 +6389,6 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg @dirrmtry share/icons/gnome/48x48/stock/code @dirrmtry share/icons/gnome/48x48/stock @dirrmtry share/icons/gnome/48x48/filesystems -@dirrmtry share/icons/gnome/48x48/emblems @dirrmtry share/icons/gnome/48x48/devices @dirrmtry share/icons/gnome/48x48/apps @dirrmtry share/icons/gnome/48x48/animations diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index 9ab40228f6fb..28a7b3248bd4 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -3,15 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.42 2008/03/10 17:39:04 ahze Exp $ +# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.47 2009/01/09 21:41:58 kwm Exp $ # PORTNAME= gnome-user-docs -PORTVERSION= 2.22.1 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= misc gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -24,6 +22,6 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes -USE_GNOME= gnomeprefix gnomehack gnomehier gnometarget gnomedocutils +USE_GNOME= gnomeprefix gnomehack gnomehier gnomedocutils .include <bsd.port.mk> diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo index b2138aaa0273..e07eff905d6f 100644 --- a/misc/gnome-user-docs/distinfo +++ b/misc/gnome-user-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-user-docs-2.22.1.tar.bz2) = 5986727ea52dfbaa7293383e474a3f2d -SHA256 (gnome2/gnome-user-docs-2.22.1.tar.bz2) = cd3e924d2743074c5c116a91dda5f89f9253c18ec597b127f05e1b7d7c5228e1 -SIZE (gnome2/gnome-user-docs-2.22.1.tar.bz2) = 11014053 +MD5 (gnome2/gnome-user-docs-2.24.2.tar.bz2) = c387144f39c05152bb0771ae2b07a4d8 +SHA256 (gnome2/gnome-user-docs-2.24.2.tar.bz2) = c8e05a98d723356fa72681bf90f7a27a666ff6468a9489d7f6ea682a0390ab3a +SIZE (gnome2/gnome-user-docs-2.24.2.tar.bz2) = 13192540 diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist index 3342e38e844d..b666615fcac6 100644 --- a/misc/gnome-user-docs/pkg-plist +++ b/misc/gnome-user-docs/pkg-plist @@ -1,5 +1,17 @@ share/gnome/help/gnome-access-guide/C/accessintro.xml share/gnome/help/gnome-access-guide/C/enable.xml +share/gnome/help/gnome-access-guide/C/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/C/figures/General_Tab.png +share/gnome/help/gnome-access-guide/C/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/C/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/C/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/C/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/C/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/C/figures/MainWindow.png +share/gnome/help/gnome-access-guide/C/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/C/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/C/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/C/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/C/figures/accessx.png share/gnome/help/gnome-access-guide/C/figures/bouncekeys.png share/gnome/help/gnome-access-guide/C/figures/button.png @@ -33,6 +45,18 @@ share/gnome/help/gnome-access-guide/C/low-vision.xml share/gnome/help/gnome-access-guide/C/mobility.xml share/gnome/help/gnome-access-guide/C/preface.xml share/gnome/help/gnome-access-guide/C/sysadmin.xml +share/gnome/help/gnome-access-guide/de/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/de/figures/General_Tab.png +share/gnome/help/gnome-access-guide/de/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/de/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/de/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/de/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/de/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/de/figures/MainWindow.png +share/gnome/help/gnome-access-guide/de/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/de/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/de/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/de/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/de/figures/accessx.png share/gnome/help/gnome-access-guide/de/figures/bouncekeys.png share/gnome/help/gnome-access-guide/de/figures/button.png @@ -60,6 +84,18 @@ share/gnome/help/gnome-access-guide/de/figures/tabbed_section.png share/gnome/help/gnome-access-guide/de/figures/text_box.png share/gnome/help/gnome-access-guide/de/figures/tree.png share/gnome/help/gnome-access-guide/de/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/el/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/el/figures/General_Tab.png +share/gnome/help/gnome-access-guide/el/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/el/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/el/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/el/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/el/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/el/figures/MainWindow.png +share/gnome/help/gnome-access-guide/el/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/el/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/el/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/el/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/el/figures/accessx.png share/gnome/help/gnome-access-guide/el/figures/bouncekeys.png share/gnome/help/gnome-access-guide/el/figures/button.png @@ -87,6 +123,18 @@ share/gnome/help/gnome-access-guide/el/figures/tabbed_section.png share/gnome/help/gnome-access-guide/el/figures/text_box.png share/gnome/help/gnome-access-guide/el/figures/tree.png share/gnome/help/gnome-access-guide/el/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/en_GB/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/en_GB/figures/General_Tab.png +share/gnome/help/gnome-access-guide/en_GB/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/en_GB/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/en_GB/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/en_GB/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/en_GB/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/en_GB/figures/MainWindow.png +share/gnome/help/gnome-access-guide/en_GB/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/en_GB/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/en_GB/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/en_GB/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/en_GB/figures/accessx.png share/gnome/help/gnome-access-guide/en_GB/figures/bouncekeys.png share/gnome/help/gnome-access-guide/en_GB/figures/button.png @@ -114,6 +162,18 @@ share/gnome/help/gnome-access-guide/en_GB/figures/tabbed_section.png share/gnome/help/gnome-access-guide/en_GB/figures/text_box.png share/gnome/help/gnome-access-guide/en_GB/figures/tree.png share/gnome/help/gnome-access-guide/en_GB/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/es/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/es/figures/General_Tab.png +share/gnome/help/gnome-access-guide/es/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/es/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/es/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/es/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/es/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/es/figures/MainWindow.png +share/gnome/help/gnome-access-guide/es/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/es/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/es/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/es/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/es/figures/accessx.png share/gnome/help/gnome-access-guide/es/figures/bouncekeys.png share/gnome/help/gnome-access-guide/es/figures/button.png @@ -141,6 +201,18 @@ share/gnome/help/gnome-access-guide/es/figures/tabbed_section.png share/gnome/help/gnome-access-guide/es/figures/text_box.png share/gnome/help/gnome-access-guide/es/figures/tree.png share/gnome/help/gnome-access-guide/es/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/fi/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/fi/figures/General_Tab.png +share/gnome/help/gnome-access-guide/fi/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/fi/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/fi/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/fi/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/fi/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/fi/figures/MainWindow.png +share/gnome/help/gnome-access-guide/fi/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/fi/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/fi/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/fi/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/fi/figures/accessx.png share/gnome/help/gnome-access-guide/fi/figures/bouncekeys.png share/gnome/help/gnome-access-guide/fi/figures/button.png @@ -168,6 +240,18 @@ share/gnome/help/gnome-access-guide/fi/figures/tabbed_section.png share/gnome/help/gnome-access-guide/fi/figures/text_box.png share/gnome/help/gnome-access-guide/fi/figures/tree.png share/gnome/help/gnome-access-guide/fi/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/fr/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/fr/figures/General_Tab.png +share/gnome/help/gnome-access-guide/fr/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/fr/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/fr/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/fr/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/fr/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/fr/figures/MainWindow.png +share/gnome/help/gnome-access-guide/fr/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/fr/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/fr/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/fr/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/fr/figures/accessx.png share/gnome/help/gnome-access-guide/fr/figures/bouncekeys.png share/gnome/help/gnome-access-guide/fr/figures/button.png @@ -195,6 +279,18 @@ share/gnome/help/gnome-access-guide/fr/figures/tabbed_section.png share/gnome/help/gnome-access-guide/fr/figures/text_box.png share/gnome/help/gnome-access-guide/fr/figures/tree.png share/gnome/help/gnome-access-guide/fr/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/hu/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/hu/figures/General_Tab.png +share/gnome/help/gnome-access-guide/hu/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/hu/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/hu/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/hu/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/hu/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/hu/figures/MainWindow.png +share/gnome/help/gnome-access-guide/hu/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/hu/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/hu/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/hu/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/hu/figures/accessx.png share/gnome/help/gnome-access-guide/hu/figures/bouncekeys.png share/gnome/help/gnome-access-guide/hu/figures/button.png @@ -222,6 +318,18 @@ share/gnome/help/gnome-access-guide/hu/figures/tabbed_section.png share/gnome/help/gnome-access-guide/hu/figures/text_box.png share/gnome/help/gnome-access-guide/hu/figures/tree.png share/gnome/help/gnome-access-guide/hu/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/it/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/it/figures/General_Tab.png +share/gnome/help/gnome-access-guide/it/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/it/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/it/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/it/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/it/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/it/figures/MainWindow.png +share/gnome/help/gnome-access-guide/it/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/it/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/it/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/it/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/it/figures/accessx.png share/gnome/help/gnome-access-guide/it/figures/bouncekeys.png share/gnome/help/gnome-access-guide/it/figures/button.png @@ -249,6 +357,18 @@ share/gnome/help/gnome-access-guide/it/figures/tabbed_section.png share/gnome/help/gnome-access-guide/it/figures/text_box.png share/gnome/help/gnome-access-guide/it/figures/tree.png share/gnome/help/gnome-access-guide/it/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/oc/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/oc/figures/General_Tab.png +share/gnome/help/gnome-access-guide/oc/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/oc/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/oc/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/oc/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/oc/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/oc/figures/MainWindow.png +share/gnome/help/gnome-access-guide/oc/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/oc/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/oc/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/oc/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/oc/figures/accessx.png share/gnome/help/gnome-access-guide/oc/figures/bouncekeys.png share/gnome/help/gnome-access-guide/oc/figures/button.png @@ -276,6 +396,18 @@ share/gnome/help/gnome-access-guide/oc/figures/tabbed_section.png share/gnome/help/gnome-access-guide/oc/figures/text_box.png share/gnome/help/gnome-access-guide/oc/figures/tree.png share/gnome/help/gnome-access-guide/oc/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/pt/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/pt/figures/General_Tab.png +share/gnome/help/gnome-access-guide/pt/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/pt/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/pt/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/pt/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/pt/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/pt/figures/MainWindow.png +share/gnome/help/gnome-access-guide/pt/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/pt/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/pt/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/pt/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/pt/figures/accessx.png share/gnome/help/gnome-access-guide/pt/figures/bouncekeys.png share/gnome/help/gnome-access-guide/pt/figures/button.png @@ -303,6 +435,18 @@ share/gnome/help/gnome-access-guide/pt/figures/tabbed_section.png share/gnome/help/gnome-access-guide/pt/figures/text_box.png share/gnome/help/gnome-access-guide/pt/figures/tree.png share/gnome/help/gnome-access-guide/pt/gnome-access-guide.xml +share/gnome/help/gnome-access-guide/sv/figures/Braille_Tab.png +share/gnome/help/gnome-access-guide/sv/figures/General_Tab.png +share/gnome/help/gnome-access-guide/sv/figures/KeyBindings_Tab.png +share/gnome/help/gnome-access-guide/sv/figures/KeyBindings_Tab_Unbound.png +share/gnome/help/gnome-access-guide/sv/figures/KeyEcho_Tab.png +share/gnome/help/gnome-access-guide/sv/figures/Magnifier_Advanced.png +share/gnome/help/gnome-access-guide/sv/figures/Magnifier_Tab.png +share/gnome/help/gnome-access-guide/sv/figures/MainWindow.png +share/gnome/help/gnome-access-guide/sv/figures/Pronunciation_Tab.png +share/gnome/help/gnome-access-guide/sv/figures/RPM_search_gnome_common.png +share/gnome/help/gnome-access-guide/sv/figures/Speech_Tab.png +share/gnome/help/gnome-access-guide/sv/figures/TextAttributes_Tab.png share/gnome/help/gnome-access-guide/sv/figures/accessx.png share/gnome/help/gnome-access-guide/sv/figures/bouncekeys.png share/gnome/help/gnome-access-guide/sv/figures/button.png @@ -346,16 +490,19 @@ share/gnome/help/system-admin-guide/C/sessions.xml share/gnome/help/system-admin-guide/C/system-admin-guide.xml share/gnome/help/system-admin-guide/C/themes.xml share/gnome/help/system-admin-guide/ca/system-admin-guide.xml +share/gnome/help/system-admin-guide/de/system-admin-guide.xml share/gnome/help/system-admin-guide/el/system-admin-guide.xml share/gnome/help/system-admin-guide/es/system-admin-guide.xml share/gnome/help/system-admin-guide/fi/system-admin-guide.xml share/gnome/help/system-admin-guide/fr/system-admin-guide.xml share/gnome/help/system-admin-guide/it/system-admin-guide.xml +share/gnome/help/system-admin-guide/ja/system-admin-guide.xml share/gnome/help/system-admin-guide/ko/system-admin-guide.xml share/gnome/help/system-admin-guide/oc/system-admin-guide.xml share/gnome/help/system-admin-guide/pa/system-admin-guide.xml share/gnome/help/system-admin-guide/pt/system-admin-guide.xml share/gnome/help/system-admin-guide/sv/system-admin-guide.xml +share/gnome/help/system-admin-guide/zh_CN/system-admin-guide.xml share/gnome/help/user-guide/C/figures/ask_pointer.png share/gnome/help/user-guide/C/figures/busy_pointer.png share/gnome/help/user-guide/C/figures/com_file_manager_menu.png @@ -1127,6 +1274,83 @@ share/gnome/help/user-guide/it/gospanel.xml share/gnome/help/user-guide/it/gosstartsession.xml share/gnome/help/user-guide/it/gostools.xml share/gnome/help/user-guide/it/user-guide.xml +share/gnome/help/user-guide/ja/figures/ask_pointer.png +share/gnome/help/user-guide/ja/figures/busy_pointer.png +share/gnome/help/user-guide/ja/figures/com_file_manager_menu.png +share/gnome/help/user-guide/ja/figures/copy_pointer.png +share/gnome/help/user-guide/ja/figures/force_quit.png +share/gnome/help/user-guide/ja/figures/four_hide_button.png +share/gnome/help/user-guide/ja/figures/gedit_window.png +share/gnome/help/user-guide/ja/figures/gnome_panel.png +share/gnome/help/user-guide/ja/figures/hyperlink_pointer.png +share/gnome/help/user-guide/ja/figures/ibeam_pointer.png +share/gnome/help/user-guide/ja/figures/link_pointer.png +share/gnome/help/user-guide/ja/figures/lockscreen_icon.png +share/gnome/help/user-guide/ja/figures/logout_icon.png +share/gnome/help/user-guide/ja/figures/menu_bar_applet.png +share/gnome/help/user-guide/ja/figures/menu_panel.png +share/gnome/help/user-guide/ja/figures/move_panel_object_pointer.png +share/gnome/help/user-guide/ja/figures/move_pointer.png +share/gnome/help/user-guide/ja/figures/movewindow_pointer.png +share/gnome/help/user-guide/ja/figures/naut_browser_mode.png +share/gnome/help/user-guide/ja/figures/naut_button_bar.png +share/gnome/help/user-guide/ja/figures/naut_computer_launcher.png +share/gnome/help/user-guide/ja/figures/naut_emblem.png +share/gnome/help/user-guide/ja/figures/naut_go_to_location.png +share/gnome/help/user-guide/ja/figures/naut_link_emblem.png +share/gnome/help/user-guide/ja/figures/naut_noread_emblem.png +share/gnome/help/user-guide/ja/figures/naut_normal_size_button.png +share/gnome/help/user-guide/ja/figures/naut_nowrite_emblem.png +share/gnome/help/user-guide/ja/figures/naut_refine_search.png +share/gnome/help/user-guide/ja/figures/naut_sampleemblem1_icon.png +share/gnome/help/user-guide/ja/figures/naut_sampleemblem2_icon.png +share/gnome/help/user-guide/ja/figures/naut_sampleemblem3_icon.png +share/gnome/help/user-guide/ja/figures/naut_sampleemblem_icon.png +share/gnome/help/user-guide/ja/figures/naut_samplesymlink_icon.png +share/gnome/help/user-guide/ja/figures/naut_search_bar.png +share/gnome/help/user-guide/ja/figures/naut_search_results.png +share/gnome/help/user-guide/ja/figures/naut_spatial_icon_view.png +share/gnome/help/user-guide/ja/figures/naut_spatial_list_view.png +share/gnome/help/user-guide/ja/figures/naut_spatial_mode.png +share/gnome/help/user-guide/ja/figures/naut_spatial_view.png +share/gnome/help/user-guide/ja/figures/naut_starthere_launcher.png +share/gnome/help/user-guide/ja/figures/naut_trash_launcher.png +share/gnome/help/user-guide/ja/figures/naut_zoom_in_button.png +share/gnome/help/user-guide/ja/figures/naut_zoom_out_button.png +share/gnome/help/user-guide/ja/figures/nautilus_restore_saved_search.png +share/gnome/help/user-guide/ja/figures/normal_pointer.png +share/gnome/help/user-guide/ja/figures/not_available_pointer.png +share/gnome/help/user-guide/ja/figures/notification_area_icon.png +share/gnome/help/user-guide/ja/figures/open_drawer.png +share/gnome/help/user-guide/ja/figures/openwindows_menu.png +share/gnome/help/user-guide/ja/figures/panel_object_popup_menu.png +share/gnome/help/user-guide/ja/figures/resize_pointer.png +share/gnome/help/user-guide/ja/figures/run_button.png +share/gnome/help/user-guide/ja/figures/sample_applet.png +share/gnome/help/user-guide/ja/figures/screenshot_button.png +share/gnome/help/user-guide/ja/figures/searchtool_button.png +share/gnome/help/user-guide/ja/figures/show_desktop_button.png +share/gnome/help/user-guide/ja/figures/titlebar_anno_window.png +share/gnome/help/user-guide/ja/figures/titlebar_window.png +share/gnome/help/user-guide/ja/figures/typical_menu.png +share/gnome/help/user-guide/ja/figures/window_list_applet.png +share/gnome/help/user-guide/ja/figures/window_list_group_applet.png +share/gnome/help/user-guide/ja/figures/workspace_switcher_applet.png +share/gnome/help/user-guide/ja/figures/yelp_add_bookmark.png +share/gnome/help/user-guide/ja/figures/yelp_edit_bookmarks.png +share/gnome/help/user-guide/ja/figures/yelp_preferences.png +share/gnome/help/user-guide/ja/figures/yelp_window.png +share/gnome/help/user-guide/ja/glossary.xml +share/gnome/help/user-guide/ja/gosbasic.xml +share/gnome/help/user-guide/ja/goscustdesk.xml +share/gnome/help/user-guide/ja/goseditmainmenu.xml +share/gnome/help/user-guide/ja/gosfeedback.xml +share/gnome/help/user-guide/ja/gosnautilus.xml +share/gnome/help/user-guide/ja/gosoverview.xml +share/gnome/help/user-guide/ja/gospanel.xml +share/gnome/help/user-guide/ja/gosstartsession.xml +share/gnome/help/user-guide/ja/gostools.xml +share/gnome/help/user-guide/ja/user-guide.xml share/gnome/help/user-guide/ko/figures/ask_pointer.png share/gnome/help/user-guide/ko/figures/busy_pointer.png share/gnome/help/user-guide/ko/figures/com_file_manager_menu.png @@ -1666,6 +1890,83 @@ share/gnome/help/user-guide/sv/gospanel.xml share/gnome/help/user-guide/sv/gosstartsession.xml share/gnome/help/user-guide/sv/gostools.xml share/gnome/help/user-guide/sv/user-guide.xml +share/gnome/help/user-guide/th/figures/ask_pointer.png +share/gnome/help/user-guide/th/figures/busy_pointer.png +share/gnome/help/user-guide/th/figures/com_file_manager_menu.png +share/gnome/help/user-guide/th/figures/copy_pointer.png +share/gnome/help/user-guide/th/figures/force_quit.png +share/gnome/help/user-guide/th/figures/four_hide_button.png +share/gnome/help/user-guide/th/figures/gedit_window.png +share/gnome/help/user-guide/th/figures/gnome_panel.png +share/gnome/help/user-guide/th/figures/hyperlink_pointer.png +share/gnome/help/user-guide/th/figures/ibeam_pointer.png +share/gnome/help/user-guide/th/figures/link_pointer.png +share/gnome/help/user-guide/th/figures/lockscreen_icon.png +share/gnome/help/user-guide/th/figures/logout_icon.png +share/gnome/help/user-guide/th/figures/menu_bar_applet.png +share/gnome/help/user-guide/th/figures/menu_panel.png +share/gnome/help/user-guide/th/figures/move_panel_object_pointer.png +share/gnome/help/user-guide/th/figures/move_pointer.png +share/gnome/help/user-guide/th/figures/movewindow_pointer.png +share/gnome/help/user-guide/th/figures/naut_browser_mode.png +share/gnome/help/user-guide/th/figures/naut_button_bar.png +share/gnome/help/user-guide/th/figures/naut_computer_launcher.png +share/gnome/help/user-guide/th/figures/naut_emblem.png +share/gnome/help/user-guide/th/figures/naut_go_to_location.png +share/gnome/help/user-guide/th/figures/naut_link_emblem.png +share/gnome/help/user-guide/th/figures/naut_noread_emblem.png +share/gnome/help/user-guide/th/figures/naut_normal_size_button.png +share/gnome/help/user-guide/th/figures/naut_nowrite_emblem.png +share/gnome/help/user-guide/th/figures/naut_refine_search.png +share/gnome/help/user-guide/th/figures/naut_sampleemblem1_icon.png +share/gnome/help/user-guide/th/figures/naut_sampleemblem2_icon.png +share/gnome/help/user-guide/th/figures/naut_sampleemblem3_icon.png +share/gnome/help/user-guide/th/figures/naut_sampleemblem_icon.png +share/gnome/help/user-guide/th/figures/naut_samplesymlink_icon.png +share/gnome/help/user-guide/th/figures/naut_search_bar.png +share/gnome/help/user-guide/th/figures/naut_search_results.png +share/gnome/help/user-guide/th/figures/naut_spatial_icon_view.png +share/gnome/help/user-guide/th/figures/naut_spatial_list_view.png +share/gnome/help/user-guide/th/figures/naut_spatial_mode.png +share/gnome/help/user-guide/th/figures/naut_spatial_view.png +share/gnome/help/user-guide/th/figures/naut_starthere_launcher.png +share/gnome/help/user-guide/th/figures/naut_trash_launcher.png +share/gnome/help/user-guide/th/figures/naut_zoom_in_button.png +share/gnome/help/user-guide/th/figures/naut_zoom_out_button.png +share/gnome/help/user-guide/th/figures/nautilus_restore_saved_search.png +share/gnome/help/user-guide/th/figures/normal_pointer.png +share/gnome/help/user-guide/th/figures/not_available_pointer.png +share/gnome/help/user-guide/th/figures/notification_area_icon.png +share/gnome/help/user-guide/th/figures/open_drawer.png +share/gnome/help/user-guide/th/figures/openwindows_menu.png +share/gnome/help/user-guide/th/figures/panel_object_popup_menu.png +share/gnome/help/user-guide/th/figures/resize_pointer.png +share/gnome/help/user-guide/th/figures/run_button.png +share/gnome/help/user-guide/th/figures/sample_applet.png +share/gnome/help/user-guide/th/figures/screenshot_button.png +share/gnome/help/user-guide/th/figures/searchtool_button.png +share/gnome/help/user-guide/th/figures/show_desktop_button.png +share/gnome/help/user-guide/th/figures/titlebar_anno_window.png +share/gnome/help/user-guide/th/figures/titlebar_window.png +share/gnome/help/user-guide/th/figures/typical_menu.png +share/gnome/help/user-guide/th/figures/window_list_applet.png +share/gnome/help/user-guide/th/figures/window_list_group_applet.png +share/gnome/help/user-guide/th/figures/workspace_switcher_applet.png +share/gnome/help/user-guide/th/figures/yelp_add_bookmark.png +share/gnome/help/user-guide/th/figures/yelp_edit_bookmarks.png +share/gnome/help/user-guide/th/figures/yelp_preferences.png +share/gnome/help/user-guide/th/figures/yelp_window.png +share/gnome/help/user-guide/th/glossary.xml +share/gnome/help/user-guide/th/gosbasic.xml +share/gnome/help/user-guide/th/goscustdesk.xml +share/gnome/help/user-guide/th/goseditmainmenu.xml +share/gnome/help/user-guide/th/gosfeedback.xml +share/gnome/help/user-guide/th/gosnautilus.xml +share/gnome/help/user-guide/th/gosoverview.xml +share/gnome/help/user-guide/th/gospanel.xml +share/gnome/help/user-guide/th/gosstartsession.xml +share/gnome/help/user-guide/th/gostools.xml +share/gnome/help/user-guide/th/user-guide.xml share/gnome/help/user-guide/zh_CN/figures/ask_pointer.png share/gnome/help/user-guide/zh_CN/figures/busy_pointer.png share/gnome/help/user-guide/zh_CN/figures/com_file_manager_menu.png @@ -1757,16 +2058,19 @@ share/omf/gnome-access-guide/gnome-access-guide-pt.omf share/omf/gnome-access-guide/gnome-access-guide-sv.omf share/omf/system-admin-guide/system-admin-guide-C.omf share/omf/system-admin-guide/system-admin-guide-ca.omf +share/omf/system-admin-guide/system-admin-guide-de.omf share/omf/system-admin-guide/system-admin-guide-el.omf share/omf/system-admin-guide/system-admin-guide-es.omf share/omf/system-admin-guide/system-admin-guide-fi.omf share/omf/system-admin-guide/system-admin-guide-fr.omf share/omf/system-admin-guide/system-admin-guide-it.omf +share/omf/system-admin-guide/system-admin-guide-ja.omf share/omf/system-admin-guide/system-admin-guide-ko.omf share/omf/system-admin-guide/system-admin-guide-oc.omf share/omf/system-admin-guide/system-admin-guide-pa.omf share/omf/system-admin-guide/system-admin-guide-pt.omf share/omf/system-admin-guide/system-admin-guide-sv.omf +share/omf/system-admin-guide/system-admin-guide-zh_CN.omf share/omf/user-guide/user-guide-C.omf share/omf/user-guide/user-guide-ar.omf share/omf/user-guide/user-guide-bg.omf @@ -1777,6 +2081,7 @@ share/omf/user-guide/user-guide-fi.omf share/omf/user-guide/user-guide-fr.omf share/omf/user-guide/user-guide-hu.omf share/omf/user-guide/user-guide-it.omf +share/omf/user-guide/user-guide-ja.omf share/omf/user-guide/user-guide-ko.omf share/omf/user-guide/user-guide-oc.omf share/omf/user-guide/user-guide-pa.omf @@ -1784,12 +2089,15 @@ share/omf/user-guide/user-guide-pt.omf share/omf/user-guide/user-guide-pt_BR.omf share/omf/user-guide/user-guide-ru.omf share/omf/user-guide/user-guide-sv.omf +share/omf/user-guide/user-guide-th.omf share/omf/user-guide/user-guide-zh_CN.omf @dirrm share/omf/user-guide @dirrm share/omf/system-admin-guide @dirrm share/omf/gnome-access-guide @dirrm share/gnome/help/user-guide/zh_CN/figures @dirrm share/gnome/help/user-guide/zh_CN +@dirrm share/gnome/help/user-guide/th/figures +@dirrm share/gnome/help/user-guide/th @dirrm share/gnome/help/user-guide/sv/figures @dirrm share/gnome/help/user-guide/sv @dirrm share/gnome/help/user-guide/ru/figures @@ -1804,6 +2112,8 @@ share/omf/user-guide/user-guide-zh_CN.omf @dirrm share/gnome/help/user-guide/oc @dirrm share/gnome/help/user-guide/ko/figures @dirrm share/gnome/help/user-guide/ko +@dirrm share/gnome/help/user-guide/ja/figures +@dirrm share/gnome/help/user-guide/ja @dirrm share/gnome/help/user-guide/it/figures @dirrm share/gnome/help/user-guide/it @dirrm share/gnome/help/user-guide/hu/figures @@ -1825,16 +2135,19 @@ share/omf/user-guide/user-guide-zh_CN.omf @dirrm share/gnome/help/user-guide/C/figures @dirrm share/gnome/help/user-guide/C @dirrm share/gnome/help/user-guide +@dirrm share/gnome/help/system-admin-guide/zh_CN @dirrm share/gnome/help/system-admin-guide/sv @dirrm share/gnome/help/system-admin-guide/pt @dirrm share/gnome/help/system-admin-guide/pa @dirrm share/gnome/help/system-admin-guide/oc @dirrm share/gnome/help/system-admin-guide/ko +@dirrm share/gnome/help/system-admin-guide/ja @dirrm share/gnome/help/system-admin-guide/it @dirrm share/gnome/help/system-admin-guide/fr @dirrm share/gnome/help/system-admin-guide/fi @dirrm share/gnome/help/system-admin-guide/es @dirrm share/gnome/help/system-admin-guide/el +@dirrm share/gnome/help/system-admin-guide/de @dirrm share/gnome/help/system-admin-guide/ca @dirrm share/gnome/help/system-admin-guide/C @dirrm share/gnome/help/system-admin-guide diff --git a/misc/gnome2-reference/Makefile b/misc/gnome2-reference/Makefile index 4913ad0db5a7..b7ac021dee00 100644 --- a/misc/gnome2-reference/Makefile +++ b/misc/gnome2-reference/Makefile @@ -3,10 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome2-reference/Makefile,v 1.7 2007/09/04 21:54:03 ahze Exp $ +# $MCom: ports/misc/gnome2-reference/Makefile,v 1.9 2008/08/23 18:22:59 mezz Exp $ +# PORTNAME= gnome2-reference PORTVERSION= 2.20 +PORTREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= # empty DISTFILES= # empty @@ -21,7 +23,6 @@ COMMENT= The "meta-port" for GNOME 2 programming references REF_LIST= accessibility/at-spi-reference \ accessibility/atk-reference \ - accessibility/gail-reference \ databases/libgda2-reference \ databases/libgda3-reference \ databases/libgnomedb-reference \ diff --git a/misc/gnome2-reference/Makefile.inc b/misc/gnome2-reference/Makefile.inc index 3f1b5ec7afb4..6000edaf59e6 100644 --- a/misc/gnome2-reference/Makefile.inc +++ b/misc/gnome2-reference/Makefile.inc @@ -1,7 +1,6 @@ _PORT_REF_LIST= \ accessibility/at-spi-reference:at-spi-reference \ accessibility/atk-reference:atk-reference \ -accessibility/gail-reference:gail-reference \ databases/libgda2-reference:libgda2-reference \ databases/libgda3-reference:libgda3-reference \ databases/libgnomedb-reference:libgnomedb-reference \ diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile index fa09914b9fd6..5e90ba27d9f4 100644 --- a/misc/gnomehier/Makefile +++ b/misc/gnomehier/Makefile @@ -3,13 +3,13 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnomehier/Makefile,v 1.29 2007/09/12 14:40:40 ahze Exp $ +# $MCom: ports/misc/gnomehier/Makefile,v 1.31 2008/12/26 23:27:22 marcus Exp $ # # !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!! PORTNAME= gnomehier PORTVERSION= 2.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= misc gnome MASTER_SITES= # none DISTFILES= # none diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist index 5cadd8d1c75f..a526d5bc8e39 100644 --- a/misc/gnomehier/files/dirlist +++ b/misc/gnomehier/files/dirlist @@ -7,6 +7,7 @@ etc/X11/sysconfig etc/gconf etc/gconf/gconf.xml.defaults etc/gconf/gconf.xml.mandatory +etc/gconf/gconf.xml.system etc/gconf/schemas etc/gnome etc/gnome-vfs-2.0 diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile index 3e55cc68b4cb..52ae3843078c 100644 --- a/multimedia/cheese/Makefile +++ b/multimedia/cheese/Makefile @@ -3,12 +3,11 @@ # Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/cheese/Makefile,v 1.9 2008/03/10 21:10:13 mezz Exp $ +# $MCom: ports/multimedia/cheese/Makefile,v 1.26 2008/11/25 16:34:26 marcus Exp $ # PORTNAME= cheese -PORTVERSION= 2.22.3 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,11 +15,13 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A Photobooth-inspired app for taking pictures and videos from webcam +BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat + USE_XORG= xxf86vm USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnometarget intlhack evolutiondataserver \ - librsvg2 gnomedocutils +USE_GNOME= gnomehack gnomeprefix intlhack evolutiondataserver librsvg2 \ + gnomedocutils USE_GETTEXT= yes USE_GSTREAMER= good INSTALLS_OMF= yes diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo index 9c2d81c7a6f1..13cdc8ad0249 100644 --- a/multimedia/cheese/distinfo +++ b/multimedia/cheese/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/cheese-2.22.3.tar.bz2) = 21c23e289b1c8a1ae014704d615a9540 -SHA256 (gnome2/cheese-2.22.3.tar.bz2) = ac2039baa9cc4cc1d0794c003a40da1d9d84b9a581be7a1c7618c2e881995c52 -SIZE (gnome2/cheese-2.22.3.tar.bz2) = 1527967 +MD5 (gnome2/cheese-2.24.2.tar.bz2) = 82de87c881c45e6ef965b71fdad21bda +SHA256 (gnome2/cheese-2.24.2.tar.bz2) = aee9184a908e0f0a83e9394b894b32f47c5c6c9fb33a31fe6c8bd27e1d5a22b3 +SIZE (gnome2/cheese-2.24.2.tar.bz2) = 2762718 diff --git a/multimedia/cheese/files/patch-src_cheese-webcam.c b/multimedia/cheese/files/patch-src_cheese-webcam.c new file mode 100644 index 000000000000..a0b5afd21161 --- /dev/null +++ b/multimedia/cheese/files/patch-src_cheese-webcam.c @@ -0,0 +1,40 @@ +--- src/cheese-webcam.c.orig 2008-09-09 11:59:18.000000000 -0400 ++++ src/cheese-webcam.c 2008-09-09 12:01:14.000000000 -0400 +@@ -301,7 +301,9 @@ cheese_webcam_get_video_devices_from_hal + { + char *device; + char *gstreamer_src, *product_name; ++#ifdef VIDIOC_QUERYCAP + struct v4l2_capability v2cap; ++#endif + struct video_capability v1cap; + + device = libhal_device_get_property_string (hal_ctx, udis[i], "video4linux.device", &error); +@@ -327,7 +329,11 @@ cheese_webcam_get_video_devices_from_hal + libhal_free_string (device); + continue; + } ++#ifdef VIDIOC_QUERYCAP + ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap); ++#else ++ ok = -1; ++#endif + if (ok < 0) + { + ok = ioctl (fd, VIDIOCGCAP, &v1cap); +@@ -346,6 +352,7 @@ cheese_webcam_get_video_devices_from_hal + } + else + { ++#ifdef VIDIOC_QUERYCAP + guint cap = v2cap.capabilities; + g_print ("Detected v4l2 device: %s\n", v2cap.card); + g_print ("Driver: %s, version: %d\n", v2cap.driver, v2cap.version); +@@ -361,6 +368,7 @@ cheese_webcam_get_video_devices_from_hal + } + gstreamer_src = "v4l2src"; + product_name = (char *) v2cap.card; ++#endif + } + + priv->webcam_devices[priv->num_webcam_devices].hal_udi = g_strdup (udis[i]); diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist index 9478129624fb..7309efb74223 100644 --- a/multimedia/cheese/pkg-plist +++ b/multimedia/cheese/pkg-plist @@ -1,6 +1,7 @@ bin/cheese libexec/cheese/cheese-bugreport.sh share/applications/cheese.desktop +%%DATADIR%%/cheese-prefs.ui %%DATADIR%%/cheese-ui.xml %%DATADIR%%/cheese.ui %%DATADIR%%/effects/Hulk.png @@ -15,13 +16,24 @@ share/applications/cheese.desktop %%DATADIR%%/effects/videoflip_h.png %%DATADIR%%/effects/videoflip_v.png %%DATADIR%%/effects/warptv.png +%%DATADIR%%/gtkrc +%%DATADIR%%/icons/hicolor/16x16/actions/browse-webcam-effects.png +%%DATADIR%%/icons/hicolor/22x22/actions/browse-webcam-effects.png +%%DATADIR%%/icons/hicolor/24x24/actions/browse-webcam-effects.png +%%DATADIR%%/icons/hicolor/32x32/actions/browse-webcam-effects.png +%%DATADIR%%/icons/hicolor/48x48/actions/browse-webcam-effects.png +%%DATADIR%%/icons/hicolor/scalable/actions/browse-webcam-effects.svg %%DATADIR%%/pixmaps/camera-icon.svg +%%DATADIR%%/pixmaps/cheese-1.svg +%%DATADIR%%/pixmaps/cheese-2.svg +%%DATADIR%%/pixmaps/cheese-3.svg %%DATADIR%%/pixmaps/thumbnail-frame.png %%DATADIR%%/sounds/shutter0.ogg %%DATADIR%%/sounds/shutter1.ogg %%DATADIR%%/sounds/shutter2.ogg %%DATADIR%%/sounds/shutter3.ogg %%DATADIR%%/sounds/shutter4.ogg +share/dbus-1/services/org.gnome.Cheese.service %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -40,15 +52,24 @@ share/gnome/help/cheese/es/figures/cheese-screenshot.jpg share/gnome/help/cheese/fr/cheese.xml share/gnome/help/cheese/fr/figures/cheese-effects-screenshot.jpg share/gnome/help/cheese/fr/figures/cheese-screenshot.jpg +share/gnome/help/cheese/nl/cheese.xml +share/gnome/help/cheese/nl/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/nl/figures/cheese-screenshot.jpg share/gnome/help/cheese/oc/cheese.xml share/gnome/help/cheese/oc/figures/cheese-effects-screenshot.jpg share/gnome/help/cheese/oc/figures/cheese-screenshot.jpg +share/gnome/help/cheese/pt_BR/cheese.xml +share/gnome/help/cheese/pt_BR/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/pt_BR/figures/cheese-screenshot.jpg share/gnome/help/cheese/ru/cheese.xml share/gnome/help/cheese/ru/figures/cheese-effects-screenshot.jpg share/gnome/help/cheese/ru/figures/cheese-screenshot.jpg share/gnome/help/cheese/sv/cheese.xml share/gnome/help/cheese/sv/figures/cheese-effects-screenshot.jpg share/gnome/help/cheese/sv/figures/cheese-screenshot.jpg +share/gnome/help/cheese/th/cheese.xml +share/gnome/help/cheese/th/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/th/figures/cheese-screenshot.jpg share/icons/hicolor/16x16/apps/cheese.png share/icons/hicolor/22x22/apps/cheese.png share/icons/hicolor/24x24/apps/cheese.png @@ -63,6 +84,7 @@ share/locale/ca/LC_MESSAGES/cheese.mo share/locale/cs/LC_MESSAGES/cheese.mo share/locale/da/LC_MESSAGES/cheese.mo share/locale/de/LC_MESSAGES/cheese.mo +share/locale/dz/LC_MESSAGES/cheese.mo share/locale/el/LC_MESSAGES/cheese.mo share/locale/en_GB/LC_MESSAGES/cheese.mo share/locale/es/LC_MESSAGES/cheese.mo @@ -74,9 +96,12 @@ share/locale/ga/LC_MESSAGES/cheese.mo share/locale/gl/LC_MESSAGES/cheese.mo share/locale/gu/LC_MESSAGES/cheese.mo share/locale/he/LC_MESSAGES/cheese.mo +share/locale/hi/LC_MESSAGES/cheese.mo +share/locale/hr/LC_MESSAGES/cheese.mo share/locale/hu/LC_MESSAGES/cheese.mo share/locale/it/LC_MESSAGES/cheese.mo share/locale/ja/LC_MESSAGES/cheese.mo +share/locale/kn/LC_MESSAGES/cheese.mo share/locale/ko/LC_MESSAGES/cheese.mo share/locale/lt/LC_MESSAGES/cheese.mo share/locale/mk/LC_MESSAGES/cheese.mo @@ -86,14 +111,21 @@ share/locale/nb/LC_MESSAGES/cheese.mo share/locale/nl/LC_MESSAGES/cheese.mo share/locale/nn/LC_MESSAGES/cheese.mo share/locale/oc/LC_MESSAGES/cheese.mo +share/locale/or/LC_MESSAGES/cheese.mo share/locale/pa/LC_MESSAGES/cheese.mo share/locale/pl/LC_MESSAGES/cheese.mo +share/locale/ps/LC_MESSAGES/cheese.mo share/locale/pt/LC_MESSAGES/cheese.mo share/locale/pt_BR/LC_MESSAGES/cheese.mo share/locale/ro/LC_MESSAGES/cheese.mo share/locale/ru/LC_MESSAGES/cheese.mo share/locale/sl/LC_MESSAGES/cheese.mo +share/locale/sq/LC_MESSAGES/cheese.mo +share/locale/sr/LC_MESSAGES/cheese.mo +share/locale/sr@latin/LC_MESSAGES/cheese.mo share/locale/sv/LC_MESSAGES/cheese.mo +share/locale/ta/LC_MESSAGES/cheese.mo +share/locale/te/LC_MESSAGES/cheese.mo share/locale/th/LC_MESSAGES/cheese.mo share/locale/tr/LC_MESSAGES/cheese.mo share/locale/uk/LC_MESSAGES/cheese.mo @@ -105,16 +137,25 @@ share/omf/cheese/cheese-C.omf share/omf/cheese/cheese-el.omf share/omf/cheese/cheese-es.omf share/omf/cheese/cheese-fr.omf +share/omf/cheese/cheese-nl.omf share/omf/cheese/cheese-oc.omf +share/omf/cheese/cheese-pt_BR.omf share/omf/cheese/cheese-ru.omf share/omf/cheese/cheese-sv.omf +share/omf/cheese/cheese-th.omf @dirrm share/omf/cheese +@dirrm share/gnome/help/cheese/th/figures +@dirrm share/gnome/help/cheese/th @dirrm share/gnome/help/cheese/sv/figures @dirrm share/gnome/help/cheese/sv @dirrm share/gnome/help/cheese/ru/figures @dirrm share/gnome/help/cheese/ru +@dirrm share/gnome/help/cheese/pt_BR/figures +@dirrm share/gnome/help/cheese/pt_BR @dirrm share/gnome/help/cheese/oc/figures @dirrm share/gnome/help/cheese/oc +@dirrm share/gnome/help/cheese/nl/figures +@dirrm share/gnome/help/cheese/nl @dirrm share/gnome/help/cheese/fr/figures @dirrm share/gnome/help/cheese/fr @dirrm share/gnome/help/cheese/es/figures @@ -127,16 +168,38 @@ share/omf/cheese/cheese-sv.omf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%%/icons/hicolor/scalable/actions +@dirrm %%DATADIR%%/icons/hicolor/scalable +@dirrm %%DATADIR%%/icons/hicolor/48x48/actions +@dirrm %%DATADIR%%/icons/hicolor/48x48 +@dirrm %%DATADIR%%/icons/hicolor/32x32/actions +@dirrm %%DATADIR%%/icons/hicolor/32x32 +@dirrm %%DATADIR%%/icons/hicolor/24x24/actions +@dirrm %%DATADIR%%/icons/hicolor/24x24 +@dirrm %%DATADIR%%/icons/hicolor/22x22/actions +@dirrm %%DATADIR%%/icons/hicolor/22x22 +@dirrm %%DATADIR%%/icons/hicolor/16x16/actions +@dirrm %%DATADIR%%/icons/hicolor/16x16 +@dirrm %%DATADIR%%/icons/hicolor +@dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/effects @dirrm %%DATADIR%% @dirrmtry share/applications @dirrm libexec/cheese @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@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/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile index 63c9b948629b..6abde2ef46ed 100644 --- a/multimedia/py-gstreamer/Makefile +++ b/multimedia/py-gstreamer/Makefile @@ -3,11 +3,12 @@ # Whom: Koop Mast <kwm@rainbow-runner.nl> # # $FreeBSD$ -# $MCom: ports/multimedia/py-gstreamer/Makefile,v 1.17 2008/03/21 04:06:13 ahze Exp $ +# $MCom: ports/multimedia/py-gstreamer/Makefile,v 1.20 2008/07/26 17:21:38 marcus Exp $ # PORTNAME= gstreamer PORTVERSION= 0.10.12 +PORTREVISION= 1 CATEGORIES= multimedia python gnome MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/multimedia/py-gstreamer/pkg-plist b/multimedia/py-gstreamer/pkg-plist index 617a43e82cad..5810ddfaefac 100644 --- a/multimedia/py-gstreamer/pkg-plist +++ b/multimedia/py-gstreamer/pkg-plist @@ -28,6 +28,8 @@ %%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/interfaces.so %%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/pbutils.la %%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/pbutils.so +%%PYTHON_SITELIBDIR%%/gstoption.la +%%PYTHON_SITELIBDIR%%/gstoption.so %%PYTHON_SITELIBDIR%%/pygst.pth %%PYTHON_SITELIBDIR%%/pygst.py %%PYTHON_SITELIBDIR%%/pygst.pyc diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile index 252752f11909..d0b33dd1b49f 100644 --- a/multimedia/swfdec-gnome/Makefile +++ b/multimedia/swfdec-gnome/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.7 2008/03/10 21:53:57 mezz Exp $ +# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.13 2008/09/23 15:22:49 kwm Exp $ # PORTNAME= swfdec-gnome -PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= multimedia MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,9 +15,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= kwm@FreeBSD.org COMMENT= Gtk flash player and thumbnailer -LIB_DEPENDS= swfdec-0.6:${PORTSDIR}/graphics/swfdec +LIB_DEPENDS= swfdec-0.8:${PORTSDIR}/graphics/swfdec USE_GNOME= gnomehack gnomeprefix gtk20 intlhack gconf2 +USE_BZIP2= yes +INSTALLS_ICONS= yes USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/multimedia/swfdec-gnome/distinfo b/multimedia/swfdec-gnome/distinfo index ea274a090f15..75725a460ccd 100644 --- a/multimedia/swfdec-gnome/distinfo +++ b/multimedia/swfdec-gnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/swfdec-gnome-2.22.2.tar.gz) = c1d41235375e05bd86d12c19604e3fed -SHA256 (gnome2/swfdec-gnome-2.22.2.tar.gz) = 54a4afd307ac333a3f18616c032b28cb9922c58ca3e8aea5b9424ef902024682 -SIZE (gnome2/swfdec-gnome-2.22.2.tar.gz) = 206769 +MD5 (gnome2/swfdec-gnome-2.24.0.tar.bz2) = e5807265a3123f952e0950985ad86412 +SHA256 (gnome2/swfdec-gnome-2.24.0.tar.bz2) = 3d702291d3229f6efea1c054fe02c4d2f6ca6b34a0680af76ecb0bf060833b4a +SIZE (gnome2/swfdec-gnome-2.24.0.tar.bz2) = 157558 diff --git a/multimedia/swfdec-gnome/pkg-plist b/multimedia/swfdec-gnome/pkg-plist index 0292887d6388..e303acba8b80 100644 --- a/multimedia/swfdec-gnome/pkg-plist +++ b/multimedia/swfdec-gnome/pkg-plist @@ -1,8 +1,15 @@ bin/swfdec-player bin/swfdec-thumbnailer share/applications/swfdec-player.desktop +share/icons/hicolor/16x16/apps/swfdec-gnome.png +share/icons/hicolor/22x22/apps/swfdec-gnome.png +share/icons/hicolor/24x24/apps/swfdec-gnome.png +share/icons/hicolor/32x32/apps/swfdec-gnome.png +share/icons/hicolor/48x48/apps/swfdec-gnome.png +share/icons/hicolor/scalable/apps/swfdec-gnome.svg share/locale/ar/LC_MESSAGES/swfdec-gnome.mo share/locale/be@latin/LC_MESSAGES/swfdec-gnome.mo +share/locale/bg/LC_MESSAGES/swfdec-gnome.mo share/locale/bn_IN/LC_MESSAGES/swfdec-gnome.mo share/locale/ca/LC_MESSAGES/swfdec-gnome.mo share/locale/cs/LC_MESSAGES/swfdec-gnome.mo @@ -16,6 +23,7 @@ share/locale/eu/LC_MESSAGES/swfdec-gnome.mo share/locale/fi/LC_MESSAGES/swfdec-gnome.mo share/locale/fr/LC_MESSAGES/swfdec-gnome.mo share/locale/gl/LC_MESSAGES/swfdec-gnome.mo +share/locale/gu/LC_MESSAGES/swfdec-gnome.mo share/locale/he/LC_MESSAGES/swfdec-gnome.mo share/locale/hi/LC_MESSAGES/swfdec-gnome.mo share/locale/hu/LC_MESSAGES/swfdec-gnome.mo @@ -24,6 +32,7 @@ share/locale/ja/LC_MESSAGES/swfdec-gnome.mo share/locale/ko/LC_MESSAGES/swfdec-gnome.mo share/locale/lt/LC_MESSAGES/swfdec-gnome.mo share/locale/mk/LC_MESSAGES/swfdec-gnome.mo +share/locale/ml/LC_MESSAGES/swfdec-gnome.mo share/locale/mr/LC_MESSAGES/swfdec-gnome.mo share/locale/nb/LC_MESSAGES/swfdec-gnome.mo share/locale/nl/LC_MESSAGES/swfdec-gnome.mo @@ -35,6 +44,8 @@ share/locale/pt_BR/LC_MESSAGES/swfdec-gnome.mo share/locale/ru/LC_MESSAGES/swfdec-gnome.mo share/locale/sl/LC_MESSAGES/swfdec-gnome.mo share/locale/sq/LC_MESSAGES/swfdec-gnome.mo +share/locale/sr/LC_MESSAGES/swfdec-gnome.mo +share/locale/sr@latin/LC_MESSAGES/swfdec-gnome.mo share/locale/sv/LC_MESSAGES/swfdec-gnome.mo share/locale/ta/LC_MESSAGES/swfdec-gnome.mo share/locale/th/LC_MESSAGES/swfdec-gnome.mo @@ -51,6 +62,10 @@ share/locale/zh_TW/LC_MESSAGES/swfdec-gnome.mo @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile index 2770853996f3..8a4c89f07e37 100644 --- a/multimedia/totem-pl-parser/Makefile +++ b/multimedia/totem-pl-parser/Makefile @@ -3,14 +3,14 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.8 2008/03/10 15:04:41 ahze Exp $ +# $MCom: ports/multimedia/totem-pl-parser/Makefile,v 1.19 2008/12/14 17:56:46 mezz Exp $ # PORTNAME= totem-pl-parser -PORTVERSION= 2.22.3 -PORTREVISION= 2 +PORTVERSION= 2.24.3 CATEGORIES= multimedia gnome MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GObject-based library to parse a host of playlist formats diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo index ae3396efb7ff..2c717afa7f51 100644 --- a/multimedia/totem-pl-parser/distinfo +++ b/multimedia/totem-pl-parser/distinfo @@ -1,3 +1,3 @@ -MD5 (totem-pl-parser-2.22.3.tar.bz2) = a00956f87fa8fcb1f6760dccea5e0f84 -SHA256 (totem-pl-parser-2.22.3.tar.bz2) = 360b08584f44710bbcb380dfec33ee9bdea351383cbf15a8da1c3041337b8767 -SIZE (totem-pl-parser-2.22.3.tar.bz2) = 831247 +MD5 (gnome2/totem-pl-parser-2.24.3.tar.bz2) = f63f3a7743b7ec5b1115d3866461ce30 +SHA256 (gnome2/totem-pl-parser-2.24.3.tar.bz2) = 27aeac92d03d006efde5c461148db3b983582dc66ad835bec5f6a12bbea39a4c +SIZE (gnome2/totem-pl-parser-2.24.3.tar.bz2) = 620727 diff --git a/multimedia/totem-pl-parser/files/patch-lib_memmem.c b/multimedia/totem-pl-parser/files/patch-lib_memmem.c deleted file mode 100644 index 8684ae9ceec8..000000000000 --- a/multimedia/totem-pl-parser/files/patch-lib_memmem.c +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/memmem.c.orig 2008-02-07 07:24:38.000000000 -0500 -+++ lib/memmem.c 2008-02-24 15:13:50.000000000 -0500 -@@ -31,8 +31,10 @@ - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ --#ifndef __sun -+#if !defined(__sun) && !defined(__FreeBSD__) - #include "bbs.h" -+#endif -+#ifndef __sun - #include <sys/cdefs.h> - #endif - diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist index 5b430b2837be..37f9d0608852 100644 --- a/multimedia/totem-pl-parser/pkg-plist +++ b/multimedia/totem-pl-parser/pkg-plist @@ -6,11 +6,11 @@ include/totem-pl-parser/1/plparser/totem-pl-parser.h lib/libtotem-plparser-mini.a lib/libtotem-plparser-mini.la lib/libtotem-plparser-mini.so -lib/libtotem-plparser-mini.so.10 +lib/libtotem-plparser-mini.so.12 lib/libtotem-plparser.a lib/libtotem-plparser.la lib/libtotem-plparser.so -lib/libtotem-plparser.so.10 +lib/libtotem-plparser.so.12 libdata/pkgconfig/totem-plparser-mini.pc libdata/pkgconfig/totem-plparser.pc %%DOCSDIR%%/ch01.html @@ -88,7 +88,7 @@ share/locale/sk/LC_MESSAGES/totem-pl-parser.mo share/locale/sl/LC_MESSAGES/totem-pl-parser.mo share/locale/sq/LC_MESSAGES/totem-pl-parser.mo share/locale/sr/LC_MESSAGES/totem-pl-parser.mo -share/locale/sr@Latn/LC_MESSAGES/totem-pl-parser.mo +share/locale/sr@latin/LC_MESSAGES/totem-pl-parser.mo share/locale/sv/LC_MESSAGES/totem-pl-parser.mo share/locale/ta/LC_MESSAGES/totem-pl-parser.mo share/locale/te/LC_MESSAGES/totem-pl-parser.mo @@ -114,6 +114,8 @@ share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 81836a23f05d..d04788bf07b3 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -3,12 +3,12 @@ # Whom: Hendrik Scholz <hendrik@scholz.net> # # $FreeBSD$ -# $MCom: ports-stable/multimedia/totem/Makefile,v 1.9 2008/08/02 21:17:25 mezz Exp $ +# $MCom: ports/multimedia/totem/Makefile,v 1.118 2008/11/09 11:58:37 kwm Exp $ # PORTNAME= totem -PORTVERSION= 2.22.2 -PORTREVISION?= 4 +PORTVERSION= 2.24.3 +PORTREVISION?= 0 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ COMMENT?= A gstreamer-based video player for the GNOME 2 Desktop BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ - totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser + totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${PYTHON_SITELIBDIR}/atom/__init__.py:${PORTSDIR}/devel/py-gdata @@ -26,7 +26,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co USE_PYTHON= yes USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \ +USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils \ nautiluscdburner ltverhack pygtk2 GNOME_DESKTOP_VERSION=2 WANT_GSTREAMER= yes @@ -37,17 +37,18 @@ USE_LDCONFIG= yes INSTALLS_OMF= yes PKGMESSAGE= ${WRKDIR}/pkg-message CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lXrandr" + LIBS="-L${LOCALBASE}/lib -lXrandr" \ + BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}" CONFIGURE_ARGS= --with-plugins="${TOTEM_PLUGINS}" MAN1= totem.1 totem-video-thumbnailer.1 GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \ totem.schemas -CONFLICTS?= totem-gstreamer-[0-9]* totem-xine-[0-9]* +CONFLICTS?= totem-xine-[0-9]* OPTIONS= LIRC "Enable lirc support" off \ GALAGO "Enable Galago support" off \ - GECKO_PLUGINS "Enable install plugins for gecko browser" on \ + BROWSER_PLUGINS "Enable install plugins for gecko browser" on \ PUBLISH "Enable Publish (network playlist) plugin" off \ TRACKER "Enable tracker local search plugin" off @@ -91,34 +92,26 @@ TOTEM_PLUGINS:= ${TOTEM_PLUGINS} galago PLIST_SUB+= GALAGO="@comment " .endif -.if !defined(WITHOUT_GECKO_PLUGINS) -USE_GECKO= firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" -CONFIGURE_ARGS+=--with-mozilla=${GECKO} \ - --enable-browser-plugins \ +.if !defined(WITHOUT_BROWSER_PLUGINS) +CONFIGURE_ARGS+=--enable-browser-plugins \ --enable-gmp-plugin \ --enable-complex-plugin \ --enable-narrowspace-plugin -PLIST_SUB+= GECKO_PLUGINS="" - -USE_WEBPLUGINS= gecko* -WEBPLUGINS_FILES= libtotem-basic-plugin.so libtotem-basic-plugin.xpt \ - libtotem-complex-plugin.so libtotem-complex-plugin.xpt \ - libtotem-cone-plugin.so libtotem-cone-plugin.xpt \ - libtotem-gmp-plugin.so libtotem-gmp-plugin.xpt \ - libtotem-mully-plugin.so libtotem-mully-plugin.xpt \ - libtotem-narrowspace-plugin.so \ - libtotem-narrowspace-plugin.xpt +PLIST_SUB+= BROWSER_PLUGINS="" + +USE_WEBPLUGINS= gecko19 webkit-gtk2 +WEBPLUGINS_FILES= libtotem-basic-plugin.so libtotem-complex-plugin.so \ + libtotem-cone-plugin.so libtotem-gmp-plugin.so \ + libtotem-mully-plugin.so \ + libtotem-narrowspace-plugin.so .include "${PORTSDIR}/www/firefox/Makefile.webplugins" .else -CONFIGURE_ARGS+=--without-mozilla \ - --disable-browser-plugins \ - --disable-mozilla \ +CONFIGURE_ARGS+=--disable-browser-plugins \ --disable-basic-plugin \ --disable-gmp-plugin \ --disable-complex-plugin \ --disable-narrowspace-plugin -PLIST_SUB+= GECKO_PLUGINS="@comment " +PLIST_SUB+= BROWSER_PLUGINS="@comment " .endif .if !defined(WITH_TOTEM_XINE) || ${SLAVE_PORT}=="no" @@ -149,9 +142,8 @@ pre-everything:: post-patch: @${CP} -f ${FILESDIR}/pkg-message.in ${PKGMESSAGE} - @${REINPLACE_CMD} -e 's|dbus >= 0.61|dbus-1 >= 0.61|g ; \ - s|_PLUGINDIR=".*"|_PLUGINDIR="${WEBPLUGINS_DIR}"|g' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|dbus >= 0.61|dbus-1 >= 0.61|g' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ ${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c @@ -160,5 +152,6 @@ post-install: ${MKDIR} ${PREFIX}/share/vala/vapi ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.vapi ${PREFIX}/share/vala/vapi ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.deps ${PREFIX}/share/vala/vapi + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo index 22866f91f455..a19d2bab72a2 100644 --- a/multimedia/totem/distinfo +++ b/multimedia/totem/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/totem-2.22.2.tar.bz2) = 6062080e81b4859f87fee8a592b92489 -SHA256 (gnome2/totem-2.22.2.tar.bz2) = 7dd755e3b9a9610989661bfe7e09388e67ba6aca960c33e65e6a39682c00ffd4 -SIZE (gnome2/totem-2.22.2.tar.bz2) = 2403730 +MD5 (gnome2/totem-2.24.3.tar.bz2) = 261bae2586c3bb6a55bfa2704d7e3b14 +SHA256 (gnome2/totem-2.24.3.tar.bz2) = 235a2e39959e7da3dc49f5d1d9c7259a74047d32a52b0eefeec5265174769836 +SIZE (gnome2/totem-2.24.3.tar.bz2) = 2545808 diff --git a/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in b/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in deleted file mode 100644 index 238b32c3263a..000000000000 --- a/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- browser-plugin/idl/Makefile.in.orig 2008-03-15 20:31:26.000000000 -0500 -+++ browser-plugin/idl/Makefile.in 2008-03-15 20:31:34.000000000 -0500 -@@ -532,7 +532,7 @@ - - info-am: - --install-data-am: install-docDATA install-xptDATA -+install-data-am: install-xptDATA - - install-dvi: install-dvi-am - diff --git a/multimedia/totem/files/patch-browser-plugin_totemClassInfo.h b/multimedia/totem/files/patch-browser-plugin_totemClassInfo.h deleted file mode 100644 index e4f8e650ed7b..000000000000 --- a/multimedia/totem/files/patch-browser-plugin_totemClassInfo.h +++ /dev/null @@ -1,45 +0,0 @@ ---- browser-plugin/totemClassInfo.h.orig 2007-08-09 17:32:58.000000000 +0000 -+++ browser-plugin/totemClassInfo.h 2007-08-09 17:55:50.000000000 +0000 -@@ -47,10 +47,10 @@ - NS_IMETHODIMP _class::GetClassDescription(char * *aClassDescription)\ - {\ - *aClassDescription = static_cast<char*>(\ -- nsMemory::Clone (_description,\ -- sizeof (_description)));\ -+ nsMemory::Alloc (sizeof (_description) + 1));\ - if (!*aClassDescription)\ - return NS_ERROR_OUT_OF_MEMORY;\ -+ strcpy(*aClassDescription, _description);\ - \ - return NS_OK;\ - }\ -@@ -59,10 +59,10 @@ - NS_IMETHODIMP _class::GetClassID(nsCID * *aClassID)\ - {\ - *aClassID = static_cast<nsCID*>(\ -- nsMemory::Clone (&_cid,\ -- sizeof (nsCID*)));\ -+ nsMemory::Alloc (sizeof (nsCID*) + 1));\ - if (!*aClassID)\ - return NS_ERROR_OUT_OF_MEMORY;\ -+ memcpy(*aClassID, &_cid, sizeof (nsCID*));\ - \ - return NS_OK;\ - }\ -@@ -99,13 +99,12 @@ - - #define TOTEM_CLASSINFO_ENTRY(_i, _interface)\ - (*array)[_i] = static_cast<nsIID*>(\ -- nsMemory::Clone(&NS_GET_IID(_interface),\ -- sizeof(nsIID)));\ -+ nsMemory::Alloc(sizeof(nsIID) + 1));\ - if (!(*array)[_i]) {\ - NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY (_i, *array);\ - return NS_ERROR_OUT_OF_MEMORY;\ -- } -- -+ }\ -+ memcpy((*array)[_i], &NS_GET_IID(_interface), sizeof(nsIID)); - - #define TOTEM_CLASSINFO_END \ - return NS_OK;\ diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure index 67b99d2287b5..4c6c7b340f9d 100644 --- a/multimedia/totem/files/patch-configure +++ b/multimedia/totem/files/patch-configure @@ -1,12 +1,12 @@ ---- configure.orig 2008-08-02 00:06:51.000000000 -0500 -+++ configure 2008-08-02 00:09:01.000000000 -0500 -@@ -25298,8 +25298,7 @@ - if test "$have_libxpcomglue_s" = "yes"; then - LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s" - else -- { echo "$as_me:$LINENO: WARNING: libxpcomglue_s not available; plugins may not be portable" >&5 --echo "$as_me: WARNING: libxpcomglue_s not available; plugins may not be portable" >&2;} -+ LIBXPCOMGLUE_S=`$PKG_CONFIG --libs $MOZILLA-xpcom` - fi - fi +--- configure.orig 2008-08-30 08:23:22.000000000 +0200 ++++ configure 2008-08-30 08:24:20.000000000 +0200 +@@ -25171,7 +25171,9 @@ + _ACEOF + + ++if [ -z "${BROWSER_PLUGIN_DIR}" ]; then + BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}" ++fi + + diff --git a/multimedia/totem/files/pkg-message.in b/multimedia/totem/files/pkg-message.in index 05d7f5b20978..5c4332981d9d 100644 --- a/multimedia/totem/files/pkg-message.in +++ b/multimedia/totem/files/pkg-message.in @@ -1,4 +1,6 @@ -Make sure you've enough shared memory, the xine FAQ -advises to have the following sysctl settings: -kern.ipc.shmmax=67108864 -kern.ipc.shmall=32768 +******************************************************** +* Make sure you've enough shared memory, the xine FAQ * +* advises to have the following sysctl settings: * +* kern.ipc.shmmax=67108864 * +* kern.ipc.shmall=32768 * +******************************************************** diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index ef4479b60a0a..67ffdd5a10da 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -2,30 +2,28 @@ bin/totem bin/totem-audio-preview bin/totem-video-indexer bin/totem-video-thumbnailer -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.a -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.la -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.so -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.xpt -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.a -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.la -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.so -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.xpt -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.a -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.la -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.so -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.xpt -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.a -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.la -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.so -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.xpt -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.a -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.la -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.so -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.xpt -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.a -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.la -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.so -%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.xpt +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.so +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.a +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.la +%%BROWSER_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.so +lib/libbaconvideowidget.a +lib/libbaconvideowidget.la +lib/libbaconvideowidget.so +lib/libbaconvideowidget.so.0 lib/nautilus/extensions-2.0/libtotem-properties-page.a lib/nautilus/extensions-2.0/libtotem-properties-page.la lib/nautilus/extensions-2.0/libtotem-properties-page.so @@ -83,7 +81,7 @@ lib/totem/plugins/youtube/youtube.pyc lib/totem/plugins/youtube/youtube.pyo lib/totem/plugins/youtube/youtube.totem-plugin lib/totem/plugins/youtube/youtube.ui -%%GECKO_PLUGINS%%libexec/totem-plugin-viewer +%%BROWSER_PLUGINS%%libexec/totem-plugin-viewer libexec/totem/totem-bugreport.py share/applications/totem.desktop share/gnome/help/totem/C/figures/totem_next_button.png @@ -180,6 +178,15 @@ share/gnome/help/totem/pa/figures/totem_start_window.png share/gnome/help/totem/pa/figures/totem_volume_maximum_button.png share/gnome/help/totem/pa/figures/totem_volume_mute_button.png share/gnome/help/totem/pa/totem.xml +share/gnome/help/totem/pl/figures/totem_next_button.png +share/gnome/help/totem/pl/figures/totem_pause_button.png +share/gnome/help/totem/pl/figures/totem_play_button.png +share/gnome/help/totem/pl/figures/totem_previous_button.png +share/gnome/help/totem/pl/figures/totem_show_playlist_button.png +share/gnome/help/totem/pl/figures/totem_start_window.png +share/gnome/help/totem/pl/figures/totem_volume_maximum_button.png +share/gnome/help/totem/pl/figures/totem_volume_mute_button.png +share/gnome/help/totem/pl/totem.xml share/gnome/help/totem/pt_BR/figures/totem_next_button.png share/gnome/help/totem/pt_BR/figures/totem_pause_button.png share/gnome/help/totem/pt_BR/figures/totem_play_button.png @@ -305,7 +312,7 @@ share/locale/sk/LC_MESSAGES/totem.mo share/locale/sl/LC_MESSAGES/totem.mo share/locale/sq/LC_MESSAGES/totem.mo share/locale/sr/LC_MESSAGES/totem.mo -share/locale/sr@Latn/LC_MESSAGES/totem.mo +share/locale/sr@latin/LC_MESSAGES/totem.mo share/locale/sv/LC_MESSAGES/totem.mo share/locale/ta/LC_MESSAGES/totem.mo share/locale/te/LC_MESSAGES/totem.mo @@ -330,6 +337,7 @@ share/omf/totem/totem-fr.omf share/omf/totem/totem-it.omf share/omf/totem/totem-oc.omf share/omf/totem/totem-pa.omf +share/omf/totem/totem-pl.omf share/omf/totem/totem-pt_BR.omf share/omf/totem/totem-ru.omf share/omf/totem/totem-sv.omf @@ -364,6 +372,8 @@ share/vala/vapi/totem.vapi @dirrm share/gnome/help/totem/ru @dirrm share/gnome/help/totem/pt_BR/figures @dirrm share/gnome/help/totem/pt_BR +@dirrm share/gnome/help/totem/pl/figures +@dirrm share/gnome/help/totem/pl @dirrm share/gnome/help/totem/pa/figures @dirrm share/gnome/help/totem/pa @dirrm share/gnome/help/totem/oc/figures @@ -387,6 +397,7 @@ share/vala/vapi/totem.vapi @dirrm share/gnome/help/totem/C/figures @dirrm share/gnome/help/totem/C @dirrm share/gnome/help/totem +@dirrmtry share/applications @dirrm libexec/totem @dirrm lib/totem/plugins/youtube @dirrm lib/totem/plugins/totem @@ -403,10 +414,9 @@ share/vala/vapi/totem.vapi %%GALAGO%%@dirrm lib/totem/plugins/galago @dirrm lib/totem/plugins @dirrm lib/totem -%%GECKO_PLUGINS%%@dirrmtry %%WEBPLUGINS_DIR%% +%%BROWSER_PLUGINS%%@dirrmtry %%WEBPLUGINS_DIR%% @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -415,6 +425,8 @@ share/vala/vapi/totem.vapi @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index c4b20af7750e..e61022503443 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/empathy/Makefile,v 1.5 2008/03/10 13:39:43 ahze Exp $ +# $MCom: ports/net-im/empathy/Makefile,v 1.16 2008/10/20 23:38:20 kwm Exp $ PORTNAME= empathy -PORTVERSION= 0.22.1 -PORTREVISION= 2 +PORTVERSION= 2.24.1 CATEGORIES= net-im gnome MASTER_SITES= GNOME @@ -21,11 +20,13 @@ LIB_DEPENDS= missioncontrol-server.1:${PORTSDIR}/net-im/telepathy-mission-contro RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes USE_GMAKE= yes +USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack \ gnomepanel USE_AUTOTOOLS= libtool:15 +INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PYTHON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -33,8 +34,38 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= GNOME_Megaphone_Applet.schemas empathy.schemas +MAN1= empathy.1 + +OPTIONS= JABBER "Enable jabber (XMPP) client support" on \ + MSN "Enable MSN client support" on \ + IRC "Enable IRC client support" on \ + SALUT "Enable link-local (serverless) XMPP support" off \ + HAZE "Enable libpurple protocol integration" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_JABBER) +RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble +.endif + +.if defined(WITH_MSN) +RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly +.endif + +.if defined(WITH_IRC) +RUN_DEPENDS+= telepathy-idle:${PORTSDIR}/net-im/telepathy-idle +.endif + +.if !defined(WITHOUT_SALUT) +RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut +.endif + +.if !defined(WITHOUT_HAZE) +RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze +.endif + post-patch: @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|' \ ${WRKSRC}/configure -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo index 9d376ae975b1..756da0a564c4 100644 --- a/net-im/empathy/distinfo +++ b/net-im/empathy/distinfo @@ -1,3 +1,3 @@ -MD5 (empathy-0.22.1.tar.gz) = a49e365804609bec00b0518db896239d -SHA256 (empathy-0.22.1.tar.gz) = d68dee57af64c31f09c5f2c083f12b9b7c87a3306881df31b28cd8e7191f5135 -SIZE (empathy-0.22.1.tar.gz) = 1840194 +MD5 (empathy-2.24.1.tar.bz2) = 98d1ef485b23a75a9a115547ca2da66a +SHA256 (empathy-2.24.1.tar.bz2) = 24b675e389fb91898bd2924f8b35db7e7aef4c40bbb69412e445048dd9e18123 +SIZE (empathy-2.24.1.tar.bz2) = 1761446 diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist index 4578a832ab15..e90370f07944 100644 --- a/net-im/empathy/pkg-plist +++ b/net-im/empathy/pkg-plist @@ -1,51 +1,38 @@ bin/empathy -bin/empathy-accounts bin/empathy-logs -etc/xdg/autostart/empathy.desktop -include/libempathy-gtk/empathy-about-dialog.h include/libempathy-gtk/empathy-account-chooser.h include/libempathy-gtk/empathy-account-widget-irc.h +include/libempathy-gtk/empathy-account-widget-sip.h include/libempathy-gtk/empathy-account-widget.h -include/libempathy-gtk/empathy-accounts-dialog.h include/libempathy-gtk/empathy-avatar-chooser.h include/libempathy-gtk/empathy-avatar-image.h -include/libempathy-gtk/empathy-call-window.h include/libempathy-gtk/empathy-cell-renderer-activatable.h include/libempathy-gtk/empathy-cell-renderer-expander.h include/libempathy-gtk/empathy-cell-renderer-text.h include/libempathy-gtk/empathy-chat-view.h -include/libempathy-gtk/empathy-chat-window.h include/libempathy-gtk/empathy-chat.h -include/libempathy-gtk/empathy-chatrooms-window.h include/libempathy-gtk/empathy-conf.h include/libempathy-gtk/empathy-contact-dialogs.h include/libempathy-gtk/empathy-contact-list-store.h include/libempathy-gtk/empathy-contact-list-view.h +include/libempathy-gtk/empathy-contact-menu.h include/libempathy-gtk/empathy-contact-widget.h include/libempathy-gtk/empathy-geometry.h -include/libempathy-gtk/empathy-group-chat.h include/libempathy-gtk/empathy-gtk-enum-types.h include/libempathy-gtk/empathy-images.h include/libempathy-gtk/empathy-irc-network-dialog.h include/libempathy-gtk/empathy-log-window.h -include/libempathy-gtk/empathy-main-window.h -include/libempathy-gtk/empathy-new-chatroom-dialog.h include/libempathy-gtk/empathy-new-message-dialog.h -include/libempathy-gtk/empathy-preferences.h include/libempathy-gtk/empathy-presence-chooser.h -include/libempathy-gtk/empathy-private-chat.h include/libempathy-gtk/empathy-profile-chooser.h include/libempathy-gtk/empathy-smiley-manager.h include/libempathy-gtk/empathy-spell-dialog.h include/libempathy-gtk/empathy-spell.h -include/libempathy-gtk/empathy-status-icon.h include/libempathy-gtk/empathy-theme-boxes.h include/libempathy-gtk/empathy-theme-irc.h include/libempathy-gtk/empathy-theme-manager.h include/libempathy-gtk/empathy-theme.h include/libempathy-gtk/empathy-ui-utils.h -include/libempathy/empathy-avatar.h -include/libempathy/empathy-chandler.h include/libempathy/empathy-chatroom-manager.h include/libempathy/empathy-chatroom.h include/libempathy/empathy-contact-factory.h @@ -54,8 +41,8 @@ include/libempathy/empathy-contact-list.h include/libempathy/empathy-contact-manager.h include/libempathy/empathy-contact.h include/libempathy/empathy-debug.h +include/libempathy/empathy-dispatcher.h include/libempathy/empathy-enum-types.h -include/libempathy/empathy-filter.h include/libempathy/empathy-idle.h include/libempathy/empathy-irc-network-manager.h include/libempathy/empathy-irc-network.h @@ -66,20 +53,21 @@ include/libempathy/empathy-status-presets.h include/libempathy/empathy-time.h include/libempathy/empathy-tp-call.h include/libempathy/empathy-tp-chat.h -include/libempathy/empathy-tp-chatroom.h include/libempathy/empathy-tp-contact-factory.h include/libempathy/empathy-tp-contact-list.h include/libempathy/empathy-tp-group.h include/libempathy/empathy-tp-roomlist.h +include/libempathy/empathy-tp-tube.h +include/libempathy/empathy-tube-handler.h include/libempathy/empathy-utils.h lib/libempathy-gtk.a lib/libempathy-gtk.la lib/libempathy-gtk.so -lib/libempathy-gtk.so.11 +lib/libempathy-gtk.so.15 lib/libempathy.a lib/libempathy.la lib/libempathy.so -lib/libempathy.so.11 +lib/libempathy.so.14 %%PYTHON_SITELIBDIR%%/empathy.a %%PYTHON_SITELIBDIR%%/empathy.la %%PYTHON_SITELIBDIR%%/empathy.so @@ -87,12 +75,12 @@ lib/libempathy.so.11 %%PYTHON_SITELIBDIR%%/empathygtk.la %%PYTHON_SITELIBDIR%%/empathygtk.so libdata/bonobo/servers/GNOME_Megaphone_Applet.server +libdata/bonobo/servers/GNOME_NotHere_Applet.server libdata/pkgconfig/libempathy-gtk.pc libdata/pkgconfig/libempathy.pc -libexec/empathy-call-chandler libexec/megaphone-applet -share/dbus-1/services/org.gnome.Empathy.Call.service -share/dbus-1/services/org.gnome.Empathy.Chat.service +libexec/nothere-applet +share/applications/empathy.desktop share/doc/libempathy-gtk/EmpathyAccountChooser.html share/doc/libempathy-gtk/EmpathyAvatarChooser.html share/doc/libempathy-gtk/EmpathyAvatarImage.html @@ -101,23 +89,25 @@ share/doc/libempathy-gtk/EmpathyCellRendererExpander.html share/doc/libempathy-gtk/EmpathyCellRendererText.html share/doc/libempathy-gtk/EmpathyChat.html share/doc/libempathy-gtk/EmpathyChatView.html +share/doc/libempathy-gtk/EmpathyConf.html share/doc/libempathy-gtk/EmpathyContactListStore.html share/doc/libempathy-gtk/EmpathyContactListView.html -share/doc/libempathy-gtk/EmpathyGroupChat.html share/doc/libempathy-gtk/EmpathyPresenceChooser.html -share/doc/libempathy-gtk/EmpathyPrivateChat.html share/doc/libempathy-gtk/EmpathySmileyManager.html +share/doc/libempathy-gtk/EmpathyTheme.html +share/doc/libempathy-gtk/EmpathyThemeBoxes.html +share/doc/libempathy-gtk/EmpathyThemeIrc.html share/doc/libempathy-gtk/EmpathyThemeManager.html share/doc/libempathy-gtk/home.png share/doc/libempathy-gtk/index.html share/doc/libempathy-gtk/index.sgml share/doc/libempathy-gtk/ix01.html share/doc/libempathy-gtk/left.png -share/doc/libempathy-gtk/libempathy-gtk-EmpathyConf.html share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-irc.html +share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget-sip.html share/doc/libempathy-gtk/libempathy-gtk-empathy-account-widget.html -share/doc/libempathy-gtk/libempathy-gtk-empathy-accounts-dialog.html share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-dialogs.html +share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-menu.html share/doc/libempathy-gtk/libempathy-gtk-empathy-contact-widget.html share/doc/libempathy-gtk/libempathy-gtk-empathy-geometry.html share/doc/libempathy-gtk/libempathy-gtk-empathy-images.html @@ -138,9 +128,11 @@ share/doc/libempathy-gtk/right.png share/doc/libempathy-gtk/style.css share/doc/libempathy-gtk/up.png share/doc/libempathy/EmpathyChatroom.html +share/doc/libempathy/EmpathyChatroomManager.html share/doc/libempathy/EmpathyContact.html +share/doc/libempathy/EmpathyContactFactory.html share/doc/libempathy/EmpathyContactManager.html -share/doc/libempathy/EmpathyFilter.html +share/doc/libempathy/EmpathyDispatcher.html share/doc/libempathy/EmpathyIdle.html share/doc/libempathy/EmpathyIrcNetwork.html share/doc/libempathy/EmpathyIrcNetworkManager.html @@ -149,23 +141,19 @@ share/doc/libempathy/EmpathyLogManager.html share/doc/libempathy/EmpathyMessage.html share/doc/libempathy/EmpathyTpCall.html share/doc/libempathy/EmpathyTpChat.html -share/doc/libempathy/EmpathyTpChatroom.html share/doc/libempathy/EmpathyTpContactFactory.html share/doc/libempathy/EmpathyTpContactList.html share/doc/libempathy/EmpathyTpGroup.html share/doc/libempathy/EmpathyTpRoomlist.html +share/doc/libempathy/EmpathyTpTube.html +share/doc/libempathy/EmpathyTubeHandler.html share/doc/libempathy/home.png share/doc/libempathy/index.html share/doc/libempathy/index.sgml share/doc/libempathy/ix01.html share/doc/libempathy/left.png -share/doc/libempathy/libempathy-EmpathyChandler.html -share/doc/libempathy/libempathy-EmpathyChatroomManager.html -share/doc/libempathy/libempathy-EmpathyContactFactory.html -share/doc/libempathy/libempathy-empathy-avatar.html share/doc/libempathy/libempathy-empathy-contact-groups.html share/doc/libempathy/libempathy-empathy-contact-list.html -share/doc/libempathy/libempathy-empathy-enum-types.html share/doc/libempathy/libempathy-empathy-status-presets.html share/doc/libempathy/libempathy-empathy-time.html share/doc/libempathy/libempathy-empathy-utils.html @@ -179,7 +167,10 @@ share/doc/libempathy/right.png share/doc/libempathy/style.css share/doc/libempathy/up.png %%DATADIR%%/GNOME_Megaphone_Applet.xml +%%DATADIR%%/GNOME_NotHere_Applet.xml +%%DATADIR%%/empathy-account-widget-aim.glade %%DATADIR%%/empathy-account-widget-generic.glade +%%DATADIR%%/empathy-account-widget-groupwise.glade %%DATADIR%%/empathy-account-widget-icq.glade %%DATADIR%%/empathy-account-widget-irc.glade %%DATADIR%%/empathy-account-widget-jabber.glade @@ -189,13 +180,13 @@ share/doc/libempathy/up.png %%DATADIR%%/empathy-account-widget-yahoo.glade %%DATADIR%%/empathy-accounts-dialog.glade %%DATADIR%%/empathy-call-window.glade +%%DATADIR%%/empathy-chat-window.glade %%DATADIR%%/empathy-chat.glade %%DATADIR%%/empathy-chatroom-manager.dtd %%DATADIR%%/empathy-chatrooms-window.glade %%DATADIR%%/empathy-contact-dialogs.glade %%DATADIR%%/empathy-contact-groups.dtd %%DATADIR%%/empathy-contact-widget.glade -%%DATADIR%%/empathy-group-chat.glade %%DATADIR%%/empathy-irc-networks.dtd %%DATADIR%%/empathy-log-manager.xsl %%DATADIR%%/empathy-log-window.glade @@ -209,11 +200,13 @@ share/doc/libempathy/up.png %%DATADIR%%/empathy-status-presets.dtd %%DATADIR%%/icons/hicolor/16x16/actions/im-message-new.png %%DATADIR%%/icons/hicolor/16x16/apps/im-ekiga.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/16x16/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/16x16/apps/im-google-talk.png %%DATADIR%%/icons/hicolor/16x16/apps/im-irc.png %%DATADIR%%/icons/hicolor/16x16/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/16x16/apps/im-msn.png +%%DATADIR%%/icons/hicolor/16x16/apps/im-qq.png %%DATADIR%%/icons/hicolor/16x16/apps/im-sip.png %%DATADIR%%/icons/hicolor/16x16/apps/im-xmpp.png %%DATADIR%%/icons/hicolor/16x16/status/empathy-available.png @@ -226,11 +219,13 @@ share/doc/libempathy/up.png %%DATADIR%%/icons/hicolor/16x16/status/user-typing.png %%DATADIR%%/icons/hicolor/22x22/actions/im-message-new.png %%DATADIR%%/icons/hicolor/22x22/apps/im-ekiga.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/22x22/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/22x22/apps/im-google-talk.png %%DATADIR%%/icons/hicolor/22x22/apps/im-irc.png %%DATADIR%%/icons/hicolor/22x22/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/22x22/apps/im-msn.png +%%DATADIR%%/icons/hicolor/22x22/apps/im-qq.png %%DATADIR%%/icons/hicolor/22x22/apps/im-sip.png %%DATADIR%%/icons/hicolor/22x22/apps/im-xmpp.png %%DATADIR%%/icons/hicolor/22x22/status/empathy-available.png @@ -241,11 +236,13 @@ share/doc/libempathy/up.png %%DATADIR%%/icons/hicolor/22x22/status/empathy-pending.png %%DATADIR%%/icons/hicolor/24x24/actions/im-message-new.png %%DATADIR%%/icons/hicolor/24x24/apps/im-ekiga.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/24x24/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/24x24/apps/im-google-talk.png %%DATADIR%%/icons/hicolor/24x24/apps/im-irc.png %%DATADIR%%/icons/hicolor/24x24/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/24x24/apps/im-msn.png +%%DATADIR%%/icons/hicolor/24x24/apps/im-qq.png %%DATADIR%%/icons/hicolor/24x24/apps/im-sip.png %%DATADIR%%/icons/hicolor/24x24/apps/im-xmpp.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-available.png @@ -255,11 +252,13 @@ share/doc/libempathy/up.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-offline.png %%DATADIR%%/icons/hicolor/24x24/status/empathy-pending.png %%DATADIR%%/icons/hicolor/32x32/apps/im-ekiga.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/32x32/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/32x32/apps/im-google-talk.png %%DATADIR%%/icons/hicolor/32x32/apps/im-irc.png %%DATADIR%%/icons/hicolor/32x32/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/32x32/apps/im-msn.png +%%DATADIR%%/icons/hicolor/32x32/apps/im-qq.png %%DATADIR%%/icons/hicolor/32x32/apps/im-sip.png %%DATADIR%%/icons/hicolor/32x32/apps/im-xmpp.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-available.png @@ -269,11 +268,13 @@ share/doc/libempathy/up.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-offline.png %%DATADIR%%/icons/hicolor/32x32/status/empathy-pending.png %%DATADIR%%/icons/hicolor/48x48/apps/im-ekiga.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-gadugadu.png %%DATADIR%%/icons/hicolor/48x48/apps/im-gizmo.png %%DATADIR%%/icons/hicolor/48x48/apps/im-google-talk.png %%DATADIR%%/icons/hicolor/48x48/apps/im-irc.png %%DATADIR%%/icons/hicolor/48x48/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/48x48/apps/im-msn.png +%%DATADIR%%/icons/hicolor/48x48/apps/im-qq.png %%DATADIR%%/icons/hicolor/48x48/apps/im-sip.png %%DATADIR%%/icons/hicolor/48x48/apps/im-xmpp.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-available.png @@ -283,11 +284,13 @@ share/doc/libempathy/up.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-offline.png %%DATADIR%%/icons/hicolor/48x48/status/empathy-pending.png %%DATADIR%%/icons/hicolor/scalable/apps/im-ekiga.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-gadugadu.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-gizmo.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-google-talk.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-irc.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-local-xmpp.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-msn.svg +%%DATADIR%%/icons/hicolor/scalable/apps/im-qq.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-sip.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-xmpp.svg %%DATADIR%%/icons/hicolor/scalable/status/empathy-available.svg @@ -297,6 +300,28 @@ share/doc/libempathy/up.png %%DATADIR%%/icons/hicolor/scalable/status/empathy-offline.svg %%DATADIR%%/icons/hicolor/scalable/status/empathy-pending.svg %%DATADIR%%/irc-networks.xml +share/gnome/help/empathy/C/empathy.xml +share/gnome/help/empathy/C/figures/empathy-main-window.png +share/gnome/help/empathy/C/figures/empathy-new-account.png +share/gnome/help/empathy/C/legal.xml +share/gnome/help/empathy/cs/empathy.xml +share/gnome/help/empathy/cs/figures/empathy-main-window.png +share/gnome/help/empathy/cs/figures/empathy-new-account.png +share/gnome/help/empathy/de/empathy.xml +share/gnome/help/empathy/de/figures/empathy-main-window.png +share/gnome/help/empathy/de/figures/empathy-new-account.png +share/gnome/help/empathy/es/empathy.xml +share/gnome/help/empathy/es/figures/empathy-main-window.png +share/gnome/help/empathy/es/figures/empathy-new-account.png +share/gnome/help/empathy/fr/empathy.xml +share/gnome/help/empathy/fr/figures/empathy-main-window.png +share/gnome/help/empathy/fr/figures/empathy-new-account.png +share/gnome/help/empathy/it/empathy.xml +share/gnome/help/empathy/it/figures/empathy-main-window.png +share/gnome/help/empathy/it/figures/empathy-new-account.png +share/gnome/help/empathy/sv/empathy.xml +share/gnome/help/empathy/sv/figures/empathy-main-window.png +share/gnome/help/empathy/sv/figures/empathy-new-account.png share/icons/hicolor/16x16/apps/empathy.png share/icons/hicolor/22x22/apps/empathy.png share/icons/hicolor/24x24/apps/empathy.png @@ -306,6 +331,7 @@ share/icons/hicolor/scalable/apps/empathy.svg share/locale/ar/LC_MESSAGES/empathy.mo share/locale/az/LC_MESSAGES/empathy.mo share/locale/bg/LC_MESSAGES/empathy.mo +share/locale/bn_IN/LC_MESSAGES/empathy.mo share/locale/ca/LC_MESSAGES/empathy.mo share/locale/cs/LC_MESSAGES/empathy.mo share/locale/cy/LC_MESSAGES/empathy.mo @@ -322,18 +348,25 @@ share/locale/fi/LC_MESSAGES/empathy.mo share/locale/fr/LC_MESSAGES/empathy.mo share/locale/ga/LC_MESSAGES/empathy.mo share/locale/gl/LC_MESSAGES/empathy.mo +share/locale/gu/LC_MESSAGES/empathy.mo share/locale/he/LC_MESSAGES/empathy.mo +share/locale/hi/LC_MESSAGES/empathy.mo share/locale/hr/LC_MESSAGES/empathy.mo share/locale/hu/LC_MESSAGES/empathy.mo share/locale/it/LC_MESSAGES/empathy.mo share/locale/ja/LC_MESSAGES/empathy.mo +share/locale/kn/LC_MESSAGES/empathy.mo +share/locale/ko/LC_MESSAGES/empathy.mo share/locale/lt/LC_MESSAGES/empathy.mo +share/locale/mk/LC_MESSAGES/empathy.mo share/locale/ml/LC_MESSAGES/empathy.mo +share/locale/mr/LC_MESSAGES/empathy.mo share/locale/ms/LC_MESSAGES/empathy.mo share/locale/nb/LC_MESSAGES/empathy.mo share/locale/ne/LC_MESSAGES/empathy.mo share/locale/nl/LC_MESSAGES/empathy.mo share/locale/oc/LC_MESSAGES/empathy.mo +share/locale/pa/LC_MESSAGES/empathy.mo share/locale/pl/LC_MESSAGES/empathy.mo share/locale/pt/LC_MESSAGES/empathy.mo share/locale/pt_BR/LC_MESSAGES/empathy.mo @@ -341,8 +374,9 @@ share/locale/ru/LC_MESSAGES/empathy.mo share/locale/sl/LC_MESSAGES/empathy.mo share/locale/sq/LC_MESSAGES/empathy.mo share/locale/sr/LC_MESSAGES/empathy.mo -share/locale/sr@Latn/LC_MESSAGES/empathy.mo +share/locale/sr@latin/LC_MESSAGES/empathy.mo share/locale/sv/LC_MESSAGES/empathy.mo +share/locale/th/LC_MESSAGES/empathy.mo share/locale/tr/LC_MESSAGES/empathy.mo share/locale/uk/LC_MESSAGES/empathy.mo share/locale/vi/LC_MESSAGES/empathy.mo @@ -350,24 +384,46 @@ share/locale/zh_CN/LC_MESSAGES/empathy.mo share/locale/zh_HK/LC_MESSAGES/empathy.mo share/locale/zh_TW/LC_MESSAGES/empathy.mo share/mission-control/profiles/aim.profile -share/mission-control/profiles/gtalk.profile share/mission-control/profiles/ekiga.profile share/mission-control/profiles/fwd.profile +share/mission-control/profiles/gadugadu.profile +share/mission-control/profiles/groupwise.profile +share/mission-control/profiles/gtalk.profile share/mission-control/profiles/icq.profile share/mission-control/profiles/irc.profile share/mission-control/profiles/jabber.profile share/mission-control/profiles/msn-haze.profile share/mission-control/profiles/msn.profile +share/mission-control/profiles/qq.profile share/mission-control/profiles/salut.profile share/mission-control/profiles/sipphone.profile share/mission-control/profiles/sofiasip.profile share/mission-control/profiles/yahoo.profile -share/telepathy/managers/empathy-call.chandler -share/telepathy/managers/empathy-chat.chandler -@dirrm share/telepathy/managers -@dirrm share/telepathy +share/omf/empathy/empathy-C.omf +share/omf/empathy/empathy-cs.omf +share/omf/empathy/empathy-de.omf +share/omf/empathy/empathy-es.omf +share/omf/empathy/empathy-fr.omf +share/omf/empathy/empathy-it.omf +share/omf/empathy/empathy-sv.omf +@dirrm share/omf/empathy @dirrm share/mission-control/profiles @dirrm share/mission-control +@dirrm share/gnome/help/empathy/sv/figures +@dirrm share/gnome/help/empathy/sv +@dirrm share/gnome/help/empathy/it/figures +@dirrm share/gnome/help/empathy/it +@dirrm share/gnome/help/empathy/fr/figures +@dirrm share/gnome/help/empathy/fr +@dirrm share/gnome/help/empathy/es/figures +@dirrm share/gnome/help/empathy/es +@dirrm share/gnome/help/empathy/de/figures +@dirrm share/gnome/help/empathy/de +@dirrm share/gnome/help/empathy/cs/figures +@dirrm share/gnome/help/empathy/cs +@dirrm share/gnome/help/empathy/C/figures +@dirrm share/gnome/help/empathy/C +@dirrm share/gnome/help/empathy @dirrm %%DATADIR%%/icons/hicolor/scalable/status @dirrm %%DATADIR%%/icons/hicolor/scalable/apps @dirrm %%DATADIR%%/icons/hicolor/scalable @@ -394,13 +450,18 @@ share/telepathy/managers/empathy-chat.chandler @dirrm %%DATADIR%% @dirrm share/doc/libempathy-gtk @dirrm share/doc/libempathy +@dirrmtry share/applications @dirrm include/libempathy-gtk @dirrm include/libempathy -@dirrmtry etc/xdg/autostart -@dirrmtry etc/xdg @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile index b7afda3f1d2d..2ee0bbe73de7 100644 --- a/net-im/telepathy-butterfly/Makefile +++ b/net-im/telepathy-butterfly/Makefile @@ -3,10 +3,11 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net-im/telepathy-butterfly/Makefile,v 1.3 2009/01/08 06:51:59 marcus Exp $ # PORTNAME= telepathy-butterfly -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-im/telepathy-butterfly/distinfo b/net-im/telepathy-butterfly/distinfo index adeadc60fe1d..062582cda439 100644 --- a/net-im/telepathy-butterfly/distinfo +++ b/net-im/telepathy-butterfly/distinfo @@ -1,3 +1,3 @@ -MD5 (telepathy-butterfly-0.3.2.tar.gz) = f1db30de25daf382aa3e9b5b8efecd70 -SHA256 (telepathy-butterfly-0.3.2.tar.gz) = b1f70a6e980479572359acd9deac7833e5c8f1a2e60b5a22dacc92b13bd1f819 -SIZE (telepathy-butterfly-0.3.2.tar.gz) = 121806 +MD5 (telepathy-butterfly-0.3.3.tar.gz) = 0b659c575c8d1867fe4a0da13704519f +SHA256 (telepathy-butterfly-0.3.3.tar.gz) = 523ae02816a56426a40ec67b31b77a966079786ab01045700073bebae30d1b8a +SIZE (telepathy-butterfly-0.3.3.tar.gz) = 124865 diff --git a/net-im/telepathy-butterfly/pkg-plist b/net-im/telepathy-butterfly/pkg-plist index 37119a56c0d4..4bcc5407c1a2 100644 --- a/net-im/telepathy-butterfly/pkg-plist +++ b/net-im/telepathy-butterfly/pkg-plist @@ -34,6 +34,9 @@ %%PYTHON_SITELIBDIR%%/butterfly/presence.py %%PYTHON_SITELIBDIR%%/butterfly/presence.pyc %%PYTHON_SITELIBDIR%%/butterfly/presence.pyo +%%PYTHON_SITELIBDIR%%/butterfly/simple_presence.py +%%PYTHON_SITELIBDIR%%/butterfly/simple_presence.pyc +%%PYTHON_SITELIBDIR%%/butterfly/simple_presence.pyo %%PYTHON_SITELIBDIR%%/butterfly/util/__init__.py %%PYTHON_SITELIBDIR%%/butterfly/util/__init__.pyc %%PYTHON_SITELIBDIR%%/butterfly/util/__init__.pyo diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile index 466dd64d6fc6..e7e6dc2c24a6 100644 --- a/net-im/telepathy-gabble/Makefile +++ b/net-im/telepathy-gabble/Makefile @@ -3,10 +3,10 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.2 2008/02/27 14:17:54 ahze Exp $ +# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.5 2009/01/08 07:03:21 marcus Exp $ PORTNAME= telepathy-gabble -PORTVERSION= 0.7.16 +PORTVERSION= 0.7.18 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ diff --git a/net-im/telepathy-gabble/distinfo b/net-im/telepathy-gabble/distinfo index 931b325510bf..461962af0240 100644 --- a/net-im/telepathy-gabble/distinfo +++ b/net-im/telepathy-gabble/distinfo @@ -1,3 +1,3 @@ -MD5 (telepathy-gabble-0.7.16.tar.gz) = 8a4be460b5d8233afa170f433ca116cc -SHA256 (telepathy-gabble-0.7.16.tar.gz) = 4c660d9e23f66a9c76e3c31ea5b82e0b17684b294a2eb1c8641a03a5ab23bd17 -SIZE (telepathy-gabble-0.7.16.tar.gz) = 1417532 +MD5 (telepathy-gabble-0.7.18.tar.gz) = 807260037be70882be3bcdb6b26ff031 +SHA256 (telepathy-gabble-0.7.18.tar.gz) = 2d3f0c3b068b323bdd37f5d02d6fc1cfc467014aa2f92bcebf91a5b21081a141 +SIZE (telepathy-gabble-0.7.18.tar.gz) = 1474712 diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h new file mode 100644 index 000000000000..8cf86b314b6d --- /dev/null +++ b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h @@ -0,0 +1,12 @@ +--- lib/gibber/gibber-fd-transport.h.orig 2009-01-08 01:53:58.000000000 -0500 ++++ lib/gibber/gibber-fd-transport.h 2009-01-08 01:54:11.000000000 -0500 +@@ -23,7 +23,9 @@ + + #include <glib-object.h> + ++#include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> + #include <netdb.h> + + #include "gibber-transport.h" diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h new file mode 100644 index 000000000000..e690611c3af5 --- /dev/null +++ b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h @@ -0,0 +1,12 @@ +--- lib/gibber/gibber-util.h.orig 2009-01-08 01:55:08.000000000 -0500 ++++ lib/gibber/gibber-util.h 2009-01-08 01:56:05.000000000 -0500 +@@ -20,6 +20,9 @@ + #ifndef __GIBBER_UTIL_H__ + #define __GIBBER_UTIL_H__ + ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> + #include <netdb.h> + + #include <glib.h> diff --git a/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c b/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c new file mode 100644 index 000000000000..07bf4c2ab63c --- /dev/null +++ b/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c @@ -0,0 +1,11 @@ +--- src/bytestream-socks5.c.orig 2009-01-08 01:57:01.000000000 -0500 ++++ src/bytestream-socks5.c 2009-01-08 01:57:20.000000000 -0500 +@@ -21,6 +21,8 @@ + #include "config.h" + #include "bytestream-socks5.h" + ++#include <sys/types.h> ++#include <sys/socket.h> + #include <arpa/inet.h> + #include <errno.h> + #include <fcntl.h> diff --git a/net-im/telepathy-gabble/pkg-plist b/net-im/telepathy-gabble/pkg-plist index 57703b962e68..fff4ba5c0364 100644 --- a/net-im/telepathy-gabble/pkg-plist +++ b/net-im/telepathy-gabble/pkg-plist @@ -2,6 +2,7 @@ libexec/telepathy-gabble share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service %%DOCSDIR%%/muc-bytestream.html %%DOCSDIR%%/olpc.html +%%DOCSDIR%%/si-multiple.html %%DOCSDIR%%/tubes.html share/telepathy/managers/gabble.manager @dirrmtry share/telepathy/managers diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile index 81c47e6a04e6..0bcb2ebda7a9 100644 --- a/net-im/telepathy-python/Makefile +++ b/net-im/telepathy-python/Makefile @@ -3,10 +3,10 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/telepathy-python/Makefile,v 1.3 2008/02/27 14:56:14 ahze Exp $ +# $MCom: ports/net-im/telepathy-python/Makefile,v 1.5 2009/01/08 07:07:51 marcus Exp $ PORTNAME= telepathy-python -PORTVERSION= 0.15.3 +PORTVERSION= 0.15.5 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net-im/telepathy-python/distinfo b/net-im/telepathy-python/distinfo index 41dabc75b40d..3c1cde48af9d 100644 --- a/net-im/telepathy-python/distinfo +++ b/net-im/telepathy-python/distinfo @@ -1,3 +1,3 @@ -MD5 (telepathy-python-0.15.3.tar.gz) = 594a66a70764052e30df9428b5be52b2 -SHA256 (telepathy-python-0.15.3.tar.gz) = ca001500124f48a4a1e1eb7e081ca2bf5de533765f313aeb52545a3842db0a52 -SIZE (telepathy-python-0.15.3.tar.gz) = 128246 +MD5 (telepathy-python-0.15.5.tar.gz) = f732c165dd8c0f79248fd2dd123ce430 +SHA256 (telepathy-python-0.15.5.tar.gz) = 7100479cda4697560f44a6a20b468b391630e8e7f9a68a0e2a68e7118ee4025f +SIZE (telepathy-python-0.15.5.tar.gz) = 164980 diff --git a/net-im/telepathy-python/pkg-plist b/net-im/telepathy-python/pkg-plist index a86410cf5662..59b9eb07acfd 100644 --- a/net-im/telepathy-python/pkg-plist +++ b/net-im/telepathy-python/pkg-plist @@ -13,18 +13,9 @@ %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Bundle.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Bundle.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Bundle.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Future.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Future.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Future.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Handler.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Handler.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Handler.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Call_Merging.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Call_Merging.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Call_Merging.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Call_State.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Call_State.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Call_State.pyo @@ -34,15 +25,12 @@ %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_DTMF.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_DTMF.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_DTMF.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Delivery_Reporting.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Delivery_Reporting.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Delivery_Reporting.pyo +%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Destroyable.py +%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Destroyable.pyc +%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Destroyable.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Group.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Group.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Group.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_HTML.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_HTML.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_HTML.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Hold.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Hold.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Hold.pyo @@ -55,15 +43,9 @@ %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Password.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Password.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Password.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Transfer.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Transfer.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Interface_Transfer.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Contact_List.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Contact_List.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Contact_List.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Contact_Search.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Contact_Search.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Contact_Search.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Room_List.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Room_List.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Channel_Type_Room_List.pyo @@ -88,24 +70,15 @@ %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Capabilities.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Capabilities.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Capabilities.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contact_Info.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contact_Info.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contact_Info.pyo +%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contact_Capabilities.py +%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contact_Capabilities.pyc +%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contact_Capabilities.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contacts.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contacts.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Contacts.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Forwarding.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Forwarding.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Forwarding.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Presence.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Presence.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Presence.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Privacy.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Privacy.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Privacy.pyo -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Renaming.py -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Renaming.pyc -%%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Renaming.pyo %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Requests.py %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Requests.pyc %%PYTHON_SITELIBDIR%%/telepathy/_generated/Connection_Interface_Requests.pyo diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile index bb5b7c3857f2..50ecdc485321 100644 --- a/net-im/telepathy-salut/Makefile +++ b/net-im/telepathy-salut/Makefile @@ -3,11 +3,11 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net-im/telepathy-salut/Makefile,v 1.4 2009/01/08 07:12:15 marcus Exp $ # PORTNAME= telepathy-salut -PORTVERSION= 0.3.6 -PORTREVISION= 1 +PORTVERSION= 0.3.7 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ @@ -17,7 +17,7 @@ COMMENT= Link-local Connection Manager for Telepathy Framework LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ avahi-glib.pc:${PORTSDIR}/net/avahi-app \ telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \ - libsoup-2.2.pc:${PORTSDIR}/devel/libsoup22 + libsoup-2.4.pc:${PORTSDIR}/devel/libsoup BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt diff --git a/net-im/telepathy-salut/distinfo b/net-im/telepathy-salut/distinfo index d3e42d83763d..224cfbb98a3f 100644 --- a/net-im/telepathy-salut/distinfo +++ b/net-im/telepathy-salut/distinfo @@ -1,3 +1,3 @@ -MD5 (telepathy-salut-0.3.6.tar.gz) = ccd02baafbbd708c11e4f770715065f4 -SHA256 (telepathy-salut-0.3.6.tar.gz) = 77d62980c03a6ca6ad9a5aa2d181a3bd939433d85f3151d316a370324969a1d8 -SIZE (telepathy-salut-0.3.6.tar.gz) = 1058109 +MD5 (telepathy-salut-0.3.7.tar.gz) = 0019eb92a06edf4e61b7a4cb8bc88d40 +SHA256 (telepathy-salut-0.3.7.tar.gz) = 19eb7f844519cca1135bfad7ae2e1848d79620636abf5f6fa4a5215d02612ab6 +SIZE (telepathy-salut-0.3.7.tar.gz) = 1033259 diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index 882f3ae37057..039d7e6b4df2 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/gnome-netstatus/Makefile,v 1.48 2007/07/04 21:42:20 marcus Exp $ +# $MCom: ports/net/gnome-netstatus/Makefile,v 1.50 2008/09/22 23:33:17 kwm Exp $ # PORTNAME= gnome-netstatus -PORTVERSION= 2.12.1 -PORTREVISION= 7 +PORTVERSION= 2.12.2 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,7 +19,6 @@ COMMENT= A GNOME applet that shows network status INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_BZIP2= yes -GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \ gnomedocutils USE_GMAKE= yes diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo index 8297e98a7824..72f18f1c2715 100644 --- a/net/gnome-netstatus/distinfo +++ b/net/gnome-netstatus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-netstatus-2.12.1.tar.bz2) = 8651ca1694a6c222ae5cad6e21814d24 -SHA256 (gnome2/gnome-netstatus-2.12.1.tar.bz2) = 4648439f0327963dcbbf2d07d2de1cf1ef74a7430bcbe175717efd0e7f7824ed -SIZE (gnome2/gnome-netstatus-2.12.1.tar.bz2) = 500536 +MD5 (gnome2/gnome-netstatus-2.12.2.tar.bz2) = f1f9e18b48d46adb32c9002e4325f80e +SHA256 (gnome2/gnome-netstatus-2.12.2.tar.bz2) = 50c8b1abe1e5d813cf651bf12d1b39b00b22fadc0ee886135e5f9a08e3969943 +SIZE (gnome2/gnome-netstatus-2.12.2.tar.bz2) = 525222 diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist index b9ca84c79d5c..9cb23623a744 100644 --- a/net/gnome-netstatus/pkg-plist +++ b/net/gnome-netstatus/pkg-plist @@ -2,9 +2,28 @@ libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server libexec/gnome-netstatus-applet share/gnome-2.0/ui/GNOME_NetstatusApplet.xml share/gnome-netstatus/gnome-netstatus.glade +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml share/gnome/help/gnome-netstatus/C/legal.xml +share/gnome/help/gnome-netstatus/bg/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/bg/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/bg/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/bg/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/bg/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/bg/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/bg/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/ca/gnome-netstatus.xml share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png @@ -13,7 +32,26 @@ share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml share/gnome/help/gnome-netstatus/de/legal.xml +share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/en_GB/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/en_GB/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/fr/gnome-netstatus.xml share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-error.png @@ -22,7 +60,6 @@ share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-rx.png share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/it/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/it/legal.xml share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-error.png share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-idle.png @@ -39,10 +76,54 @@ share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-tx.png share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/ko/gnome-netstatus.xml share/gnome/help/gnome-netstatus/ko/legal.xml +share/gnome/help/gnome-netstatus/nl/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/nl/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/nl/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/nl/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/nl/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/nl/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/nl/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/oc/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/oc/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/oc/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/oc/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/oc/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/oc/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/oc/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/pa/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/pa/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/pa/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/pa/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/pa/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/pa/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/pa/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/ru/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/ru/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/ru/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/ru/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/ru/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/ru/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/ru/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/th/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/th/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/th/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/th/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/th/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/th/figures/gnome-netstatus-txrx.png +share/gnome/help/gnome-netstatus/th/gnome-netstatus.xml +share/gnome/help/gnome-netstatus/uk/figures/gnome-netstatus-disconn.png +share/gnome/help/gnome-netstatus/uk/figures/gnome-netstatus-error.png +share/gnome/help/gnome-netstatus/uk/figures/gnome-netstatus-idle.png +share/gnome/help/gnome-netstatus/uk/figures/gnome-netstatus-rx.png +share/gnome/help/gnome-netstatus/uk/figures/gnome-netstatus-tx.png +share/gnome/help/gnome-netstatus/uk/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/uk/gnome-netstatus.xml share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png @@ -69,22 +150,25 @@ share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml share/gnome/help/gnome-netstatus/zh_TW/legal.xml share/omf/gnome-netstatus/gnome-netstatus-C.omf +share/omf/gnome-netstatus/gnome-netstatus-ca.omf share/omf/gnome-netstatus/gnome-netstatus-bg.omf share/omf/gnome-netstatus/gnome-netstatus-de.omf +share/omf/gnome-netstatus/gnome-netstatus-en_GB.omf share/omf/gnome-netstatus/gnome-netstatus-es.omf share/omf/gnome-netstatus/gnome-netstatus-fr.omf share/omf/gnome-netstatus/gnome-netstatus-it.omf share/omf/gnome-netstatus/gnome-netstatus-ja.omf share/omf/gnome-netstatus/gnome-netstatus-ko.omf share/omf/gnome-netstatus/gnome-netstatus-nl.omf +share/omf/gnome-netstatus/gnome-netstatus-oc.omf share/omf/gnome-netstatus/gnome-netstatus-pa.omf share/omf/gnome-netstatus/gnome-netstatus-ru.omf share/omf/gnome-netstatus/gnome-netstatus-sv.omf +share/omf/gnome-netstatus/gnome-netstatus-th.omf share/omf/gnome-netstatus/gnome-netstatus-uk.omf share/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf share/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf share/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf -share/pixmaps/gnome-netstatus-tx.png share/icons/hicolor/48x48/apps/gnome-netstatus-0-24.png share/icons/hicolor/48x48/apps/gnome-netstatus-25-49.png share/icons/hicolor/48x48/apps/gnome-netstatus-50-74.png @@ -95,6 +179,7 @@ share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png +share/locale/af/LC_MESSAGES/gnome-netstatus.mo share/locale/ar/LC_MESSAGES/gnome-netstatus.mo share/locale/az/LC_MESSAGES/gnome-netstatus.mo share/locale/bg/LC_MESSAGES/gnome-netstatus.mo @@ -116,6 +201,7 @@ share/locale/eu/LC_MESSAGES/gnome-netstatus.mo share/locale/fa/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo +share/locale/fur/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo share/locale/gl/LC_MESSAGES/gnome-netstatus.mo share/locale/gu/LC_MESSAGES/gnome-netstatus.mo @@ -124,15 +210,14 @@ share/locale/hi/LC_MESSAGES/gnome-netstatus.mo share/locale/hr/LC_MESSAGES/gnome-netstatus.mo share/locale/hu/LC_MESSAGES/gnome-netstatus.mo share/locale/id/LC_MESSAGES/gnome-netstatus.mo +share/locale/is/LC_MESSAGES/gnome-netstatus.mo share/locale/it/LC_MESSAGES/gnome-netstatus.mo share/locale/ja/LC_MESSAGES/gnome-netstatus.mo share/locale/ka/LC_MESSAGES/gnome-netstatus.mo +share/locale/kn/LC_MESSAGES/gnome-netstatus.mo share/locale/ko/LC_MESSAGES/gnome-netstatus.mo share/locale/lt/LC_MESSAGES/gnome-netstatus.mo share/locale/lv/LC_MESSAGES/gnome-netstatus.mo -share/locale/mg/LC_MESSAGES/gnome-netstatus.mo -share/locale/mk/LC_MESSAGES/gnome-netstatus.mo -share/locale/ml/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/mr/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo @@ -140,7 +225,7 @@ share/locale/nb/LC_MESSAGES/gnome-netstatus.mo share/locale/ne/LC_MESSAGES/gnome-netstatus.mo share/locale/nl/LC_MESSAGES/gnome-netstatus.mo share/locale/nn/LC_MESSAGES/gnome-netstatus.mo -share/locale/or/LC_MESSAGES/gnome-netstatus.mo +share/locale/oc/LC_MESSAGES/gnome-netstatus.mo share/locale/pa/LC_MESSAGES/gnome-netstatus.mo share/locale/pl/LC_MESSAGES/gnome-netstatus.mo share/locale/pt/LC_MESSAGES/gnome-netstatus.mo @@ -149,20 +234,20 @@ share/locale/ro/LC_MESSAGES/gnome-netstatus.mo share/locale/ru/LC_MESSAGES/gnome-netstatus.mo share/locale/rw/LC_MESSAGES/gnome-netstatus.mo share/locale/sk/LC_MESSAGES/gnome-netstatus.mo -share/locale/sl/LC_MESSAGES/gnome-netstatus.mo share/locale/sq/LC_MESSAGES/gnome-netstatus.mo share/locale/sr/LC_MESSAGES/gnome-netstatus.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo +share/locale/sr@latin/LC_MESSAGES/gnome-netstatus.mo share/locale/sv/LC_MESSAGES/gnome-netstatus.mo share/locale/ta/LC_MESSAGES/gnome-netstatus.mo share/locale/th/LC_MESSAGES/gnome-netstatus.mo share/locale/tr/LC_MESSAGES/gnome-netstatus.mo share/locale/uk/LC_MESSAGES/gnome-netstatus.mo +share/locale/uz/LC_MESSAGES/gnome-netstatus.mo +share/locale/uz@cyrillic/LC_MESSAGES/gnome-netstatus.mo share/locale/vi/LC_MESSAGES/gnome-netstatus.mo share/locale/wa/LC_MESSAGES/gnome-netstatus.mo share/locale/xh/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo -share/locale/zh_HK/LC_MESSAGES/gnome-netstatus.mo share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/omf/gnome-netstatus @dirrm share/gnome/help/gnome-netstatus/zh_TW/figures @@ -171,10 +256,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/zh_HK @dirrm share/gnome/help/gnome-netstatus/zh_CN/figures @dirrm share/gnome/help/gnome-netstatus/zh_CN +@dirrm share/gnome/help/gnome-netstatus/uk/figures @dirrm share/gnome/help/gnome-netstatus/uk +@dirrm share/gnome/help/gnome-netstatus/th/figures +@dirrm share/gnome/help/gnome-netstatus/th +@dirrm share/gnome/help/gnome-netstatus/sv/figures @dirrm share/gnome/help/gnome-netstatus/sv +@dirrm share/gnome/help/gnome-netstatus/ru/figures @dirrm share/gnome/help/gnome-netstatus/ru +@dirrm share/gnome/help/gnome-netstatus/pa/figures @dirrm share/gnome/help/gnome-netstatus/pa +@dirrm share/gnome/help/gnome-netstatus/oc/figures +@dirrm share/gnome/help/gnome-netstatus/oc +@dirrm share/gnome/help/gnome-netstatus/nl/figures @dirrm share/gnome/help/gnome-netstatus/nl @dirrm share/gnome/help/gnome-netstatus/ko/figures @dirrm share/gnome/help/gnome-netstatus/ko @@ -182,24 +276,36 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo @dirrm share/gnome/help/gnome-netstatus/ja @dirrm share/gnome/help/gnome-netstatus/it/figures @dirrm share/gnome/help/gnome-netstatus/it +@dirrm share/gnome/help/gnome-netstatus/fr/figures @dirrm share/gnome/help/gnome-netstatus/fr +@dirrm share/gnome/help/gnome-netstatus/es/figures @dirrm share/gnome/help/gnome-netstatus/es +@dirrm share/gnome/help/gnome-netstatus/en_GB/figures +@dirrm share/gnome/help/gnome-netstatus/en_GB @dirrm share/gnome/help/gnome-netstatus/de/figures @dirrm share/gnome/help/gnome-netstatus/de +@dirrm share/gnome/help/gnome-netstatus/ca/figures +@dirrm share/gnome/help/gnome-netstatus/ca +@dirrm share/gnome/help/gnome-netstatus/bg/figures @dirrm share/gnome/help/gnome-netstatus/bg +@dirrm share/gnome/help/gnome-netstatus/C/figures @dirrm share/gnome/help/gnome-netstatus/C @dirrm share/gnome/help/gnome-netstatus @dirrm share/gnome-netstatus -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr -@dirrmtry share/locale/mg/LC_MESSAGES -@dirrmtry share/locale/mg +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index f9b8dd61bfc9..328b54c1acc1 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/gnome-nettool/Makefile,v 1.42 2008/03/10 21:33:09 mezz Exp $ +# $MCom: ports/net/gnome-nettool/Makefile,v 1.44 2008/09/22 23:38:56 kwm Exp $ # PORTNAME= gnome-nettool -PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTVERSION= 2.22.1 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= GNOME diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index 6bf5e40c6e7e..dcc612d6ddbd 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-nettool-2.22.0.tar.bz2) = 290dd50a08a3859332afb6daf46dde25 -SHA256 (gnome2/gnome-nettool-2.22.0.tar.bz2) = ddf6de5d2df6515423ef8aad12750a69a553584685854fa47073126b89fc25a3 -SIZE (gnome2/gnome-nettool-2.22.0.tar.bz2) = 617193 +MD5 (gnome2/gnome-nettool-2.22.1.tar.bz2) = afcaff8ebc76b5f352902ed424dc2856 +SHA256 (gnome2/gnome-nettool-2.22.1.tar.bz2) = 90938c337575ce0f008a46a9f89f24bc6c04f5384337475fe3d5b960594c31b1 +SIZE (gnome2/gnome-nettool-2.22.1.tar.bz2) = 600085 diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist index 3dceffc9e15f..9ba878e67375 100644 --- a/net/gnome-nettool/pkg-plist +++ b/net/gnome-nettool/pkg-plist @@ -12,6 +12,8 @@ share/applications/gnome-nettool.desktop share/gnome/help/gnome-nettool/C/gnome-nettool.xml share/gnome/help/gnome-nettool/C/legal.xml share/gnome/help/gnome-nettool/ca/gnome-nettool.xml +share/gnome/help/gnome-nettool/cs/gnome-nettool.xml +share/gnome/help/gnome-nettool/da/gnome-nettool.xml share/gnome/help/gnome-nettool/es/gnome-nettool.xml share/gnome/help/gnome-nettool/fr/gnome-nettool.xml share/gnome/help/gnome-nettool/oc/gnome-nettool.xml @@ -86,7 +88,7 @@ share/locale/sk/LC_MESSAGES/gnome-nettool.mo share/locale/sl/LC_MESSAGES/gnome-nettool.mo share/locale/sq/LC_MESSAGES/gnome-nettool.mo share/locale/sr/LC_MESSAGES/gnome-nettool.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo +share/locale/sr@latin/LC_MESSAGES/gnome-nettool.mo share/locale/sv/LC_MESSAGES/gnome-nettool.mo share/locale/ta/LC_MESSAGES/gnome-nettool.mo share/locale/te/LC_MESSAGES/gnome-nettool.mo @@ -103,6 +105,8 @@ share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo share/omf/gnome-nettool/gnome-nettool-C.omf share/omf/gnome-nettool/gnome-nettool-ca.omf +share/omf/gnome-nettool/gnome-nettool-cs.omf +share/omf/gnome-nettool/gnome-nettool-da.omf share/omf/gnome-nettool/gnome-nettool-es.omf share/omf/gnome-nettool/gnome-nettool-fr.omf share/omf/gnome-nettool/gnome-nettool-oc.omf @@ -119,6 +123,8 @@ share/pixmaps/gnome-nettool.png @dirrm share/gnome/help/gnome-nettool/oc @dirrm share/gnome/help/gnome-nettool/fr @dirrm share/gnome/help/gnome-nettool/es +@dirrm share/gnome/help/gnome-nettool/da +@dirrm share/gnome/help/gnome-nettool/cs @dirrm share/gnome/help/gnome-nettool/ca @dirrm share/gnome/help/gnome-nettool/C @dirrm share/gnome/help/gnome-nettool @@ -134,6 +140,8 @@ share/pixmaps/gnome-nettool.png @dirrmtry share/locale/uz@cyrillic @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index cdc658ef133d..d1ac549e0542 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk-vnc -PORTVERSION= 0.3.6 +PORTVERSION= 0.3.7 PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= SF @@ -14,14 +14,16 @@ MASTER_SITES= SF MAINTAINER= gnome@FreeBSD.org COMMENT= VNC viewer widget for GTK+ -LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls +LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ + gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext USE_GNOME= pygtk2 gnomehack USE_GMAKE= yes -GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PYTHON= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-gtkglext=yes .include <bsd.port.mk> diff --git a/net/gtk-vnc/distinfo b/net/gtk-vnc/distinfo index d2f38fe0ffb8..cd39a9d83fd1 100644 --- a/net/gtk-vnc/distinfo +++ b/net/gtk-vnc/distinfo @@ -1,3 +1,3 @@ -MD5 (gtk-vnc-0.3.6.tar.gz) = 64650dff4850e1ca3158a3288c0e6c86 -SHA256 (gtk-vnc-0.3.6.tar.gz) = abe027c2def5dc5076a1ce3518e0d58b0a0187935da4e0635a6475a60894e9c8 -SIZE (gtk-vnc-0.3.6.tar.gz) = 433381 +MD5 (gtk-vnc-0.3.7.tar.gz) = 41c613be4b554b71d63d30f844d60add +SHA256 (gtk-vnc-0.3.7.tar.gz) = d08ca04641ffb1dc2077b9325a5c566ef83990b5ed7359997aaa0286dcfe3f3c +SIZE (gtk-vnc-0.3.7.tar.gz) = 431242 diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile index 60c8a9bd5c1e..7e45be7fa98e 100644 --- a/net/libgweather/Makefile +++ b/net/libgweather/Makefile @@ -3,17 +3,19 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/libgweather/Makefile,v 1.7 2008/03/11 11:45:48 ahze Exp $ +# $MCom: ports/net/libgweather/Makefile,v 1.21 2008/11/25 17:04:51 mezz Exp $ # PORTNAME= libgweather -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 CATEGORIES= net gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Library to accessing online weather informations +LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup + USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo index d3cabeb58edf..5db9cccbb1fb 100644 --- a/net/libgweather/distinfo +++ b/net/libgweather/distinfo @@ -1,3 +1,3 @@ -MD5 (libgweather-2.22.3.tar.bz2) = 151e03d925579241decc92afa4d07182 -SHA256 (libgweather-2.22.3.tar.bz2) = d5a799e1d11cd91865cb716a11de970de97d7ef679684db0a893fc6a65a9acd0 -SIZE (libgweather-2.22.3.tar.bz2) = 6268948 +MD5 (libgweather-2.24.2.tar.bz2) = a95226ca8e5869eb2da66ce390e93b5a +SHA256 (libgweather-2.24.2.tar.bz2) = 5ac071cd108e1c1ed776bb32fe7e7d59a92eaea2949ecb8f84cda2a37556173c +SIZE (libgweather-2.24.2.tar.bz2) = 7099351 diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist index b47404c24d8e..eaa4b04adcb5 100644 --- a/net/libgweather/pkg-plist +++ b/net/libgweather/pkg-plist @@ -1,6 +1,11 @@ +include/libgweather/gweather-enum-types.h include/libgweather/gweather-gconf.h +include/libgweather/gweather-location.h include/libgweather/gweather-prefs.h +include/libgweather/gweather-timezone.h include/libgweather/gweather-xml.h +include/libgweather/location-entry.h +include/libgweather/timezone-menu.h include/libgweather/weather.h lib/libgweather.a lib/libgweather.la @@ -74,7 +79,7 @@ libdata/pkgconfig/gweather.pc %%DATADIR%%/Locations.sl.xml %%DATADIR%%/Locations.sq.xml %%DATADIR%%/Locations.sr.xml -%%DATADIR%%/Locations.sr@Latn.xml +%%DATADIR%%/Locations.sr@latin.xml %%DATADIR%%/Locations.sv.xml %%DATADIR%%/Locations.ta.xml %%DATADIR%%/Locations.te.xml @@ -172,7 +177,7 @@ share/locale/sk/LC_MESSAGES/libgweather.mo share/locale/sl/LC_MESSAGES/libgweather.mo share/locale/sq/LC_MESSAGES/libgweather.mo share/locale/sr/LC_MESSAGES/libgweather.mo -share/locale/sr@Latn/LC_MESSAGES/libgweather.mo +share/locale/sr@latin/LC_MESSAGES/libgweather.mo share/locale/sv/LC_MESSAGES/libgweather.mo share/locale/ta/LC_MESSAGES/libgweather.mo share/locale/te/LC_MESSAGES/libgweather.mo @@ -193,6 +198,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/net/vinagre/.#Makefile.1.17 b/net/vinagre/.#Makefile.1.17 new file mode 100644 index 000000000000..2435a45c069a --- /dev/null +++ b/net/vinagre/.#Makefile.1.17 @@ -0,0 +1,51 @@ +# New ports collection makefile for: vinagre +# Date created: 16 December 2007 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/net/vinagre/Makefile,v 1.17 2008/10/20 22:58:02 kwm Exp $ +# + +PORTNAME= vinagre +PORTVERSION= 2.24.1 +PORTREVISION= 1 +CATEGORIES= net gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= VNC client for the GNOME Desktop + +LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \ + avahi-core.6:${PORTSDIR}/net/avahi-app \ + avahi-ui.0:${PORTSDIR}/net/avahi-gtk \ + gnome-keyring:${PORTSDIR}/security/gnome-keyring + +USE_BZIP2= yes +USE_GETTEXT= yes +USE_GNOME= gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils \ + gnomepanel +USE_GMAKE= yes +GNU_CONFIGURE= yes +INSTALLS_OMF= yes +INSTALLS_ICONS= yes +CONFIGURE_ARGS= --enable-avahi +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= vinagre.schemas + +MAN1= vinagre.1 + +post-install: + @-update-desktop-database > /dev/null + @-update-mime-database ${PREFIX}/share/mime > /dev/null +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +.endfor +.endif + +.include <bsd.port.mk> diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index d410fec4efea..fe5e59d677cb 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/vinagre/Makefile,v 1.5 2008/03/10 15:15:00 ahze Exp $ +# $MCom: ports/net/vinagre/Makefile,v 1.20 2008/12/31 21:16:54 mezz Exp $ # PORTNAME= vinagre -PORTVERSION= 0.5.2 +PORTVERSION= 2.24.2 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -22,7 +23,8 @@ LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \ USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils +USE_GNOME= gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils \ + gnomepanel USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo index e8cb385c408c..d08ef1d64156 100644 --- a/net/vinagre/distinfo +++ b/net/vinagre/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vinagre-0.5.2.tar.bz2) = abf277899e28ec9beea9a2f7c331267d -SHA256 (gnome2/vinagre-0.5.2.tar.bz2) = b45f084343ad892bc303e2d0dada186d588ae6f0ccc419340024a2533e5a775b -SIZE (gnome2/vinagre-0.5.2.tar.bz2) = 1031512 +MD5 (gnome2/vinagre-2.24.2.tar.bz2) = 330a65e0277a2c8fe746e2091c3198ce +SHA256 (gnome2/vinagre-2.24.2.tar.bz2) = 57b4be4c8bfeeb1493e96b728ec6a4ac29b3e01217b03ce9b194e1932f538959 +SIZE (gnome2/vinagre-2.24.2.tar.bz2) = 1450774 diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist index e914b2b6a817..1b13279b6f25 100644 --- a/net/vinagre/pkg-plist +++ b/net/vinagre/pkg-plist @@ -1,4 +1,6 @@ bin/vinagre +libdata/bonobo/servers/GNOME_VinagreApplet.server +libexec/vinagre-applet share/applications/vinagre-file.desktop share/applications/vinagre.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -10,6 +12,12 @@ share/applications/vinagre.desktop share/gnome/help/vinagre/C/figures/vinagre-screenshot.png share/gnome/help/vinagre/C/legal.xml share/gnome/help/vinagre/C/vinagre.xml +share/gnome/help/vinagre/ca/figures/vinagre-screenshot.png +share/gnome/help/vinagre/ca/vinagre.xml +share/gnome/help/vinagre/cs/figures/vinagre-screenshot.png +share/gnome/help/vinagre/cs/vinagre.xml +share/gnome/help/vinagre/de/figures/vinagre-screenshot.png +share/gnome/help/vinagre/de/vinagre.xml share/gnome/help/vinagre/es/figures/vinagre-screenshot.png share/gnome/help/vinagre/es/vinagre.xml share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png @@ -24,6 +32,8 @@ share/gnome/help/vinagre/sq/figures/vinagre-screenshot.png share/gnome/help/vinagre/sq/vinagre.xml share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png share/gnome/help/vinagre/sv/vinagre.xml +share/gnome/help/vinagre/th/figures/vinagre-screenshot.png +share/gnome/help/vinagre/th/vinagre.xml share/icons/hicolor/16x16/apps/vinagre.png share/icons/hicolor/16x16/mimetypes/application-x-remote-connection.png share/icons/hicolor/16x16/mimetypes/application-x-vnc.png @@ -58,12 +68,15 @@ share/locale/eu/LC_MESSAGES/vinagre.mo share/locale/fi/LC_MESSAGES/vinagre.mo share/locale/fr/LC_MESSAGES/vinagre.mo share/locale/gl/LC_MESSAGES/vinagre.mo +share/locale/gu/LC_MESSAGES/vinagre.mo share/locale/he/LC_MESSAGES/vinagre.mo share/locale/hi/LC_MESSAGES/vinagre.mo share/locale/hu/LC_MESSAGES/vinagre.mo share/locale/it/LC_MESSAGES/vinagre.mo share/locale/ja/LC_MESSAGES/vinagre.mo +share/locale/kn/LC_MESSAGES/vinagre.mo share/locale/ko/LC_MESSAGES/vinagre.mo +share/locale/ku/LC_MESSAGES/vinagre.mo share/locale/lt/LC_MESSAGES/vinagre.mo share/locale/mk/LC_MESSAGES/vinagre.mo share/locale/ml/LC_MESSAGES/vinagre.mo @@ -72,6 +85,7 @@ share/locale/nb/LC_MESSAGES/vinagre.mo share/locale/nl/LC_MESSAGES/vinagre.mo share/locale/nn/LC_MESSAGES/vinagre.mo share/locale/oc/LC_MESSAGES/vinagre.mo +share/locale/or/LC_MESSAGES/vinagre.mo share/locale/pa/LC_MESSAGES/vinagre.mo share/locale/pl/LC_MESSAGES/vinagre.mo share/locale/pt/LC_MESSAGES/vinagre.mo @@ -80,12 +94,14 @@ share/locale/ru/LC_MESSAGES/vinagre.mo share/locale/si/LC_MESSAGES/vinagre.mo share/locale/sl/LC_MESSAGES/vinagre.mo share/locale/sq/LC_MESSAGES/vinagre.mo +share/locale/sr/LC_MESSAGES/vinagre.mo +share/locale/sr@latin/LC_MESSAGES/vinagre.mo share/locale/sv/LC_MESSAGES/vinagre.mo share/locale/ta/LC_MESSAGES/vinagre.mo share/locale/th/LC_MESSAGES/vinagre.mo share/locale/tr/LC_MESSAGES/vinagre.mo -share/locale/uk/LC_MESSAGES/vinagre.mo share/locale/vi/LC_MESSAGES/vinagre.mo +share/locale/uk/LC_MESSAGES/vinagre.mo share/locale/zh_CN/LC_MESSAGES/vinagre.mo share/locale/zh_HK/LC_MESSAGES/vinagre.mo share/locale/zh_TW/LC_MESSAGES/vinagre.mo @@ -93,6 +109,9 @@ share/mime/application/x-remote-connection.xml share/mime/application/x-vnc.xml share/mime/packages/vinagre-mime.xml share/omf/vinagre/vinagre-C.omf +share/omf/vinagre/vinagre-ca.omf +share/omf/vinagre/vinagre-cs.omf +share/omf/vinagre/vinagre-de.omf share/omf/vinagre/vinagre-es.omf share/omf/vinagre/vinagre-fr.omf share/omf/vinagre/vinagre-it.omf @@ -100,22 +119,14 @@ share/omf/vinagre/vinagre-oc.omf share/omf/vinagre/vinagre-pt.omf share/omf/vinagre/vinagre-sq.omf share/omf/vinagre/vinagre-sv.omf +share/omf/vinagre/vinagre-th.omf +%%DATADIR%%/GNOME_VinagreApplet.xml %%DATADIR%%/vinagre-ui.xml %%DATADIR%%/vinagre.glade @dirrm %%DATADIR%% @dirrm share/omf/vinagre -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -@dirrmtry share/locale/mr/LC_MESSAGES -@dirrmtry share/locale/mr -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin +@dirrm share/gnome/help/vinagre/th/figures +@dirrm share/gnome/help/vinagre/th @dirrm share/gnome/help/vinagre/sv/figures @dirrm share/gnome/help/vinagre/sv @dirrm share/gnome/help/vinagre/sq/figures @@ -130,6 +141,12 @@ share/omf/vinagre/vinagre-sv.omf @dirrm share/gnome/help/vinagre/fr @dirrm share/gnome/help/vinagre/es/figures @dirrm share/gnome/help/vinagre/es +@dirrm share/gnome/help/vinagre/de/figures +@dirrm share/gnome/help/vinagre/de +@dirrm share/gnome/help/vinagre/cs/figures +@dirrm share/gnome/help/vinagre/cs +@dirrm share/gnome/help/vinagre/ca/figures +@dirrm share/gnome/help/vinagre/ca @dirrm share/gnome/help/vinagre/C/figures @dirrm share/gnome/help/vinagre/C @dirrm share/gnome/help/vinagre @@ -139,3 +156,19 @@ share/omf/vinagre/vinagre-sv.omf @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/net/vino/Makefile b/net/vino/Makefile index 11f3d29920dd..94df0bf63f40 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -3,12 +3,11 @@ # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # # $FreeBSD$ -# $MCom: ports/net/vino/Makefile,v 1.56 2008/03/10 15:23:55 ahze Exp $ +# $MCom: ports/net/vino/Makefile,v 1.63 2008/10/20 23:08:47 kwm Exp $ # PORTNAME= vino -PORTVERSION= 2.22.2 -PORTREVISION= 2 +PORTVERSION= 2.24.1 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/net/vino/distinfo b/net/vino/distinfo index ef28a3b6e7dc..7abd78a63129 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vino-2.22.2.tar.bz2) = be507a80ec2c3cd5888060b81ff74f4e -SHA256 (gnome2/vino-2.22.2.tar.bz2) = f01b24635120e9f5fc5332cbdff49e26603d1c7089d70057209f41cd634751e7 -SIZE (gnome2/vino-2.22.2.tar.bz2) = 662387 +MD5 (gnome2/vino-2.24.1.tar.bz2) = b373292a7a5443d7fad1cce5eb07f37f +SHA256 (gnome2/vino-2.24.1.tar.bz2) = 4522c3969b64330b893de9a3257b4f7462975644b5e6cc57e9113d1f0c9c4a77 +SIZE (gnome2/vino-2.24.1.tar.bz2) = 674201 diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index 5f0b20bdfbd0..2db9574163d6 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -1,8 +1,8 @@ +bin/vino-passwd bin/vino-preferences -bin/vino-session -libdata/bonobo/servers/GNOME_RemoteDesktop.server libexec/vino-server share/applications/vino-preferences.desktop +share/gnome/autostart/vino-server.desktop share/locale/ar/LC_MESSAGES/vino.mo share/locale/as/LC_MESSAGES/vino.mo share/locale/az/LC_MESSAGES/vino.mo @@ -30,6 +30,7 @@ share/locale/gl/LC_MESSAGES/vino.mo share/locale/gu/LC_MESSAGES/vino.mo share/locale/he/LC_MESSAGES/vino.mo share/locale/hi/LC_MESSAGES/vino.mo +share/locale/hr/LC_MESSAGES/vino.mo share/locale/hu/LC_MESSAGES/vino.mo share/locale/id/LC_MESSAGES/vino.mo share/locale/it/LC_MESSAGES/vino.mo @@ -63,7 +64,7 @@ share/locale/sk/LC_MESSAGES/vino.mo share/locale/sl/LC_MESSAGES/vino.mo share/locale/sq/LC_MESSAGES/vino.mo share/locale/sr/LC_MESSAGES/vino.mo -share/locale/sr@Latn/LC_MESSAGES/vino.mo +share/locale/sr@latin/LC_MESSAGES/vino.mo share/locale/sv/LC_MESSAGES/vino.mo share/locale/ta/LC_MESSAGES/vino.mo share/locale/te/LC_MESSAGES/vino.mo @@ -89,6 +90,8 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index e3319e2fe91c..b7cfdc813f99 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -3,13 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/print/libgnomeprint/Makefile,v 1.71 2007/10/17 21:36:12 mezz Exp $ +# $MCom: ports/print/libgnomeprint/Makefile,v 1.73 2008/09/22 13:55:39 kwm Exp $ # # NOTE: Remind to update comms/gfax plist when PORTVERSION change. PORTNAME= libgnomeprint -PORTVERSION= 2.18.4 -PORTREVISION?= 2 +PORTVERSION= 2.18.5 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index 365587f6a31e..361bd9495735 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeprint-2.18.4.tar.bz2) = bc460f875425a956176f07440b3fa46e -SHA256 (gnome2/libgnomeprint-2.18.4.tar.bz2) = 1de453bf0bdfef88e591dcf8f0bf06242b419847c8ebcd2ff8dc420a9284bd3b -SIZE (gnome2/libgnomeprint-2.18.4.tar.bz2) = 884718 +MD5 (gnome2/libgnomeprint-2.18.5.tar.bz2) = c325baf4487335259e050619185787b1 +SHA256 (gnome2/libgnomeprint-2.18.5.tar.bz2) = 0ead99d6e227192d09902bdb37ec6aac25555a453ff4c338b49700fc477070c5 +SIZE (gnome2/libgnomeprint-2.18.5.tar.bz2) = 893326 diff --git a/print/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c b/print/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c deleted file mode 100644 index 5526dceaa446..000000000000 --- a/print/libgnomeprint/files/patch-libgnomeprint::gnome-meta.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomeprint/gnome-print-meta.c.orig Wed Oct 29 00:53:15 2003 -+++ libgnomeprint/gnome-print-meta.c Wed Oct 29 01:06:23 2003 -@@ -312,6 +312,7 @@ - gpm_encode_int (pc, w); - gpm_encode_int (pc, ch); - -+ gpm_ensure_space(pc, w * ch * h); - for (y = 0; y < h; y++){ - gpm_encode_block (pc, px, w * ch); - px += rowstride; diff --git a/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h b/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h deleted file mode 100644 index 9a4a497820fa..000000000000 --- a/print/libgnomeprint/files/patch-libgnomeprint_ttsubset_sft.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomeprint/ttsubset/sft.h.orig Thu Jul 1 13:18:38 2004 -+++ libgnomeprint/ttsubset/sft.h Thu Jul 1 13:20:14 2004 -@@ -103,7 +103,7 @@ - #endif - #endif - --#ifdef __i386 -+#if defined(__i386) || defined(__alpha__) - #ifndef G_LITTLE_ENDIAN - #define G_LITTLE_ENDIAN - #endif diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index 3e1585d5ac17..3c92e5fed013 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -155,7 +155,7 @@ share/locale/sk/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sq/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/sr@latin/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/sv/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ta/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/te/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @@ -190,6 +190,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/security/Makefile b/security/Makefile index 55329fcdd802..158998bb8ecf 100644 --- a/security/Makefile +++ b/security/Makefile @@ -703,6 +703,7 @@ SUBDIR += scanlogd SUBDIR += scanssh SUBDIR += seahorse + SUBDIR += seahorse-plugins SUBDIR += seccure SUBDIR += secpanel SUBDIR += sectok diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 68c0a9bf8128..3ad743250648 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/security/gnome-keyring/Makefile,v 1.59 2008/03/09 18:30:40 mezz Exp $ +# $MCom: ports/security/gnome-keyring/Makefile,v 1.71 2009/01/10 01:59:21 mezz Exp $ # PORTNAME= gnome-keyring -PORTVERSION= 2.22.3 -PORTREVISION= 2 +PORTVERSION= 2.24.1 +PORTREVISION= 1 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,8 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A program that keeps passwords and other secrets -LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ - tasn1.3:${PORTSDIR}/security/libtasn1 \ +LIB_DEPENDS= tasn1.3:${PORTSDIR}/security/libtasn1 \ gcrypt.16:${PORTSDIR}/security/libgcrypt USE_BZIP2= yes @@ -31,4 +30,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gnome-keyring.schemas -.include <bsd.port.mk> +OPTIONS= HAL "Use HAL for keys on removable drives" on + +.include <bsd.port.pre.mk> + +.if !defined(WITHOUT_HAL) +LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +CONFIGURE_ARGS+=--enable-hal +.else +CONFIGURE_ARGS+=--disable-hal +.endif + +.include <bsd.port.post.mk> diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 20ddac0b6c41..ca5144c4a5e6 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-keyring-2.22.3.tar.bz2) = f9e5cd9efac383076aaefc1086520656 -SHA256 (gnome2/gnome-keyring-2.22.3.tar.bz2) = 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6 -SIZE (gnome2/gnome-keyring-2.22.3.tar.bz2) = 894308 +MD5 (gnome2/gnome-keyring-2.24.1.tar.bz2) = aa5552dc129f3509ee39145b7f0bf977 +SHA256 (gnome2/gnome-keyring-2.24.1.tar.bz2) = 3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9 +SIZE (gnome2/gnome-keyring-2.24.1.tar.bz2) = 1125993 diff --git a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h new file mode 100644 index 000000000000..ebc3f9680b4c --- /dev/null +++ b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h @@ -0,0 +1,11 @@ +--- common/gkr-daemon-util.h.orig 2008-08-04 13:36:06.000000000 -0400 ++++ common/gkr-daemon-util.h 2008-08-04 13:36:18.000000000 -0400 +@@ -26,6 +26,8 @@ + + G_BEGIN_DECLS + ++#include <sys/types.h> ++ + #include <glib.h> + #include <glib-object.h> + diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure index 235656df1b7e..75016a356fcb 100644 --- a/security/gnome-keyring/files/patch-configure +++ b/security/gnome-keyring/files/patch-configure @@ -1,7 +1,25 @@ ---- configure.orig 2008-02-11 21:29:42.000000000 -0500 -+++ configure 2008-02-11 21:29:51.000000000 -0500 -@@ -23793,7 +23793,7 @@ else - tests_status="no" +--- configure.orig 2008-07-22 21:14:15.000000000 -0400 ++++ configure 2008-07-22 21:14:35.000000000 -0400 +@@ -25963,7 +25963,7 @@ fi + + dbus_status=$DBUS_VERSION + fi +- if test "$enable_dbus" == "yes"; then ++ if test "$enable_dbus" = "yes"; then + WITH_DBUS_TRUE= + WITH_DBUS_FALSE='#' + else +@@ -27001,7 +27001,7 @@ if test "${enable_tests+set}" = set; the + fi + + +-if test "$enable_tests" == "yes"; then ++if test "$enable_tests" = "yes"; then + echo "building tests and unit tests" + + cat >>confdefs.h <<_ACEOF +@@ -27014,7 +27014,7 @@ else + tests_status="no" fi - if test "$enable_tests" == "yes"; then @@ -9,12 +27,12 @@ WITH_TESTS_TRUE= WITH_TESTS_FALSE='#' else -@@ -25228,7 +25228,7 @@ fi +@@ -27029,7 +27029,7 @@ if test "${enable_coverage+set}" = set; + fi - dbus_status=$DBUS_VERSION + +-if test "$enable_coverage" == "yes"; then ++if test "$enable_coverage" = "yes"; then + CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" + LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage" fi -- if test "$enable_dbus" == "yes"; then -+ if test "$enable_dbus" = "yes"; then - WITH_DBUS_TRUE= - WITH_DBUS_FALSE='#' - else diff --git a/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c deleted file mode 100644 index 185e929dd298..000000000000 --- a/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c +++ /dev/null @@ -1,10 +0,0 @@ ---- keyrings/gkr-keyrings.c.orig 2008-02-11 21:30:10.000000000 -0500 -+++ keyrings/gkr-keyrings.c 2008-02-11 21:30:19.000000000 -0500 -@@ -35,6 +35,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <errno.h> -+#include <string.h> - #include <stdlib.h> - #include <stdio.h> - #include <sys/types.h> diff --git a/security/gnome-keyring/files/patch-library_gnome-keyring.c b/security/gnome-keyring/files/patch-library_gnome-keyring.c deleted file mode 100644 index 625a65cc72c0..000000000000 --- a/security/gnome-keyring/files/patch-library_gnome-keyring.c +++ /dev/null @@ -1,11 +0,0 @@ ---- library/gnome-keyring.c.orig 2008-02-26 22:05:10.000000000 -0600 -+++ library/gnome-keyring.c 2008-02-26 22:05:30.000000000 -0600 -@@ -50,6 +50,8 @@ - #include <dbus/dbus.h> - #endif - -+extern char **environ; -+ - typedef enum { - CALLBACK_DONE, - CALLBACK_GET_STRING, diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c new file mode 100644 index 000000000000..05a0306e6913 --- /dev/null +++ b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c @@ -0,0 +1,18 @@ +--- pam/gkr-pam-client.c.orig 2008-10-07 12:25:23.000000000 -0400 ++++ pam/gkr-pam-client.c 2008-10-07 12:38:36.000000000 -0400 +@@ -96,12 +96,12 @@ check_peer_same_uid (int sock) + struct xucred xuc; + socklen_t xuc_len = sizeof (xuc); + +- if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && +- xuc_len == sizeof (xuc)) { ++ if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && ++ xuc.cr_version == XUCRED_VERSION) { + uid = xuc.cr_uid; + } else { + syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, " +- "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc)); ++ "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION); + return -1; + } + diff --git a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c deleted file mode 100644 index 4bd5a923f4f4..000000000000 --- a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c +++ /dev/null @@ -1,10 +0,0 @@ ---- pkcs11/gkr-pkcs11-daemon.c.orig 2008-02-11 21:30:48.000000000 -0500 -+++ pkcs11/gkr-pkcs11-daemon.c 2008-02-11 21:30:58.000000000 -0500 -@@ -35,6 +35,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> -+#include <string.h> - #include <errno.h> - #include <unistd.h> - diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist index c91389e36cd8..2b3fe4715134 100644 --- a/security/gnome-keyring/pkg-plist +++ b/security/gnome-keyring/pkg-plist @@ -1,7 +1,12 @@ +bin/gnome-keyring bin/gnome-keyring-daemon include/gnome-keyring-1/gnome-keyring-memory.h include/gnome-keyring-1/gnome-keyring-result.h include/gnome-keyring-1/gnome-keyring.h +include/gp11/gp11.h +include/gp11/pkcs11.h +include/gp11/pkcs11g.h +include/gp11/pkcs11n.h lib/gnome-keyring/gnome-keyring-pkcs11.a lib/gnome-keyring/gnome-keyring-pkcs11.la lib/gnome-keyring/gnome-keyring-pkcs11.so @@ -9,10 +14,15 @@ lib/libgnome-keyring.a lib/libgnome-keyring.la lib/libgnome-keyring.so lib/libgnome-keyring.so.0 +lib/libgp11.a +lib/libgp11.la +lib/libgp11.so +lib/libgp11.so.0 lib/pam_gnome_keyring.a lib/pam_gnome_keyring.la lib/pam_gnome_keyring.so libdata/pkgconfig/gnome-keyring-1.pc +libdata/pkgconfig/gp11-0.pc libexec/gnome-keyring-ask share/dbus-1/services/org.gnome.keyring.service %%DOCSDIR%%/ch01.html @@ -39,6 +49,20 @@ share/dbus-1/services/org.gnome.keyring.service %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png +share/doc/gp11/GP11Object.html +share/doc/gp11/ch01.html +share/doc/gp11/gp11-GP11Call.html +share/doc/gp11/gp11-gp11-test.html +share/doc/gp11/gp11-pkcs11.html +share/doc/gp11/gp11.devhelp +share/doc/gp11/gp11.devhelp2 +share/doc/gp11/home.png +share/doc/gp11/index.html +share/doc/gp11/index.sgml +share/doc/gp11/left.png +share/doc/gp11/right.png +share/doc/gp11/style.css +share/doc/gp11/up.png share/locale/ar/LC_MESSAGES/gnome-keyring.mo share/locale/az/LC_MESSAGES/gnome-keyring.mo share/locale/be/LC_MESSAGES/gnome-keyring.mo @@ -73,6 +97,7 @@ share/locale/is/LC_MESSAGES/gnome-keyring.mo share/locale/it/LC_MESSAGES/gnome-keyring.mo share/locale/ja/LC_MESSAGES/gnome-keyring.mo share/locale/ka/LC_MESSAGES/gnome-keyring.mo +share/locale/kn/LC_MESSAGES/gnome-keyring.mo share/locale/ko/LC_MESSAGES/gnome-keyring.mo share/locale/lt/LC_MESSAGES/gnome-keyring.mo share/locale/lv/LC_MESSAGES/gnome-keyring.mo @@ -100,7 +125,7 @@ share/locale/sk/LC_MESSAGES/gnome-keyring.mo share/locale/sl/LC_MESSAGES/gnome-keyring.mo share/locale/sq/LC_MESSAGES/gnome-keyring.mo share/locale/sr/LC_MESSAGES/gnome-keyring.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo +share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo share/locale/sv/LC_MESSAGES/gnome-keyring.mo share/locale/ta/LC_MESSAGES/gnome-keyring.mo share/locale/te/LC_MESSAGES/gnome-keyring.mo @@ -112,8 +137,10 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo +@dirrm share/doc/gp11 @dirrm %%DOCSDIR%% @dirrm lib/gnome-keyring +@dirrm include/gp11 @dirrm include/gnome-keyring-1 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @@ -121,6 +148,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile new file mode 100644 index 000000000000..bf3507e2fff6 --- /dev/null +++ b/security/seahorse-plugins/Makefile @@ -0,0 +1,84 @@ +# New ports collection makefile for: seahorse-plugins +# Date created: 06 August 2008 +# Whom: Dave McKay <dave@mu.org> +# +# $FreeBSD$ +# $MCom: ports/security/seahorse-plugins/Makefile,v 1.4 2008/10/20 03:02:56 mezz Exp $ +# + +PORTNAME= seahorse-plugins +PORTVERSION= 2.24.1 +CATEGORIES= security gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Plug-ins for the Seahorse key and password management application + +LIB_DEPENDS= cryptui.0:${PORTSDIR}/security/seahorse + +USE_BZIP2= yes +USE_GETTEXT= yes +USE_GMAKE= yes +USE_GECKO= firefox xulrunner +USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils +GNU_CONFIGURE= yes +INSTALLS_ICONS= yes +INSTALLS_OMF= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +OPTIONS= EPIPHANY "Enable Epiphany plug-in support" on \ + NAUTILUS "Enable the Nautilus component" on \ + GEDIT "Enable GEdit plug-in support" on \ + APPLET "Enable clipboard encryption applet" on + +GCONF_SCHEMAS= seahorse-plugins.schemas +MAN1= seahorse-agent.1 seahorse-tool.1 + +.include <bsd.port.pre.mk> + +.if !defined(WITHOUT_GEDIT) +BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit +RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit +PLIST_SUB+= GEDIT="" +GCONF_SCHEMAS+= seahorse-gedit.schemas +.else +PLIST_SUB+= GEDIT="@comment " +CONFIGURE_ARGS+=--disable-gedit +.endif + +.if !defined(WITHOUT_NAUTILUS) +USE_GNOME+= nautilus2 +PLIST_SUB+= NAUTILUS="" +.else +PLIST_SUB+= NAUTILUS="@comment " +CONFIGURE_ARGS+=--disable-nautilus +.endif + +.if !defined(WITHOUT_EPIPHANY) +BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany +RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany +PLIST_SUB+= EPIPHANY="" EPHY_VERSION="2.23" +.else +CONFIGURE_ARGS+=--disable-epiphany +PLIST_SUB+= EPHY="@comment " +.endif + +.if !defined(WITHOUT_APPLET) +USE_GNOME+= gnomepanel +PLIST_SUB+= APPLET="" +.else +CONFIGURE_ARGS+=--disable-applet +PLIST_SUB+= APPLET="@comment " +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|" == "|" = "|g' \ + ${WRKSRC}/configure + +post-install: + @-update-desktop-database + @-update-mime-database ${PREFIX}/share/mime + +.include <bsd.port.post.mk> diff --git a/security/seahorse-plugins/distinfo b/security/seahorse-plugins/distinfo new file mode 100644 index 000000000000..e9ffdd587f4a --- /dev/null +++ b/security/seahorse-plugins/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 842b7b7424c2a5cfe56db5960133f0a1 +SHA256 (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 0a9ee63adc7ad01e9c3d9a3432d467a4df24889b7bd41b065e89bec74ccd7676 +SIZE (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 1843996 diff --git a/security/seahorse/files/patch-agent_seahorse-agent-io.c b/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c index 4ecd849405c7..4ecd849405c7 100644 --- a/security/seahorse/files/patch-agent_seahorse-agent-io.c +++ b/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c diff --git a/security/seahorse-plugins/files/patch-agent_seahorse-agent.h b/security/seahorse-plugins/files/patch-agent_seahorse-agent.h new file mode 100644 index 000000000000..7ba32051e701 --- /dev/null +++ b/security/seahorse-plugins/files/patch-agent_seahorse-agent.h @@ -0,0 +1,11 @@ +--- agent/seahorse-agent.h.orig 2008-08-06 01:22:16.000000000 -0400 ++++ agent/seahorse-agent.h 2008-08-06 01:22:27.000000000 -0400 +@@ -22,6 +22,8 @@ + #ifndef __SEAHORSE_AGENT_H__ + #define __SEAHORSE_AGENT_H__ + ++#include <sys/types.h> ++ + #include <glib.h> + #include <gconf/gconf-client.h> + #include <gconf/gconf.h> diff --git a/security/seahorse-plugins/pkg-descr b/security/seahorse-plugins/pkg-descr new file mode 100644 index 000000000000..1fda4fd5d434 --- /dev/null +++ b/security/seahorse-plugins/pkg-descr @@ -0,0 +1,5 @@ +These are various plug-ins for the Seahorse security management application. +They serve to extend Seahorse, and to integrate Seahorse into other +applications such as Nautilus, GEdit, etc. + +WWW: http://seahorse.sourceforge.net/ diff --git a/security/seahorse-plugins/pkg-plist b/security/seahorse-plugins/pkg-plist new file mode 100644 index 000000000000..635942266cf5 --- /dev/null +++ b/security/seahorse-plugins/pkg-plist @@ -0,0 +1,385 @@ +bin/seahorse-agent +bin/seahorse-preferences +bin/seahorse-tool +%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a +%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la +%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so +%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension +%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.a +%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.la +%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so +%%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin +%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.a +%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.la +%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.so +lib/seahorse/seahorse-applet +libdata/bonobo/servers/GNOME_SeahorseApplet.server +share/applications/seahorse-pgp-encrypted.desktop +share/applications/seahorse-pgp-keys.desktop +share/applications/seahorse-pgp-preferences.desktop +share/applications/seahorse-pgp-signature.desktop +share/gnome-2.0/ui/GNOME_SeahorseApplet.xml +share/gnome/help/seahorse-applet/C/legal.xml +share/gnome/help/seahorse-applet/C/seahorse-applet.xml +share/gnome/help/seahorse-applet/es/seahorse-applet.xml +share/gnome/help/seahorse-applet/fr/seahorse-applet.xml +share/gnome/help/seahorse-applet/it/seahorse-applet.xml +share/gnome/help/seahorse-applet/oc/seahorse-applet.xml +share/gnome/help/seahorse-applet/ru/seahorse-applet.xml +share/gnome/help/seahorse-applet/sv/seahorse-applet.xml +share/gnome/help/seahorse-applet/vi/seahorse-applet.xml +share/gnome/help/seahorse-plugins/C/figures/export.png +share/gnome/help/seahorse-plugins/C/figures/file-manager.png +share/gnome/help/seahorse-plugins/C/figures/generate.png +share/gnome/help/seahorse-plugins/C/figures/import.png +share/gnome/help/seahorse-plugins/C/figures/key-manager.png +share/gnome/help/seahorse-plugins/C/figures/key-properties.png +share/gnome/help/seahorse-plugins/C/figures/passphrase.png +share/gnome/help/seahorse-plugins/C/figures/preferences.png +share/gnome/help/seahorse-plugins/C/figures/recipients.png +share/gnome/help/seahorse-plugins/C/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/C/figures/signature.png +share/gnome/help/seahorse-plugins/C/figures/text-editor.png +share/gnome/help/seahorse-plugins/C/legal.xml +share/gnome/help/seahorse-plugins/C/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/cs/figures/export.png +share/gnome/help/seahorse-plugins/cs/figures/file-manager.png +share/gnome/help/seahorse-plugins/cs/figures/generate.png +share/gnome/help/seahorse-plugins/cs/figures/import.png +share/gnome/help/seahorse-plugins/cs/figures/key-manager.png +share/gnome/help/seahorse-plugins/cs/figures/key-properties.png +share/gnome/help/seahorse-plugins/cs/figures/passphrase.png +share/gnome/help/seahorse-plugins/cs/figures/preferences.png +share/gnome/help/seahorse-plugins/cs/figures/recipients.png +share/gnome/help/seahorse-plugins/cs/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/cs/figures/signature.png +share/gnome/help/seahorse-plugins/cs/figures/text-editor.png +share/gnome/help/seahorse-plugins/cs/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/de/figures/export.png +share/gnome/help/seahorse-plugins/de/figures/file-manager.png +share/gnome/help/seahorse-plugins/de/figures/generate.png +share/gnome/help/seahorse-plugins/de/figures/import.png +share/gnome/help/seahorse-plugins/de/figures/key-manager.png +share/gnome/help/seahorse-plugins/de/figures/key-properties.png +share/gnome/help/seahorse-plugins/de/figures/passphrase.png +share/gnome/help/seahorse-plugins/de/figures/preferences.png +share/gnome/help/seahorse-plugins/de/figures/recipients.png +share/gnome/help/seahorse-plugins/de/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/de/figures/signature.png +share/gnome/help/seahorse-plugins/de/figures/text-editor.png +share/gnome/help/seahorse-plugins/de/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/el/figures/export.png +share/gnome/help/seahorse-plugins/el/figures/file-manager.png +share/gnome/help/seahorse-plugins/el/figures/generate.png +share/gnome/help/seahorse-plugins/el/figures/import.png +share/gnome/help/seahorse-plugins/el/figures/key-manager.png +share/gnome/help/seahorse-plugins/el/figures/key-properties.png +share/gnome/help/seahorse-plugins/el/figures/passphrase.png +share/gnome/help/seahorse-plugins/el/figures/preferences.png +share/gnome/help/seahorse-plugins/el/figures/recipients.png +share/gnome/help/seahorse-plugins/el/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/el/figures/signature.png +share/gnome/help/seahorse-plugins/el/figures/text-editor.png +share/gnome/help/seahorse-plugins/el/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/en_GB/figures/export.png +share/gnome/help/seahorse-plugins/en_GB/figures/file-manager.png +share/gnome/help/seahorse-plugins/en_GB/figures/generate.png +share/gnome/help/seahorse-plugins/en_GB/figures/import.png +share/gnome/help/seahorse-plugins/en_GB/figures/key-manager.png +share/gnome/help/seahorse-plugins/en_GB/figures/key-properties.png +share/gnome/help/seahorse-plugins/en_GB/figures/passphrase.png +share/gnome/help/seahorse-plugins/en_GB/figures/preferences.png +share/gnome/help/seahorse-plugins/en_GB/figures/recipients.png +share/gnome/help/seahorse-plugins/en_GB/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/en_GB/figures/signature.png +share/gnome/help/seahorse-plugins/en_GB/figures/text-editor.png +share/gnome/help/seahorse-plugins/en_GB/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/es/figures/export.png +share/gnome/help/seahorse-plugins/es/figures/file-manager.png +share/gnome/help/seahorse-plugins/es/figures/generate.png +share/gnome/help/seahorse-plugins/es/figures/import.png +share/gnome/help/seahorse-plugins/es/figures/key-manager.png +share/gnome/help/seahorse-plugins/es/figures/key-properties.png +share/gnome/help/seahorse-plugins/es/figures/passphrase.png +share/gnome/help/seahorse-plugins/es/figures/preferences.png +share/gnome/help/seahorse-plugins/es/figures/recipients.png +share/gnome/help/seahorse-plugins/es/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/es/figures/signature.png +share/gnome/help/seahorse-plugins/es/figures/text-editor.png +share/gnome/help/seahorse-plugins/es/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/fr/figures/export.png +share/gnome/help/seahorse-plugins/fr/figures/file-manager.png +share/gnome/help/seahorse-plugins/fr/figures/generate.png +share/gnome/help/seahorse-plugins/fr/figures/import.png +share/gnome/help/seahorse-plugins/fr/figures/key-manager.png +share/gnome/help/seahorse-plugins/fr/figures/key-properties.png +share/gnome/help/seahorse-plugins/fr/figures/passphrase.png +share/gnome/help/seahorse-plugins/fr/figures/preferences.png +share/gnome/help/seahorse-plugins/fr/figures/recipients.png +share/gnome/help/seahorse-plugins/fr/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/fr/figures/signature.png +share/gnome/help/seahorse-plugins/fr/figures/text-editor.png +share/gnome/help/seahorse-plugins/fr/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/it/figures/export.png +share/gnome/help/seahorse-plugins/it/figures/file-manager.png +share/gnome/help/seahorse-plugins/it/figures/generate.png +share/gnome/help/seahorse-plugins/it/figures/import.png +share/gnome/help/seahorse-plugins/it/figures/key-manager.png +share/gnome/help/seahorse-plugins/it/figures/key-properties.png +share/gnome/help/seahorse-plugins/it/figures/passphrase.png +share/gnome/help/seahorse-plugins/it/figures/preferences.png +share/gnome/help/seahorse-plugins/it/figures/recipients.png +share/gnome/help/seahorse-plugins/it/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/it/figures/signature.png +share/gnome/help/seahorse-plugins/it/figures/text-editor.png +share/gnome/help/seahorse-plugins/it/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/oc/figures/export.png +share/gnome/help/seahorse-plugins/oc/figures/file-manager.png +share/gnome/help/seahorse-plugins/oc/figures/generate.png +share/gnome/help/seahorse-plugins/oc/figures/import.png +share/gnome/help/seahorse-plugins/oc/figures/key-manager.png +share/gnome/help/seahorse-plugins/oc/figures/key-properties.png +share/gnome/help/seahorse-plugins/oc/figures/passphrase.png +share/gnome/help/seahorse-plugins/oc/figures/preferences.png +share/gnome/help/seahorse-plugins/oc/figures/recipients.png +share/gnome/help/seahorse-plugins/oc/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/oc/figures/signature.png +share/gnome/help/seahorse-plugins/oc/figures/text-editor.png +share/gnome/help/seahorse-plugins/oc/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/ru/figures/export.png +share/gnome/help/seahorse-plugins/ru/figures/file-manager.png +share/gnome/help/seahorse-plugins/ru/figures/generate.png +share/gnome/help/seahorse-plugins/ru/figures/import.png +share/gnome/help/seahorse-plugins/ru/figures/key-manager.png +share/gnome/help/seahorse-plugins/ru/figures/key-properties.png +share/gnome/help/seahorse-plugins/ru/figures/passphrase.png +share/gnome/help/seahorse-plugins/ru/figures/preferences.png +share/gnome/help/seahorse-plugins/ru/figures/recipients.png +share/gnome/help/seahorse-plugins/ru/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/ru/figures/signature.png +share/gnome/help/seahorse-plugins/ru/figures/text-editor.png +share/gnome/help/seahorse-plugins/ru/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/sv/figures/export.png +share/gnome/help/seahorse-plugins/sv/figures/file-manager.png +share/gnome/help/seahorse-plugins/sv/figures/generate.png +share/gnome/help/seahorse-plugins/sv/figures/import.png +share/gnome/help/seahorse-plugins/sv/figures/key-manager.png +share/gnome/help/seahorse-plugins/sv/figures/key-properties.png +share/gnome/help/seahorse-plugins/sv/figures/passphrase.png +share/gnome/help/seahorse-plugins/sv/figures/preferences.png +share/gnome/help/seahorse-plugins/sv/figures/recipients.png +share/gnome/help/seahorse-plugins/sv/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/sv/figures/signature.png +share/gnome/help/seahorse-plugins/sv/figures/text-editor.png +share/gnome/help/seahorse-plugins/sv/seahorse-plugins.xml +share/gnome/help/seahorse-plugins/vi/figures/export.png +share/gnome/help/seahorse-plugins/vi/figures/file-manager.png +share/gnome/help/seahorse-plugins/vi/figures/generate.png +share/gnome/help/seahorse-plugins/vi/figures/import.png +share/gnome/help/seahorse-plugins/vi/figures/key-manager.png +share/gnome/help/seahorse-plugins/vi/figures/key-properties.png +share/gnome/help/seahorse-plugins/vi/figures/passphrase.png +share/gnome/help/seahorse-plugins/vi/figures/preferences.png +share/gnome/help/seahorse-plugins/vi/figures/recipients.png +share/gnome/help/seahorse-plugins/vi/figures/seahorse-window.png +share/gnome/help/seahorse-plugins/vi/figures/signature.png +share/gnome/help/seahorse-plugins/vi/figures/text-editor.png +share/gnome/help/seahorse-plugins/vi/seahorse-plugins.xml +share/icons/hicolor/48x48/apps/seahorse-applet.png +share/icons/hicolor/scalable/apps/seahorse-applet.svg +share/locale/ar/LC_MESSAGES/seahorse-plugins.mo +share/locale/az/LC_MESSAGES/seahorse-plugins.mo +share/locale/be@latin/LC_MESSAGES/seahorse-plugins.mo +share/locale/bg/LC_MESSAGES/seahorse-plugins.mo +share/locale/bn/LC_MESSAGES/seahorse-plugins.mo +share/locale/bn_IN/LC_MESSAGES/seahorse-plugins.mo +share/locale/ca/LC_MESSAGES/seahorse-plugins.mo +share/locale/cs/LC_MESSAGES/seahorse-plugins.mo +share/locale/da/LC_MESSAGES/seahorse-plugins.mo +share/locale/de/LC_MESSAGES/seahorse-plugins.mo +share/locale/dz/LC_MESSAGES/seahorse-plugins.mo +share/locale/el/LC_MESSAGES/seahorse-plugins.mo +share/locale/en_CA/LC_MESSAGES/seahorse-plugins.mo +share/locale/en_GB/LC_MESSAGES/seahorse-plugins.mo +share/locale/es/LC_MESSAGES/seahorse-plugins.mo +share/locale/et/LC_MESSAGES/seahorse-plugins.mo +share/locale/eu/LC_MESSAGES/seahorse-plugins.mo +share/locale/fi/LC_MESSAGES/seahorse-plugins.mo +share/locale/fr/LC_MESSAGES/seahorse-plugins.mo +share/locale/ga/LC_MESSAGES/seahorse-plugins.mo +share/locale/gl/LC_MESSAGES/seahorse-plugins.mo +share/locale/gu/LC_MESSAGES/seahorse-plugins.mo +share/locale/he/LC_MESSAGES/seahorse-plugins.mo +share/locale/hi/LC_MESSAGES/seahorse-plugins.mo +share/locale/hr/LC_MESSAGES/seahorse-plugins.mo +share/locale/hu/LC_MESSAGES/seahorse-plugins.mo +share/locale/it/LC_MESSAGES/seahorse-plugins.mo +share/locale/ja/LC_MESSAGES/seahorse-plugins.mo +share/locale/kn/LC_MESSAGES/seahorse-plugins.mo +share/locale/ko/LC_MESSAGES/seahorse-plugins.mo +share/locale/lt/LC_MESSAGES/seahorse-plugins.mo +share/locale/lv/LC_MESSAGES/seahorse-plugins.mo +share/locale/mk/LC_MESSAGES/seahorse-plugins.mo +share/locale/ml/LC_MESSAGES/seahorse-plugins.mo +share/locale/mr/LC_MESSAGES/seahorse-plugins.mo +share/locale/ms/LC_MESSAGES/seahorse-plugins.mo +share/locale/nb/LC_MESSAGES/seahorse-plugins.mo +share/locale/ne/LC_MESSAGES/seahorse-plugins.mo +share/locale/nl/LC_MESSAGES/seahorse-plugins.mo +share/locale/nn/LC_MESSAGES/seahorse-plugins.mo +share/locale/oc/LC_MESSAGES/seahorse-plugins.mo +share/locale/or/LC_MESSAGES/seahorse-plugins.mo +share/locale/pa/LC_MESSAGES/seahorse-plugins.mo +share/locale/pl/LC_MESSAGES/seahorse-plugins.mo +share/locale/pt/LC_MESSAGES/seahorse-plugins.mo +share/locale/pt_BR/LC_MESSAGES/seahorse-plugins.mo +share/locale/ru/LC_MESSAGES/seahorse-plugins.mo +share/locale/rw/LC_MESSAGES/seahorse-plugins.mo +share/locale/si/LC_MESSAGES/seahorse-plugins.mo +share/locale/sk/LC_MESSAGES/seahorse-plugins.mo +share/locale/sl/LC_MESSAGES/seahorse-plugins.mo +share/locale/sq/LC_MESSAGES/seahorse-plugins.mo +share/locale/sr/LC_MESSAGES/seahorse-plugins.mo +share/locale/sr@latin/LC_MESSAGES/seahorse-plugins.mo +share/locale/sv/LC_MESSAGES/seahorse-plugins.mo +share/locale/ta/LC_MESSAGES/seahorse-plugins.mo +share/locale/te/LC_MESSAGES/seahorse-plugins.mo +share/locale/th/LC_MESSAGES/seahorse-plugins.mo +share/locale/tr/LC_MESSAGES/seahorse-plugins.mo +share/locale/uk/LC_MESSAGES/seahorse-plugins.mo +share/locale/vi/LC_MESSAGES/seahorse-plugins.mo +share/locale/zh_CN/LC_MESSAGES/seahorse-plugins.mo +share/locale/zh_HK/LC_MESSAGES/seahorse-plugins.mo +share/locale/zh_TW/LC_MESSAGES/seahorse-plugins.mo +share/mime/packages/seahorse.xml +share/omf/seahorse-applet/seahorse-applet-C.omf +share/omf/seahorse-applet/seahorse-applet-es.omf +share/omf/seahorse-applet/seahorse-applet-fr.omf +share/omf/seahorse-applet/seahorse-applet-it.omf +share/omf/seahorse-applet/seahorse-applet-oc.omf +share/omf/seahorse-applet/seahorse-applet-ru.omf +share/omf/seahorse-applet/seahorse-applet-sv.omf +share/omf/seahorse-applet/seahorse-applet-vi.omf +share/omf/seahorse-plugins/seahorse-plugins-C.omf +share/omf/seahorse-plugins/seahorse-plugins-cs.omf +share/omf/seahorse-plugins/seahorse-plugins-de.omf +share/omf/seahorse-plugins/seahorse-plugins-el.omf +share/omf/seahorse-plugins/seahorse-plugins-en_GB.omf +share/omf/seahorse-plugins/seahorse-plugins-es.omf +share/omf/seahorse-plugins/seahorse-plugins-fr.omf +share/omf/seahorse-plugins/seahorse-plugins-it.omf +share/omf/seahorse-plugins/seahorse-plugins-oc.omf +share/omf/seahorse-plugins/seahorse-plugins-ru.omf +share/omf/seahorse-plugins/seahorse-plugins-sv.omf +share/omf/seahorse-plugins/seahorse-plugins-vi.omf +share/pixmaps/seahorse-applet.svg +share/pixmaps/seahorse-plugins/22x22/seahorse-applet-encrypted.png +share/pixmaps/seahorse-plugins/22x22/seahorse-applet-key.png +share/pixmaps/seahorse-plugins/22x22/seahorse-applet-signed.png +share/pixmaps/seahorse-plugins/22x22/seahorse-applet-text.png +share/pixmaps/seahorse-plugins/22x22/seahorse-applet-unknown.png +share/pixmaps/seahorse-plugins/22x22/seahorse-key-personal.png +share/pixmaps/seahorse-plugins/22x22/seahorse-key.png +share/pixmaps/seahorse-plugins/22x22/seahorse-sign-bad.png +share/pixmaps/seahorse-plugins/22x22/seahorse-sign-ok.png +share/pixmaps/seahorse-plugins/22x22/seahorse-sign.png +share/pixmaps/seahorse-plugins/48x48/seahorse-applet-encrypted.png +share/pixmaps/seahorse-plugins/48x48/seahorse-applet-key.png +share/pixmaps/seahorse-plugins/48x48/seahorse-applet-signed.png +share/pixmaps/seahorse-plugins/48x48/seahorse-applet-text.png +share/pixmaps/seahorse-plugins/48x48/seahorse-applet-unknown.png +share/pixmaps/seahorse-plugins/48x48/seahorse-applet.png +share/pixmaps/seahorse-plugins/48x48/seahorse-key-personal.png +share/pixmaps/seahorse-plugins/48x48/seahorse-key.png +share/pixmaps/seahorse-plugins/48x48/seahorse-sign-bad.png +share/pixmaps/seahorse-plugins/48x48/seahorse-sign-ok.png +share/pixmaps/seahorse-plugins/48x48/seahorse-sign-unknown.png +share/pixmaps/seahorse-plugins/48x48/seahorse-sign.png +share/pixmaps/seahorse-plugins/scalable/seahorse-applet-encrypted.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-applet-key.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-applet-signed.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-applet-text.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-applet-unknown.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-applet.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-key-personal.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-key-ssh.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-key.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-person.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-share-keys.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-sign-bad.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-sign-ok.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-sign-unknown.svg +share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg +%%DATADIR%%/glade/seahorse-agent-cache.glade +%%DATADIR%%/glade/seahorse-applet-preferences.glade +%%DATADIR%%/glade/seahorse-multi-encrypt.glade +%%DATADIR%%/glade/seahorse-notify.glade +%%DATADIR%%/glade/seahorse-prefs.glade +%%DATADIR%%/glade/seahorse-progress.glade +@dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%% +@dirrmtry share/pixmaps/seahorse-plugins/scalable +@dirrmtry share/pixmaps/seahorse-plugins/48x48 +@dirrmtry share/pixmaps/seahorse-plugins/22x22 +@dirrmtry share/pixmaps/seahorse-plugins +@dirrm share/omf/seahorse-plugins +@dirrm share/omf/seahorse-applet +@dirrm share/gnome/help/seahorse-plugins/vi/figures +@dirrm share/gnome/help/seahorse-plugins/vi +@dirrm share/gnome/help/seahorse-plugins/sv/figures +@dirrm share/gnome/help/seahorse-plugins/sv +@dirrm share/gnome/help/seahorse-plugins/ru/figures +@dirrm share/gnome/help/seahorse-plugins/ru +@dirrm share/gnome/help/seahorse-plugins/oc/figures +@dirrm share/gnome/help/seahorse-plugins/oc +@dirrm share/gnome/help/seahorse-plugins/it/figures +@dirrm share/gnome/help/seahorse-plugins/it +@dirrm share/gnome/help/seahorse-plugins/fr/figures +@dirrm share/gnome/help/seahorse-plugins/fr +@dirrm share/gnome/help/seahorse-plugins/es/figures +@dirrm share/gnome/help/seahorse-plugins/es +@dirrm share/gnome/help/seahorse-plugins/en_GB/figures +@dirrm share/gnome/help/seahorse-plugins/en_GB +@dirrm share/gnome/help/seahorse-plugins/el/figures +@dirrm share/gnome/help/seahorse-plugins/el +@dirrm share/gnome/help/seahorse-plugins/de/figures +@dirrm share/gnome/help/seahorse-plugins/de +@dirrm share/gnome/help/seahorse-plugins/cs/figures +@dirrm share/gnome/help/seahorse-plugins/cs +@dirrm share/gnome/help/seahorse-plugins/C/figures +@dirrm share/gnome/help/seahorse-plugins/C +@dirrm share/gnome/help/seahorse-plugins +@dirrm share/gnome/help/seahorse-applet/vi +@dirrm share/gnome/help/seahorse-applet/sv +@dirrm share/gnome/help/seahorse-applet/ru +@dirrm share/gnome/help/seahorse-applet/oc +@dirrm share/gnome/help/seahorse-applet/it +@dirrm share/gnome/help/seahorse-applet/fr +@dirrm share/gnome/help/seahorse-applet/es +@dirrm share/gnome/help/seahorse-applet/C +@dirrm share/gnome/help/seahorse-applet +@dirrmtry share/applications +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@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/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index b6aa77eb52d5..0b5e7cd21ef2 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -3,11 +3,11 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse/Makefile,v 1.61 2008/03/14 14:13:03 mezz Exp $ +# $MCom: ports/security/seahorse/Makefile,v 1.73 2008/11/24 02:44:50 marcus Exp $ # PORTNAME= seahorse -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.1 PORTREVISION= 1 CATEGORIES= security gnome MASTER_SITES= GNOME @@ -26,47 +26,23 @@ USE_LDCONFIG= yes USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_GECKO= firefox xulrunner firefox-devel<->firefox -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -CONFIGURE_ARGS= --with-gecko=${GECKO} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= seahorse.schemas -MAN1= seahorse-agent.1 seahorse-daemon.1 seahorse-tool.1 +MAN1= seahorse-daemon.1 OPTIONS= LDAP "Enable LDAP support" on \ HKP "Enable HKP keyserver interface" on \ NOTIFY "Enable libnotify support" on \ - APPLET "Enable clipboard encryption applet" on \ - MDNS "Enable mDNS key sharing" on \ - GEDIT "Enable GEdit plug-in support" on \ - NAUTILUS "Enable the Nautilus component" on \ - EPIPHANY "Enable Epiphany plug-in support" on + MDNS "Enable mDNS key sharing" on .include <bsd.port.pre.mk> -.if !defined(WITHOUT_GEDIT) -BUILD_DEPENDS+= gedit:${PORTSDIR}/editors/gedit -RUN_DEPENDS+= gedit:${PORTSDIR}/editors/gedit -PLIST_SUB+= GEDIT="" -GCONF_SCHEMAS+= seahorse-gedit.schemas -.else -PLIST_SUB+= GEDIT="@comment " -CONFIGURE_ARGS+=--disable-gedit -.endif - -.if !defined(WITHOUT_NAUTILUS) -USE_GNOME+= nautilus2 -PLIST_SUB+= NAUTILUS="" -.else -PLIST_SUB+= NAUTILUS="@comment " -CONFIGURE_ARGS+=--disable-nautilus -.endif - .if !defined(WITHOUT_LDAP) USE_OPENLDAP= yes .else @@ -85,23 +61,6 @@ LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--disable-libnotify .endif -.if !defined(WITHOUT_EPIPHANY) -BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany -RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany -PLIST_SUB+= EPHY="" EPHY_VERSION="2.22" -.else -CONFIGURE_ARGS+=--disable-epiphany -PLIST_SUB+= EPHY="@comment " -.endif - -.if !defined(WITHOUT_APPLET) -USE_GNOME+= gnomepanel -PLIST_SUB+= APPLET="" -.else -CONFIGURE_ARGS+=--disable-applet -PLIST_SUB+= APPLET="@comment " -.endif - .if !defined(WITHOUT_MDNS) LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app .else @@ -112,8 +71,4 @@ post-patch: @${REINPLACE_CMD} -e 's|" == "|" = "|g' \ ${WRKSRC}/configure -post-install: - -@update-desktop-database - -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" .include <bsd.port.post.mk> diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo index 369eb9ddb871..0ca292a08fc0 100644 --- a/security/seahorse/distinfo +++ b/security/seahorse/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/seahorse-2.22.3.tar.bz2) = 7fdab30dbf8684881199e15246c3765a -SHA256 (gnome2/seahorse-2.22.3.tar.bz2) = 245ff3752f72d14615937ef03d5a5e6f1a3abdf12a907af775ce31aa337e95d1 -SIZE (gnome2/seahorse-2.22.3.tar.bz2) = 2121204 +MD5 (gnome2/seahorse-2.24.1.tar.bz2) = b35076c2ae46aa58d9b1ca76fe929515 +SHA256 (gnome2/seahorse-2.24.1.tar.bz2) = b86c045fe1d8cf7a3fd56e078175e32cd94154eb77f9fe2a4a4e1f1aa13a5d04 +SIZE (gnome2/seahorse-2.24.1.tar.bz2) = 2197087 diff --git a/security/seahorse/files/patch-common_seahorse-registry.c b/security/seahorse/files/patch-common_seahorse-registry.c new file mode 100644 index 000000000000..a9b0cc424a6e --- /dev/null +++ b/security/seahorse/files/patch-common_seahorse-registry.c @@ -0,0 +1,76 @@ +--- common/seahorse-registry.c.orig 2008-11-23 18:26:38.000000000 -0500 ++++ common/seahorse-registry.c 2008-11-23 19:20:08.000000000 -0500 +@@ -49,6 +49,25 @@ cleanup_registry (void *unused) + registry_singleton = NULL; + } + ++static guint registry_hash (gconstpointer key) ++{ ++ SeahorseRegistryType *rtype; ++ ++ rtype = (SeahorseRegistryType *) key; ++ ++ return (guint) rtype->type; ++} ++ ++static gboolean registry_equal (gconstpointer a, gconstpointer b) ++{ ++ SeahorseRegistryType *rta, *rtb; ++ ++ rta = (SeahorseRegistryType *) a; ++ rtb = (SeahorseRegistryType *) b; ++ ++ return (rta->type == rtb->type); ++} ++ + static void + keys_to_list (gpointer key, gpointer value, gpointer user_data) + { +@@ -61,6 +80,7 @@ register_type_for_category (SeahorseRegi + { + SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry); + GHashTable *set; ++ SeahorseRegistryType *rtype; + + g_return_if_fail (SEAHORSE_IS_REGISTRY (registry)); + g_return_if_fail (category); +@@ -68,11 +88,14 @@ register_type_for_category (SeahorseRegi + + set = g_hash_table_lookup (pv->categories, category); + if (!set) { +- set = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL); ++ set = g_hash_table_new_full (registry_hash, registry_equal, (GDestroyNotify) g_free, NULL); + g_hash_table_replace (pv->categories, g_strdup (category), set); + } ++ ++ rtype = g_new (SeahorseRegistryType, 1); ++ rtype->type = type; + +- g_hash_table_replace (set, GUINT_TO_POINTER (type), NO_VALUE); ++ g_hash_table_replace (set, rtype, NO_VALUE); + } + + static GList* +@@ -115,6 +138,7 @@ lookup_types (SeahorseRegistry *registry + + /* Go through each item in list and make sure it exists in this cat */ + for (l = types; l; l = l ? g_list_next (l) : types) { ++ SeahorseRegistryType *rtype; + type = l; + if (!g_hash_table_lookup (set, type->data)) { + l = g_list_previous (l); +@@ -224,8 +248,12 @@ seahorse_registry_find_type (SeahorseReg + va_end (cats); + + type = 0; +- if (types) +- type = GPOINTER_TO_UINT (types->data); ++ if (types) { ++ SeahorseRegistryType *rtype; ++ ++ rtype = (SeahorseRegistryType *) types->data; ++ type = rtype->type; ++ } + g_list_free (types); + return type; + } diff --git a/security/seahorse/files/patch-common_seahorse-registry.h b/security/seahorse/files/patch-common_seahorse-registry.h new file mode 100644 index 000000000000..f1f57de3b042 --- /dev/null +++ b/security/seahorse/files/patch-common_seahorse-registry.h @@ -0,0 +1,21 @@ +--- common/seahorse-registry.h.orig 2008-11-23 18:26:42.000000000 -0500 ++++ common/seahorse-registry.h 2008-11-23 18:26:47.000000000 -0500 +@@ -35,6 +35,7 @@ G_BEGIN_DECLS + + typedef struct _SeahorseRegistry SeahorseRegistry; + typedef struct _SeahorseRegistryClass SeahorseRegistryClass; ++typedef struct _SeahorseRegistryType SeahorseRegistryType; + + struct _SeahorseRegistry { + GObject parent; +@@ -44,6 +45,10 @@ struct _SeahorseRegistryClass { + GObjectClass parent_class; + }; + ++struct _SeahorseRegistryType { ++ GType type; ++}; ++ + /* member functions */ + GType seahorse_registry_get_type (void) G_GNUC_CONST; + diff --git a/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c b/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c deleted file mode 100644 index e7a7e4f605a8..000000000000 --- a/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libseahorse/seahorse-ssh-operation.c.orig Sun Dec 3 23:21:01 2006 -+++ libseahorse/seahorse-ssh-operation.c Sun Dec 3 23:21:10 2006 -@@ -24,6 +24,7 @@ - #include <sys/socket.h> - #include <gnome.h> - #include <fcntl.h> -+#include <signal.h> - - #include "seahorse-ssh-operation.h" - #include "seahorse-util.h" diff --git a/security/seahorse/files/patch-src_seahorse-generate-select.c b/security/seahorse/files/patch-src_seahorse-generate-select.c new file mode 100644 index 000000000000..7de1b7ff476d --- /dev/null +++ b/security/seahorse/files/patch-src_seahorse-generate-select.c @@ -0,0 +1,14 @@ +--- src/seahorse-generate-select.c.orig 2008-11-23 18:28:34.000000000 -0500 ++++ src/seahorse-generate-select.c 2008-11-23 18:29:30.000000000 -0500 +@@ -197,8 +197,10 @@ static GObject * seahorse_generate_selec + GList* typ_it; + typ_collection = types; + for (typ_it = typ_collection; typ_it != NULL; typ_it = typ_it->next) { ++ SeahorseRegistryType *rtype; + GType typ; +- typ = GPOINTER_TO_INT (typ_it->data); ++ rtype = (SeahorseRegistryType *) typ_it->data; ++ typ = rtype->type; + { + SeahorseGenerator* generator; + gint _tmp5; diff --git a/security/seahorse/files/patch-src_seahorse-viewer.c b/security/seahorse/files/patch-src_seahorse-viewer.c new file mode 100644 index 000000000000..5acb2e00d676 --- /dev/null +++ b/security/seahorse/files/patch-src_seahorse-viewer.c @@ -0,0 +1,17 @@ +--- src/seahorse-viewer.c.orig 2008-11-23 18:27:49.000000000 -0500 ++++ src/seahorse-viewer.c 2008-11-23 18:28:27.000000000 -0500 +@@ -556,10 +556,13 @@ seahorse_viewer_constructor (GType type, + /* Setup the commands */ + types = seahorse_registry_find_types (seahorse_registry_get (), "commands", NULL, NULL); + for (l = types; l; l = g_list_next (l)) { +- GType typ = GPOINTER_TO_INT (l->data); ++ SeahorseRegistryType *rtype = (SeahorseRegistryType *) l->data; ++ GType typ; + SeahorseCommands *commands; + GtkActionGroup *actions; + const gchar *uidef; ++ ++ typ = rtype->type; + + /* Add each commands to our hash table */ + commands = g_object_new (typ, "view", self, NULL); diff --git a/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c new file mode 100644 index 000000000000..d3528e2a7a64 --- /dev/null +++ b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c @@ -0,0 +1,19 @@ +--- ssh/seahorse-ssh-operation.c.orig 2008-07-21 18:15:51.000000000 -0400 ++++ ssh/seahorse-ssh-operation.c 2008-07-22 22:49:51.000000000 -0400 +@@ -280,11 +280,14 @@ askpass_handler (GIOChannel *source, GIO + const gchar *result = NULL; + + if (condition & G_IO_IN) { ++ GIOStatus status; + + /* Read 1 line from the io channel, including newline character */ +- g_io_channel_read_line (source, &string, &length, NULL, &err); ++ status = g_io_channel_read_line (source, &string, &length, NULL, &err); + +- if (err != NULL) { ++ if (status == G_IO_STATUS_EOF) { ++ ret = FALSE; ++ } else if (err != NULL) { + g_critical ("couldn't read from seahorse-ssh-askpass: %s", err->message); + g_clear_error (&err); + ret = FALSE; diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist index 364434aee3a8..a94f07390a6f 100644 --- a/security/seahorse/pkg-plist +++ b/security/seahorse/pkg-plist @@ -1,50 +1,20 @@ bin/seahorse -bin/seahorse-agent bin/seahorse-daemon -bin/seahorse-preferences -bin/seahorse-tool include/libcryptui/cryptui-key-chooser.h include/libcryptui/cryptui-key-combo.h include/libcryptui/cryptui-key-list.h include/libcryptui/cryptui-key-store.h include/libcryptui/cryptui-keyset.h include/libcryptui/cryptui.h -%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a -%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la -%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so -%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension -%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.a -%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.la -%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so -%%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin lib/libcryptui.a lib/libcryptui.la lib/libcryptui.so lib/libcryptui.so.0 -%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.a -%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.la -%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.so -%%APPLET%%lib/seahorse/seahorse-applet lib/seahorse/seahorse-ssh-askpass lib/seahorse/xloadimage -%%APPLET%%libdata/bonobo/servers/GNOME_SeahorseApplet.server libdata/pkgconfig/cryptui-0.0.pc -share/applications/seahorse-pgp-encrypted.desktop -share/applications/seahorse-pgp-keys.desktop -share/applications/seahorse-pgp-preferences.desktop -share/applications/seahorse-pgp-signature.desktop share/applications/seahorse.desktop share/dbus-1/services/org.gnome.seahorse.service -%%APPLET%%share/gnome-2.0/ui/GNOME_SeahorseApplet.xml -%%APPLET%%share/gnome/help/seahorse-applet/C/legal.xml -%%APPLET%%share/gnome/help/seahorse-applet/C/seahorse-applet.xml -%%APPLET%%share/gnome/help/seahorse-applet/es/seahorse-applet.xml -%%APPLET%%share/gnome/help/seahorse-applet/fr/seahorse-applet.xml -%%APPLET%%share/gnome/help/seahorse-applet/it/seahorse-applet.xml -%%APPLET%%share/gnome/help/seahorse-applet/oc/seahorse-applet.xml -%%APPLET%%share/gnome/help/seahorse-applet/ru/seahorse-applet.xml -%%APPLET%%share/gnome/help/seahorse-applet/sv/seahorse-applet.xml -%%APPLET%%share/gnome/help/seahorse-applet/vi/seahorse-applet.xml share/gnome/help/seahorse/C/figures/export.png share/gnome/help/seahorse/C/figures/file-manager.png share/gnome/help/seahorse/C/figures/generate.png @@ -59,6 +29,19 @@ share/gnome/help/seahorse/C/figures/signature.png share/gnome/help/seahorse/C/figures/text-editor.png share/gnome/help/seahorse/C/legal.xml share/gnome/help/seahorse/C/seahorse.xml +share/gnome/help/seahorse/de/figures/export.png +share/gnome/help/seahorse/de/figures/file-manager.png +share/gnome/help/seahorse/de/figures/generate.png +share/gnome/help/seahorse/de/figures/import.png +share/gnome/help/seahorse/de/figures/key-manager.png +share/gnome/help/seahorse/de/figures/key-properties.png +share/gnome/help/seahorse/de/figures/passphrase.png +share/gnome/help/seahorse/de/figures/preferences.png +share/gnome/help/seahorse/de/figures/recipients.png +share/gnome/help/seahorse/de/figures/seahorse-window.png +share/gnome/help/seahorse/de/figures/signature.png +share/gnome/help/seahorse/de/figures/text-editor.png +share/gnome/help/seahorse/de/seahorse.xml share/gnome/help/seahorse/en_GB/figures/export.png share/gnome/help/seahorse/en_GB/figures/file-manager.png share/gnome/help/seahorse/en_GB/figures/generate.png @@ -163,14 +146,16 @@ share/gnome/help/seahorse/vi/figures/seahorse-window.png share/gnome/help/seahorse/vi/figures/signature.png share/gnome/help/seahorse/vi/figures/text-editor.png share/gnome/help/seahorse/vi/seahorse.xml -share/icons/hicolor/22x22/apps/seahorse-preferences.svg -share/icons/hicolor/22x22/apps/seahorse.svg -share/icons/hicolor/48x48/apps/seahorse-applet.png +share/icons/hicolor/16x16/apps/seahorse-preferences.png +share/icons/hicolor/16x16/apps/seahorse.png +share/icons/hicolor/22x22/apps/seahorse-preferences.png +share/icons/hicolor/22x22/apps/seahorse.png +share/icons/hicolor/24x24/apps/seahorse-preferences.png +share/icons/hicolor/24x24/apps/seahorse.png +share/icons/hicolor/32x32/apps/seahorse-preferences.png +share/icons/hicolor/32x32/apps/seahorse.png share/icons/hicolor/48x48/apps/seahorse-preferences.png share/icons/hicolor/48x48/apps/seahorse.png -share/icons/hicolor/scalable/apps/seahorse-applet.svg -share/icons/hicolor/scalable/apps/seahorse-preferences.svg -share/icons/hicolor/scalable/apps/seahorse.svg share/locale/ar/LC_MESSAGES/seahorse.mo share/locale/az/LC_MESSAGES/seahorse.mo share/locale/be@latin/LC_MESSAGES/seahorse.mo @@ -224,7 +209,7 @@ share/locale/sk/LC_MESSAGES/seahorse.mo share/locale/sl/LC_MESSAGES/seahorse.mo share/locale/sq/LC_MESSAGES/seahorse.mo share/locale/sr/LC_MESSAGES/seahorse.mo -share/locale/sr@Latn/LC_MESSAGES/seahorse.mo +share/locale/sr@latin/LC_MESSAGES/seahorse.mo share/locale/sv/LC_MESSAGES/seahorse.mo share/locale/ta/LC_MESSAGES/seahorse.mo share/locale/te/LC_MESSAGES/seahorse.mo @@ -235,16 +220,8 @@ share/locale/vi/LC_MESSAGES/seahorse.mo share/locale/zh_CN/LC_MESSAGES/seahorse.mo share/locale/zh_HK/LC_MESSAGES/seahorse.mo share/locale/zh_TW/LC_MESSAGES/seahorse.mo -share/mime/packages/seahorse.xml -%%APPLET%%share/omf/seahorse-applet/seahorse-applet-C.omf -%%APPLET%%share/omf/seahorse-applet/seahorse-applet-es.omf -%%APPLET%%share/omf/seahorse-applet/seahorse-applet-fr.omf -%%APPLET%%share/omf/seahorse-applet/seahorse-applet-it.omf -%%APPLET%%share/omf/seahorse-applet/seahorse-applet-oc.omf -%%APPLET%%share/omf/seahorse-applet/seahorse-applet-ru.omf -%%APPLET%%share/omf/seahorse-applet/seahorse-applet-sv.omf -%%APPLET%%share/omf/seahorse-applet/seahorse-applet-vi.omf share/omf/seahorse/seahorse-C.omf +share/omf/seahorse/seahorse-de.omf share/omf/seahorse/seahorse-en_GB.omf share/omf/seahorse/seahorse-es.omf share/omf/seahorse/seahorse-fr.omf @@ -253,64 +230,36 @@ share/omf/seahorse/seahorse-oc.omf share/omf/seahorse/seahorse-ru.omf share/omf/seahorse/seahorse-sv.omf share/omf/seahorse/seahorse-vi.omf -share/pixmaps/seahorse-applet.svg -share/pixmaps/seahorse-preferences.png -share/pixmaps/seahorse.png -share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png -share/pixmaps/seahorse/22x22/seahorse-applet-key.png -share/pixmaps/seahorse/22x22/seahorse-applet-signed.png -share/pixmaps/seahorse/22x22/seahorse-applet-text.png -share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png share/pixmaps/seahorse/22x22/seahorse-key-personal.png share/pixmaps/seahorse/22x22/seahorse-key-ssh.png share/pixmaps/seahorse/22x22/seahorse-key.png share/pixmaps/seahorse/22x22/seahorse-person.png -share/pixmaps/seahorse/22x22/seahorse-preferences.png share/pixmaps/seahorse/22x22/seahorse-share-keys.png share/pixmaps/seahorse/22x22/seahorse-sign-bad.png share/pixmaps/seahorse/22x22/seahorse-sign-ok.png share/pixmaps/seahorse/22x22/seahorse-sign.png -share/pixmaps/seahorse/22x22/seahorse.png -share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png -share/pixmaps/seahorse/48x48/seahorse-applet-key.png -share/pixmaps/seahorse/48x48/seahorse-applet-signed.png -share/pixmaps/seahorse/48x48/seahorse-applet-text.png -share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png -share/pixmaps/seahorse/48x48/seahorse-applet.png share/pixmaps/seahorse/48x48/seahorse-key-personal.png share/pixmaps/seahorse/48x48/seahorse-key-ssh.png share/pixmaps/seahorse/48x48/seahorse-key.png share/pixmaps/seahorse/48x48/seahorse-person.png -share/pixmaps/seahorse/48x48/seahorse-preferences.png share/pixmaps/seahorse/48x48/seahorse-share-keys.png share/pixmaps/seahorse/48x48/seahorse-sign-bad.png share/pixmaps/seahorse/48x48/seahorse-sign-ok.png share/pixmaps/seahorse/48x48/seahorse-sign-unknown.png share/pixmaps/seahorse/48x48/seahorse-sign.png -share/pixmaps/seahorse/48x48/seahorse.png -share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg -share/pixmaps/seahorse/scalable/seahorse-applet-key.svg -share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg -share/pixmaps/seahorse/scalable/seahorse-applet-text.svg -share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg -share/pixmaps/seahorse/scalable/seahorse-applet.svg share/pixmaps/seahorse/scalable/seahorse-key-personal.svg share/pixmaps/seahorse/scalable/seahorse-key-ssh.svg share/pixmaps/seahorse/scalable/seahorse-key.svg share/pixmaps/seahorse/scalable/seahorse-person.svg -share/pixmaps/seahorse/scalable/seahorse-preferences.svg share/pixmaps/seahorse/scalable/seahorse-share-keys.svg share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg share/pixmaps/seahorse/scalable/seahorse-sign.svg -share/pixmaps/seahorse/scalable/seahorse.svg %%DATADIR%%/glade/seahorse-add-keyring.glade %%DATADIR%%/glade/seahorse-add-keyserver.glade %%DATADIR%%/glade/seahorse-add-subkey.glade %%DATADIR%%/glade/seahorse-add-uid.glade -%%DATADIR%%/glade/seahorse-agent-cache.glade -%%APPLET%%%%DATADIR%%/glade/seahorse-applet-preferences.glade %%DATADIR%%/glade/seahorse-change-passphrase.glade %%DATADIR%%/glade/seahorse-expires.glade %%DATADIR%%/glade/seahorse-generate-select.glade @@ -321,7 +270,6 @@ share/pixmaps/seahorse/scalable/seahorse.svg %%DATADIR%%/glade/seahorse-keyserver-results.ui %%DATADIR%%/glade/seahorse-keyserver-search.glade %%DATADIR%%/glade/seahorse-keyserver-sync.glade -%%DATADIR%%/glade/seahorse-multi-encrypt.glade %%DATADIR%%/glade/seahorse-notify.glade %%DATADIR%%/glade/seahorse-pgp-generate.glade %%DATADIR%%/glade/seahorse-pgp-private-key-properties.glade @@ -340,7 +288,6 @@ share/pixmaps/seahorse/scalable/seahorse.svg @dirrm share/pixmaps/seahorse/48x48 @dirrm share/pixmaps/seahorse/22x22 @dirrm share/pixmaps/seahorse -%%APPLET%%@dirrm share/omf/seahorse-applet @dirrm share/omf/seahorse @dirrm share/gnome/help/seahorse/vi/figures @dirrm share/gnome/help/seahorse/vi @@ -358,32 +305,20 @@ share/pixmaps/seahorse/scalable/seahorse.svg @dirrm share/gnome/help/seahorse/es @dirrm share/gnome/help/seahorse/en_GB/figures @dirrm share/gnome/help/seahorse/en_GB +@dirrm share/gnome/help/seahorse/de/figures +@dirrm share/gnome/help/seahorse/de @dirrm share/gnome/help/seahorse/C/figures @dirrm share/gnome/help/seahorse/C -%%APPLET%%@dirrm share/gnome/help/seahorse-applet/vi -%%APPLET%%@dirrm share/gnome/help/seahorse-applet/sv -%%APPLET%%@dirrm share/gnome/help/seahorse-applet/ru -%%APPLET%%@dirrm share/gnome/help/seahorse-applet/oc -%%APPLET%%@dirrm share/gnome/help/seahorse-applet/it -%%APPLET%%@dirrm share/gnome/help/seahorse-applet/fr -%%APPLET%%@dirrm share/gnome/help/seahorse-applet/es -%%APPLET%%@dirrm share/gnome/help/seahorse-applet/C -%%APPLET%%@dirrm share/gnome/help/seahorse-applet @dirrm share/gnome/help/seahorse +@dirrmtry share/applications @dirrm lib/seahorse -%%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions -%%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%% -%%EPHY%%@dirrmtry lib/epiphany @dirrm include/libcryptui -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index cd09844a6b99..10343c02a55f 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/brasero/Makefile,v 1.23 2008/02/06 07:11:46 marcus Exp $ +# $MCom: ports/sysutils/brasero/Makefile,v 1.34 2009/01/09 22:03:01 kwm Exp $ PORTNAME= brasero -PORTVERSION= 0.7.1 -PORTREVISION= 5 +PORTVERSION= 0.8.4 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= CD/DVD mastering tool for the GNOME desktop LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ - totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser + totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser USE_GETTEXT= yes USE_BZIP2= yes @@ -25,9 +24,9 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehier nautiluscdburner USE_GSTREAMER= gconf core +INSTALLS_OMF= yes INSTALLS_ICONS= yes -CONFIGURE_ARGS= --disable-inotify \ - --with-cam +CONFIGURE_ARGS= --disable-inotify CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo index ba88da57f993..c63fa75cf437 100644 --- a/sysutils/brasero/distinfo +++ b/sysutils/brasero/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/brasero-0.7.1.tar.bz2) = 2754fca21c31f00016981cc8fe7c48be -SHA256 (gnome2/brasero-0.7.1.tar.bz2) = 0ad851ba9f05c2e4ae0778e61c74aee56bbae3a4181b172009698cde03387f5c -SIZE (gnome2/brasero-0.7.1.tar.bz2) = 1483716 +MD5 (gnome2/brasero-0.8.4.tar.bz2) = 5d0ad796e1f7b68a31f8757f1b3f9aef +SHA256 (gnome2/brasero-0.8.4.tar.bz2) = 6cbe0367e9049f6c93d67f6d9a48b530430e52d3d48ec3ae4b9bc96b79870bba +SIZE (gnome2/brasero-0.8.4.tar.bz2) = 2755878 diff --git a/sysutils/brasero/files/patch-configure b/sysutils/brasero/files/patch-configure deleted file mode 100644 index 3f4958a84b2e..000000000000 --- a/sysutils/brasero/files/patch-configure +++ /dev/null @@ -1,264 +0,0 @@ ---- configure.orig 2008-01-24 16:49:00.000000000 -0500 -+++ configure 2008-01-24 16:49:16.000000000 -0500 -@@ -885,6 +885,8 @@ BRASERO_BASE_CFLAGS - BRASERO_BASE_LIBS - BRASERO_CFLAGS - BRASERO_LIBS -+WITH_CAM_TRUE -+WITH_CAM_FALSE - LIBBURNIA_CFLAGS - LIBBURNIA_LIBS - BRASERO_LIBBURNIA_CFLAGS -@@ -1610,6 +1612,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-tags[=TAGS] include additional configurations [automatic] -+ --with-cam Build with CAM backend instead of Linux SCSI [default = no] - --with-gconf-source=sourceaddress Config database for installing schema files. - --with-gconf-schema-file-dir=dir Directory for installing schema files. - -@@ -4514,7 +4517,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 4517 "configure"' > conftest.$ac_ext -+ echo '#line 4520 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -7252,11 +7255,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:7255: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7258: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7259: \$? = $ac_status" >&5 -+ echo "$as_me:7262: \$? = $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. -@@ -7542,11 +7545,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:7545: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7548: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7549: \$? = $ac_status" >&5 -+ echo "$as_me:7552: \$? = $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. -@@ -7646,11 +7649,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:7649: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7652: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:7653: \$? = $ac_status" >&5 -+ echo "$as_me:7656: \$? = $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 -@@ -9997,7 +10000,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 10000 "configure" -+#line 10003 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10097,7 +10100,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 10100 "configure" -+#line 10103 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12517,11 +12520,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:12520: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12523: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:12524: \$? = $ac_status" >&5 -+ echo "$as_me:12527: \$? = $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. -@@ -12621,11 +12624,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:12624: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12627: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:12628: \$? = $ac_status" >&5 -+ echo "$as_me:12631: \$? = $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 -@@ -14185,11 +14188,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:14188: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14191: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14192: \$? = $ac_status" >&5 -+ echo "$as_me:14195: \$? = $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. -@@ -14289,11 +14292,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:14292: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14295: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14296: \$? = $ac_status" >&5 -+ echo "$as_me:14299: \$? = $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 -@@ -16478,11 +16481,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:16481: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16484: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16485: \$? = $ac_status" >&5 -+ echo "$as_me:16488: \$? = $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. -@@ -16768,11 +16771,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:16771: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16774: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16775: \$? = $ac_status" >&5 -+ echo "$as_me:16778: \$? = $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. -@@ -16872,11 +16875,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:16875: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16878: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16879: \$? = $ac_status" >&5 -+ echo "$as_me:16882: \$? = $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 -@@ -22350,6 +22353,27 @@ BRASERO_LIBS="$BRASERO_BASE_LIBS $BRASER - LIBBURN_REQUIRED=0.4.0 - LIBISOFS_REQUIRED=0.2.8 - -+ -+# Check whether --with-cam was given. -+if test "${with_cam+set}" = set; then -+ withval=$with_cam; -+else -+ with_cam="no" -+fi -+ -+ -+if text x"$with_cam" = "xyes"; then -+ BRASERO_LIBS="$BRASERO_LIBS -lcam" -+fi -+ if test x"$with_cam" = "xyes"; then -+ WITH_CAM_TRUE= -+ WITH_CAM_FALSE='#' -+else -+ WITH_CAM_TRUE='#' -+ WITH_CAM_FALSE= -+fi -+ -+ - # Check whether --enable-libburnia was given. - if test "${enable_libburnia+set}" = set; then - enableval=$enable_libburnia; -@@ -25144,6 +25168,13 @@ echo "$as_me: error: conditional \"am__f - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${WITH_CAM_TRUE}" && test -z "${WITH_CAM_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"WITH_CAM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"WITH_CAM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${BUILD_LIBBURNIA_TRUE}" && test -z "${BUILD_LIBBURNIA_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBBURNIA\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -25945,6 +25976,8 @@ BRASERO_BASE_CFLAGS!$BRASERO_BASE_CFLAGS - BRASERO_BASE_LIBS!$BRASERO_BASE_LIBS$ac_delim - BRASERO_CFLAGS!$BRASERO_CFLAGS$ac_delim - BRASERO_LIBS!$BRASERO_LIBS$ac_delim -+WITH_CAM_TRUE!$WITH_CAM_TRUE$ac_delim -+WITH_CAM_FALSE!$WITH_CAM_FALSE$ac_delim - LIBBURNIA_CFLAGS!$LIBBURNIA_CFLAGS$ac_delim - LIBBURNIA_LIBS!$LIBBURNIA_LIBS$ac_delim - BRASERO_LIBBURNIA_CFLAGS!$BRASERO_LIBBURNIA_CFLAGS$ac_delim -@@ -26019,8 +26052,6 @@ INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_deli - INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim - ALL_LINGUAS!$ALL_LINGUAS$ac_delim - SCHEMAS_INSTALL_TRUE!$SCHEMAS_INSTALL_TRUE$ac_delim --SCHEMAS_INSTALL_FALSE!$SCHEMAS_INSTALL_FALSE$ac_delim --GCONFTOOL!$GCONFTOOL$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -26062,6 +26093,8 @@ _ACEOF - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -+SCHEMAS_INSTALL_FALSE!$SCHEMAS_INSTALL_FALSE$ac_delim -+GCONFTOOL!$GCONFTOOL$ac_delim - GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim - GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim - GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim -@@ -26070,7 +26103,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` = 6; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/sysutils/brasero/files/patch-src_Makefile.in b/sysutils/brasero/files/patch-src_Makefile.in deleted file mode 100644 index c57255769ee6..000000000000 --- a/sysutils/brasero/files/patch-src_Makefile.in +++ /dev/null @@ -1,275 +0,0 @@ ---- src/Makefile.in.orig 2008-01-24 16:49:38.000000000 -0500 -+++ src/Makefile.in 2008-01-24 16:49:47.000000000 -0500 -@@ -45,7 +45,96 @@ CONFIG_CLEAN_FILES = - am__installdirs = "$(DESTDIR)$(bindir)" - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(bin_PROGRAMS) -+am__brasero_SOURCES_DIST = brasero-marshal.h brasero-marshal.c main.c \ -+ brasero-utils.h brasero-utils.c burn-dbus.h burn-dbus.c \ -+ brasero-search-entry.c brasero-search-entry.h \ -+ brasero-search-beagle.c brasero-search-beagle.h \ -+ brasero-mime-filter.c brasero-mime-filter.h brasero-playlist.c \ -+ brasero-playlist.h brasero-player.c brasero-player.h \ -+ brasero-menu.h brasero-burn-dialog.c brasero-burn-dialog.h \ -+ brasero-disc-copy-dialog.c brasero-disc-copy-dialog.h \ -+ brasero-blank-dialog.c brasero-blank-dialog.h inotify.h \ -+ brasero-metadata.c brasero-metadata.h inotify-syscalls.h \ -+ brasero-filtered-window.c brasero-filtered-window.h \ -+ brasero-disc.c brasero-disc.h brasero-data-disc.c \ -+ brasero-data-disc.h brasero-audio-disc.c brasero-audio-disc.h \ -+ brasero-project.c brasero-project.h \ -+ brasero-project-type-chooser.c brasero-project-type-chooser.h \ -+ brasero-player-bacon.c brasero-player-bacon.h \ -+ brasero-progress.c brasero-progress.h \ -+ brasero-song-properties.c brasero-song-properties.h \ -+ brasero-tray.c brasero-tray.h burn.c burn.h burn-job.c \ -+ burn-job.h burn-process.c burn-process.h burn-basics.h \ -+ burn-basics.c burn-caps.c burn-caps.h brasero-session.c \ -+ brasero-session.h brasero-app.h brasero-uri-container.c \ -+ brasero-uri-container.h brasero-project-manager.c \ -+ brasero-project-manager.h brasero-layout.c brasero-layout.h \ -+ brasero-file-chooser.c brasero-file-chooser.h \ -+ brasero-project-size.c brasero-project-size.h burn-session.h \ -+ brasero-sum-dialog.c brasero-sum-dialog.h \ -+ brasero-tool-dialog.c brasero-tool-dialog.h brasero-ncb.h \ -+ brasero-ncb.c burn-task.c burn-task.h brasero-vfs.c \ -+ brasero-vfs.h brasero-async-task-manager.c \ -+ brasero-async-task-manager.h eggtreemultidnd.c \ -+ eggtreemultidnd.h brasero-multi-dnd.c brasero-multi-dnd.h \ -+ brasero-image-option-dialog.c brasero-image-option-dialog.h \ -+ brasero-disc-option-dialog.c brasero-disc-option-dialog.h \ -+ brasero-image-type-chooser.c brasero-image-type-chooser.h \ -+ burn-iso9660.c burn-iso9660.h brasero-layout-object.c \ -+ brasero-layout-object.h burn-volume.c burn-volume.h \ -+ burn-susp.c burn-susp.h burn-iso-field.c burn-iso-field.h \ -+ burn-medium.h cam/cam-cdrom.h cam/freebsd_dvd_rw_utils.h \ -+ scsi/scsi-base.h scsi/scsi-command.h scsi/scsi-error.h \ -+ scsi/scsi-get-configuration.h scsi/scsi-mmc1.h \ -+ scsi/scsi-mmc2.h scsi/scsi-opcodes.h \ -+ scsi/scsi-read-disc-info.h scsi/scsi-read-toc-pma-atip.h \ -+ scsi/scsi-sense-data.h scsi/scsi-sg.h scsi/scsi-utils.h \ -+ scsi/scsi-q-subchannel.h scsi/scsi-read-track-information.h \ -+ scsi/scsi-get-performance.h scsi/scsi-mmc3.h \ -+ scsi/scsi-mode-pages.h scsi/scsi-status-page.h \ -+ scsi/scsi-spc1.h scsi/scsi-read-capacity.h \ -+ scsi/scsi-read-disc-structure.h scsi/scsi-dvd-structures.h \ -+ scsi/scsi-read-format-capacities.h scsi/scsi-command.c \ -+ scsi/scsi-get-configuration.c scsi/scsi-read-disc-info.c \ -+ scsi/scsi-read-toc-pma-atip.c scsi/scsi-sense-data.c \ -+ scsi/scsi-sg.c scsi/scsi-error.c \ -+ scsi/scsi-read-track-information.c scsi/scsi-get-performance.c \ -+ scsi/scsi-mode-sense.c scsi/scsi-read-capacity.c \ -+ scsi/scsi-read-disc-structure.c \ -+ scsi/scsi-read-format-capacities.c burn-medium-scsi.c \ -+ cam/cam-cdrom.c cam/freebsd_dvd_rw_utils.c burn-medium-cam.c \ -+ burn-debug.c burn-debug.h burn-track.h burn-plugin.h \ -+ burn-plugin.c burn-plugin-private.h burn-plugin-manager.c \ -+ burn-plugin-manager.h burn-task-ctx.h burn-task-item.c \ -+ burn-task-item.h burn-task-ctx.c burn-mkisofs-base.c \ -+ burn-mkisofs-base.h brasero-drive-selection.h \ -+ brasero-drive-selection.c brasero-src-selection.h \ -+ brasero-src-selection.c brasero-dest-selection.h \ -+ brasero-dest-selection.c brasero-drive-info.c \ -+ brasero-drive-info.h brasero-drive-properties.h \ -+ brasero-drive-properties.c brasero-image-properties.h \ -+ brasero-image-properties.c brasero-xfer.c brasero-xfer.h \ -+ burn-session.c burn-track.c brasero-plugin-manager-ui.c \ -+ brasero-plugin-manager-ui.h brasero-pref.h brasero-pref.c \ -+ brasero-plugin-option.h brasero-plugin-option.c \ -+ brasero-split-dialog.h brasero-split-dialog.c \ -+ brasero-time-button.h brasero-time-button.c brasero-preview.h \ -+ brasero-preview.c burn-image-format.c burn-image-format.h - am__objects_1 = brasero-marshal.$(OBJEXT) -+am__objects_2 = scsi-command.$(OBJEXT) \ -+ scsi-get-configuration.$(OBJEXT) scsi-read-disc-info.$(OBJEXT) \ -+ scsi-read-toc-pma-atip.$(OBJEXT) scsi-sense-data.$(OBJEXT) \ -+ scsi-sg.$(OBJEXT) scsi-error.$(OBJEXT) \ -+ scsi-read-track-information.$(OBJEXT) \ -+ scsi-get-performance.$(OBJEXT) scsi-mode-sense.$(OBJEXT) \ -+ scsi-read-capacity.$(OBJEXT) \ -+ scsi-read-disc-structure.$(OBJEXT) \ -+ scsi-read-format-capacities.$(OBJEXT) \ -+ burn-medium-scsi.$(OBJEXT) -+am__objects_3 = cam-cdrom.$(OBJEXT) freebsd_dvd_rw_utils.$(OBJEXT) \ -+ burn-medium-cam.$(OBJEXT) -+@WITH_CAM_FALSE@am__objects_4 = $(am__objects_2) -+@WITH_CAM_TRUE@am__objects_4 = $(am__objects_3) - am_brasero_OBJECTS = $(am__objects_1) main.$(OBJEXT) \ - brasero-utils.$(OBJEXT) burn-dbus.$(OBJEXT) \ - brasero-search-entry.$(OBJEXT) brasero-search-beagle.$(OBJEXT) \ -@@ -72,19 +161,11 @@ am_brasero_OBJECTS = $(am__objects_1) ma - brasero-disc-option-dialog.$(OBJEXT) \ - brasero-image-type-chooser.$(OBJEXT) burn-iso9660.$(OBJEXT) \ - brasero-layout-object.$(OBJEXT) burn-volume.$(OBJEXT) \ -- burn-susp.$(OBJEXT) burn-iso-field.$(OBJEXT) \ -- burn-medium.$(OBJEXT) scsi-command.$(OBJEXT) \ -- scsi-get-configuration.$(OBJEXT) scsi-read-disc-info.$(OBJEXT) \ -- scsi-read-toc-pma-atip.$(OBJEXT) scsi-sense-data.$(OBJEXT) \ -- scsi-sg.$(OBJEXT) scsi-error.$(OBJEXT) \ -- scsi-read-track-information.$(OBJEXT) \ -- scsi-get-performance.$(OBJEXT) scsi-mode-sense.$(OBJEXT) \ -- scsi-read-capacity.$(OBJEXT) \ -- scsi-read-disc-structure.$(OBJEXT) \ -- scsi-read-format-capacities.$(OBJEXT) burn-debug.$(OBJEXT) \ -- burn-plugin.$(OBJEXT) burn-plugin-manager.$(OBJEXT) \ -- burn-task-item.$(OBJEXT) burn-task-ctx.$(OBJEXT) \ -- burn-mkisofs-base.$(OBJEXT) brasero-drive-selection.$(OBJEXT) \ -+ burn-susp.$(OBJEXT) burn-iso-field.$(OBJEXT) $(am__objects_4) \ -+ burn-debug.$(OBJEXT) burn-plugin.$(OBJEXT) \ -+ burn-plugin-manager.$(OBJEXT) burn-task-item.$(OBJEXT) \ -+ burn-task-ctx.$(OBJEXT) burn-mkisofs-base.$(OBJEXT) \ -+ brasero-drive-selection.$(OBJEXT) \ - brasero-src-selection.$(OBJEXT) \ - brasero-dest-selection.$(OBJEXT) brasero-drive-info.$(OBJEXT) \ - brasero-drive-properties.$(OBJEXT) \ -@@ -110,7 +191,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ - SOURCES = $(brasero_SOURCES) --DIST_SOURCES = $(brasero_SOURCES) -+DIST_SOURCES = $(am__brasero_SOURCES_DIST) - RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ -@@ -316,6 +397,7 @@ INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I./scsi \ -+ -I./cam \ - -I./md5 \ - -DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DBRASERO_PREFIX=\"$(prefix)\" \ -@@ -327,9 +409,30 @@ INCLUDES = \ - - CLEANFILES = $(RECMARSHALFILES) - AM_CFLAGS = -g --EXTRA_DIST = cd-content-marshal.list -+CAMFILES = cam/cam-cdrom.c \ -+ cam/freebsd_dvd_rw_utils.c \ -+ burn-medium-cam.c -+ -+SCSIFILES = scsi/scsi-command.c \ -+ scsi/scsi-get-configuration.c \ -+ scsi/scsi-read-disc-info.c \ -+ scsi/scsi-read-toc-pma-atip.c \ -+ scsi/scsi-sense-data.c \ -+ scsi/scsi-sg.c \ -+ scsi/scsi-error.c \ -+ scsi/scsi-read-track-information.c \ -+ scsi/scsi-get-performance.c \ -+ scsi/scsi-mode-sense.c \ -+ scsi/scsi-read-capacity.c \ -+ scsi/scsi-read-disc-structure.c \ -+ scsi/scsi-read-format-capacities.c \ -+ burn-medium-scsi.c -+ -+EXTRA_DIST = cd-content-marshal.list $(CAMFILES) $(SCSIFILES) - GLIB_GENMARSHAL = `pkg-config --variable=glib_genmarshal glib-2.0` - RECMARSHALFILES = brasero-marshal.h brasero-marshal.c -+@WITH_CAM_FALSE@SCSISOURCES = $(SCSIFILES) -+@WITH_CAM_TRUE@SCSISOURCES = $(CAMFILES) - brasero_SOURCES = \ - $(RECMARSHALFILES) \ - main.c \ -@@ -435,43 +538,32 @@ brasero_SOURCES = \ - burn-iso-field.c \ - burn-iso-field.h \ - burn-medium.h \ -- burn-medium.c \ -+ cam/cam-cdrom.h \ -+ cam/freebsd_dvd_rw_utils.h \ - scsi/scsi-base.h \ -- scsi/scsi-command.c \ - scsi/scsi-command.h \ - scsi/scsi-error.h \ -- scsi/scsi-get-configuration.c \ - scsi/scsi-get-configuration.h \ - scsi/scsi-mmc1.h \ - scsi/scsi-mmc2.h \ - scsi/scsi-opcodes.h \ -- scsi/scsi-read-disc-info.c \ - scsi/scsi-read-disc-info.h \ -- scsi/scsi-read-toc-pma-atip.c \ - scsi/scsi-read-toc-pma-atip.h \ -- scsi/scsi-sense-data.c \ - scsi/scsi-sense-data.h \ -- scsi/scsi-sg.c \ - scsi/scsi-sg.h \ - scsi/scsi-utils.h \ - scsi/scsi-q-subchannel.h \ -- scsi/scsi-error.c \ -- scsi/scsi-read-track-information.c \ - scsi/scsi-read-track-information.h \ -- scsi/scsi-get-performance.c \ - scsi/scsi-get-performance.h \ - scsi/scsi-mmc3.h \ - scsi/scsi-mode-pages.h \ -- scsi/scsi-mode-sense.c \ - scsi/scsi-status-page.h \ - scsi/scsi-spc1.h \ -- scsi/scsi-read-capacity.c \ - scsi/scsi-read-capacity.h \ -- scsi/scsi-read-disc-structure.c \ - scsi/scsi-read-disc-structure.h \ - scsi/scsi-dvd-structures.h \ -- scsi/scsi-read-format-capacities.c \ - scsi/scsi-read-format-capacities.h \ -+ $(SCSISOURCES) \ - burn-debug.c \ - burn-debug.h \ - burn-track.h \ -@@ -647,7 +739,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-iso-field.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-iso9660.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-job.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-medium.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-medium-cam.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-medium-scsi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-mkisofs-base.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-plugin-manager.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-plugin.Po@am__quote@ -@@ -660,7 +753,9 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-track.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-volume.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cam-cdrom.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggtreemultidnd.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freebsd_dvd_rw_utils.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-command.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-error.Po@am__quote@ -@@ -879,6 +974,34 @@ scsi-read-format-capacities.obj: scsi/sc - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scsi-read-format-capacities.obj `if test -f 'scsi/scsi-read-format-capacities.c'; then $(CYGPATH_W) 'scsi/scsi-read-format-capacities.c'; else $(CYGPATH_W) '$(srcdir)/scsi/scsi-read-format-capacities.c'; fi` - -+cam-cdrom.o: cam/cam-cdrom.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cam-cdrom.o -MD -MP -MF $(DEPDIR)/cam-cdrom.Tpo -c -o cam-cdrom.o `test -f 'cam/cam-cdrom.c' || echo '$(srcdir)/'`cam/cam-cdrom.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cam-cdrom.Tpo $(DEPDIR)/cam-cdrom.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cam/cam-cdrom.c' object='cam-cdrom.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cam-cdrom.o `test -f 'cam/cam-cdrom.c' || echo '$(srcdir)/'`cam/cam-cdrom.c -+ -+cam-cdrom.obj: cam/cam-cdrom.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cam-cdrom.obj -MD -MP -MF $(DEPDIR)/cam-cdrom.Tpo -c -o cam-cdrom.obj `if test -f 'cam/cam-cdrom.c'; then $(CYGPATH_W) 'cam/cam-cdrom.c'; else $(CYGPATH_W) '$(srcdir)/cam/cam-cdrom.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/cam-cdrom.Tpo $(DEPDIR)/cam-cdrom.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cam/cam-cdrom.c' object='cam-cdrom.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cam-cdrom.obj `if test -f 'cam/cam-cdrom.c'; then $(CYGPATH_W) 'cam/cam-cdrom.c'; else $(CYGPATH_W) '$(srcdir)/cam/cam-cdrom.c'; fi` -+ -+freebsd_dvd_rw_utils.o: cam/freebsd_dvd_rw_utils.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/freebsd_dvd_rw_utils.Tpo -c -o freebsd_dvd_rw_utils.o `test -f 'cam/freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`cam/freebsd_dvd_rw_utils.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/freebsd_dvd_rw_utils.Tpo $(DEPDIR)/freebsd_dvd_rw_utils.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cam/freebsd_dvd_rw_utils.c' object='freebsd_dvd_rw_utils.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_dvd_rw_utils.o `test -f 'cam/freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`cam/freebsd_dvd_rw_utils.c -+ -+freebsd_dvd_rw_utils.obj: cam/freebsd_dvd_rw_utils.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/freebsd_dvd_rw_utils.Tpo -c -o freebsd_dvd_rw_utils.obj `if test -f 'cam/freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'cam/freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/cam/freebsd_dvd_rw_utils.c'; fi` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/freebsd_dvd_rw_utils.Tpo $(DEPDIR)/freebsd_dvd_rw_utils.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cam/freebsd_dvd_rw_utils.c' object='freebsd_dvd_rw_utils.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_dvd_rw_utils.obj `if test -f 'cam/freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'cam/freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/cam/freebsd_dvd_rw_utils.c'; fi` -+ - mostlyclean-libtool: - -rm -f *.lo - diff --git a/sysutils/brasero/files/patch-src_brasero-ncb.h b/sysutils/brasero/files/patch-src_brasero-ncb.h deleted file mode 100644 index bd5106d64789..000000000000 --- a/sysutils/brasero/files/patch-src_brasero-ncb.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/brasero-ncb.h.orig 2008-01-02 15:01:39.000000000 -0500 -+++ src/brasero-ncb.h 2008-01-02 15:02:15.000000000 -0500 -@@ -42,6 +42,9 @@ nautilus_burn_drive_get_drive_type ((dri - #define NCB_DRIVE_GET_DEVICE(drive) \ - nautilus_burn_drive_get_device (drive) - -+#define NCB_DRIVE_GET_CRECORD_DEVICE(drive) \ -+nautilus_burn_drive_get_cdrecord_device (drive) -+ - #define NCB_DRIVE_GET_LIST(list, recorders, image) \ - { \ - NautilusBurnDriveMonitor *monitor; \ diff --git a/sysutils/brasero/files/patch-src_burn-job.c b/sysutils/brasero/files/patch-src_burn-job.c deleted file mode 100644 index c26d1bb72169..000000000000 --- a/sysutils/brasero/files/patch-src_burn-job.c +++ /dev/null @@ -1,31 +0,0 @@ ---- src/burn-job.c.orig 2008-01-02 15:00:34.000000000 -0500 -+++ src/burn-job.c 2008-01-02 15:01:15.000000000 -0500 -@@ -1300,6 +1300,28 @@ brasero_job_get_device (BraseroJob *self - } - - BraseroBurnResult -+brasero_job_get_cdrecord_device (BraseroJob *self, gchar **device) -+{ -+ BraseroBurnSession *session; -+ NautilusBurnDrive *drive; -+ BraseroJobPrivate *priv; -+ const gchar *path; -+ -+ BRASERO_JOB_DEBUG (self); -+ -+ g_return_val_if_fail (device != NULL, BRASERO_BURN_ERR); -+ -+ priv = BRASERO_JOB_PRIVATE (self); -+ session = brasero_task_ctx_get_session (priv->ctx); -+ -+ drive = brasero_burn_session_get_burner (session); -+ path = NCB_DRIVE_GET_CRECORD_DEVICE (drive); -+ *device = g_strdup (path); -+ -+ return BRASERO_BURN_OK; -+} -+ -+BraseroBurnResult - brasero_job_get_media (BraseroJob *self, BraseroMedia *media) - { - BraseroBurnSession *session; diff --git a/sysutils/brasero/files/patch-src_burn-job.h b/sysutils/brasero/files/patch-src_burn-job.h deleted file mode 100644 index d73d8e6e2d99..000000000000 --- a/sysutils/brasero/files/patch-src_burn-job.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/burn-job.h.orig 2008-01-02 14:59:55.000000000 -0500 -+++ src/burn-job.h 2008-01-02 15:00:13.000000000 -0500 -@@ -148,6 +148,9 @@ BraseroBurnResult - brasero_job_get_device (BraseroJob *job, gchar **device); - - BraseroBurnResult -+brasero_job_get_cdrecord_device (BraseroJob *job, gchar **device); -+ -+BraseroBurnResult - brasero_job_get_media (BraseroJob *job, BraseroMedia *media); - - BraseroBurnResult diff --git a/sysutils/brasero/files/patch-src_burn-medium-cam.c b/sysutils/brasero/files/patch-src_burn-medium-cam.c deleted file mode 100644 index 2db8d00ca985..000000000000 --- a/sysutils/brasero/files/patch-src_burn-medium-cam.c +++ /dev/null @@ -1,1928 +0,0 @@ ---- src/burn-medium-cam.c.orig 2008-02-06 01:53:39.000000000 -0500 -+++ src/burn-medium-cam.c 2008-02-06 01:56:01.000000000 -0500 -@@ -0,0 +1,1925 @@ -+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -+/* -+ * brasero -+ * Copyright (C) Philippe Rouquier 2007 <bonfire-app@wanadoo.fr> -+ * Joe Marcus Clarke 2007 <marcus@FreeBSD.org> -+ * -+ * brasero is free software. -+ * -+ * You may redistribute it and/or modify it under the terms of the -+ * GNU General Public License, as published by the Free Software -+ * Foundation; either version 2 of the License, or (at your option) -+ * any later version. -+ * -+ * brasero is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ * See the GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with brasero. If not, write to: -+ * The Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor -+ * Boston, MA 02110-1301, USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <stdlib.h> -+#include <fcntl.h> -+#include <errno.h> -+ -+#include <glib.h> -+#include <glib/gi18n-lib.h> -+ -+#include <nautilus-burn-drive.h> -+ -+#include "burn-basics.h" -+#include "burn-debug.h" -+#include "burn-medium.h" -+#include "cam-cdrom.h" -+#include "scsi-read-format-capacities.h" -+#include "scsi-read-toc-pma-atip.h" -+#include "scsi-get-configuration.h" -+#include "scsi-q-subchannel.h" -+#include "scsi-utils.h" -+#include "freebsd_dvd_rw_utils.h" -+#include "burn-volume.h" -+#include "brasero-ncb.h" -+ -+const gchar *icons [] = { "gnome-dev-removable", -+ "gnome-dev-cdrom", -+ "gnome-dev-disc-cdr", -+ "gnome-dev-disc-cdrw", -+ "gnome-dev-disc-dvdrom", -+ "gnome-dev-disc-dvdr", -+ "gnome-dev-disc-dvdrw", -+ "gnome-dev-disc-dvdr-plus", -+ "gnome-dev-disc-dvdram", -+ NULL }; -+const gchar *types [] = { N_("file"), -+ N_("CDROM"), -+ N_("CD-R"), -+ N_("CD-RW"), -+ N_("DVDROM"), -+ N_("DVD-R"), -+ N_("DVD-RW"), -+ N_("DVD+R"), -+ N_("DVD+RW"), -+ N_("DVD+R dual layer"), -+ N_("DVD+RW dual layer"), -+ N_("DVD-R dual layer"), -+ N_("DVD-RAM"), -+ N_("Blu-ray disc"), -+ N_("Writable Blu-ray disc"), -+ N_("Rewritable Blu-ray disc"), -+ NULL }; -+ -+ -+typedef struct _BraseroMediumPrivate BraseroMediumPrivate; -+struct _BraseroMediumPrivate -+{ -+ gint retry_id; -+ -+ GSList * tracks; -+ -+ const gchar *type; -+ const gchar *icon; -+ -+ gint max_rd; -+ gint max_wrt; -+ -+ gint *rd_speeds; -+ gint *wr_speeds; -+ -+ gint64 block_num; -+ gint64 block_size; -+ -+ guint64 next_wr_add; -+ BraseroMedia info; -+ NautilusBurnDrive * drive; -+}; -+ -+#define BRASERO_MEDIUM_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_MEDIUM, BraseroMediumPrivate)) -+ -+enum -+{ -+ PROP_0, -+ PROP_DRIVE -+}; -+ -+static GObjectClass* parent_class = NULL; -+ -+const gchar * -+brasero_medium_get_type_string (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->type; -+} -+ -+const gchar * -+brasero_medium_get_icon (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->icon; -+} -+ -+BraseroMedia -+brasero_medium_get_status (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->info; -+} -+ -+GSList * -+brasero_medium_get_tracks (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return g_slist_copy (priv->tracks); -+} -+ -+gboolean -+brasero_medium_get_last_data_track_address (BraseroMedium *medium, -+ gint64 *byte, -+ gint64 *sector) -+{ -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track = NULL; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *current; -+ -+ current = iter->data; -+ if (current->type & BRASERO_MEDIUM_TRACK_DATA) -+ track = current; -+ } -+ -+ if (!track) { -+ if (byte) -+ *byte = -1; -+ if (sector) -+ *sector = -1; -+ return FALSE; -+ } -+ -+ if (byte) -+ *byte = track->start * priv->block_size; -+ -+ if (sector) -+ *sector = track->start; -+ -+ return TRUE; -+} -+ -+gboolean -+brasero_medium_get_last_data_track_space (BraseroMedium *medium, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track = NULL; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *current; -+ -+ current = iter->data; -+ if (current->type & BRASERO_MEDIUM_TRACK_DATA) -+ track = current; -+ } -+ -+ if (!track) { -+ if (size) -+ *size = -1; -+ if (blocks) -+ *blocks = -1; -+ return FALSE; -+ } -+ -+ if (size) -+ *size = track->blocks_num * priv->block_size; -+ if (blocks) -+ *blocks = track->blocks_num; -+ -+ return TRUE; -+} -+ -+guint -+brasero_medium_get_track_num (BraseroMedium *medium) -+{ -+ guint retval = 0; -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *current; -+ -+ current = iter->data; -+ if (current->type & BRASERO_MEDIUM_TRACK_LEADOUT) -+ break; -+ -+ retval ++; -+ } -+ -+ return retval; -+} -+ -+static BraseroMediumTrack * -+brasero_medium_get_track (BraseroMedium *medium, -+ guint num) -+{ -+ guint i = 1; -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *current; -+ -+ current = iter->data; -+ if (current->type == BRASERO_MEDIUM_TRACK_LEADOUT) -+ break; -+ -+ if (i == num) -+ return current; -+ -+ i++; -+ } -+ -+ return NULL; -+} -+ -+gboolean -+brasero_medium_get_track_space (BraseroMedium *medium, -+ guint num, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ track = brasero_medium_get_track (medium, num); -+ if (!track) { -+ if (size) -+ *size = -1; -+ if (blocks) -+ *blocks = -1; -+ return FALSE; -+ } -+ -+ if (size) -+ *size = track->blocks_num * priv->block_size; -+ if (blocks) -+ *blocks = track->blocks_num; -+ -+ return TRUE; -+} -+ -+gboolean -+brasero_medium_get_track_address (BraseroMedium *medium, -+ guint num, -+ gint64 *byte, -+ gint64 *sector) -+{ -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ track = brasero_medium_get_track (medium, num); -+ if (!track) { -+ if (byte) -+ *byte = -1; -+ if (sector) -+ *sector = -1; -+ return FALSE; -+ } -+ -+ if (byte) -+ *byte = track->start * priv->block_size; -+ if (sector) -+ *sector = track->start; -+ -+ return TRUE; -+} -+ -+gint64 -+brasero_medium_get_next_writable_address (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->next_wr_add; -+} -+ -+gint64 -+brasero_medium_get_max_write_speed (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->max_wrt * 1024; -+} -+ -+/** -+ * NOTEs about the following functions: -+ * for all closed media (including ROM types) capacity == size of data and -+ * should be the size of all data on the disc, free space is 0 -+ * for all blank -R types capacity == free space and size of data == 0 -+ * for all multisession -R types capacity == free space since having the real -+ * capacity of the media would be useless as we can only use this type of media -+ * to append more data -+ * for all -RW types capacity = free space + size of data. Here they can be -+ * appended (use free space) or rewritten (whole capacity). -+ * -+ * Usually: -+ * the free space is the size of the leadout track -+ * the size of data is the sum of track sizes (excluding leadout) -+ * the capacity depends on the media: -+ * for closed discs == sum of track sizes -+ * for multisession discs == free space (leadout size) -+ * for blank discs == (free space) leadout size -+ * for rewritable/blank == use SCSI functions to get capacity (see below) -+ * -+ * In fact we should really need the size of data in DVD+/-RW cases since the -+ * session is always equal to the size of the disc. -+ */ -+ -+void -+brasero_medium_get_data_size (BraseroMedium *medium, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track = NULL; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ if (!priv->tracks) { -+ /* that's probably because it wasn't possible to retrieve info */ -+ if (size) -+ *size = 0; -+ -+ if (blocks) -+ *blocks = 0; -+ -+ return; -+ } -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *tmp; -+ -+ tmp = iter->data; -+ if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) -+ break; -+ -+ track = iter->data; -+ } -+ -+ if (size) -+ *size = track ? (track->start + track->blocks_num) * priv->block_size: 0; -+ -+ if (blocks) -+ *blocks = track ? track->start + track->blocks_num: 0; -+} -+ -+void -+brasero_medium_get_free_space (BraseroMedium *medium, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track = NULL; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ if (!priv->tracks) { -+ /* that's probably because it wasn't possible to retrieve info. -+ * maybe it also happens with unformatted DVD+RW */ -+ -+ if (priv->info & BRASERO_MEDIUM_CLOSED) { -+ if (size) -+ *size = 0; -+ -+ if (blocks) -+ *blocks = 0; -+ } -+ else { -+ if (size) -+ *size = priv->block_num * priv->block_size; -+ -+ if (blocks) -+ *blocks = priv->block_num; -+ } -+ -+ return; -+ } -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *tmp; -+ -+ tmp = iter->data; -+ if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) { -+ track = iter->data; -+ break; -+ } -+ } -+ -+ if (size) { -+ if (!track) { -+ /* No leadout was found so the disc is probably closed: -+ * no free space left. */ -+ *size = 0; -+ } -+ else if (track->blocks_num <= 0) -+ *size = (priv->block_num - track->start) * priv->block_size; -+ else -+ *size = track->blocks_num * priv->block_size; -+ } -+ -+ if (blocks) { -+ if (!track) { -+ /* No leadout was found so the disc is probably closed: -+ * no free space left. */ -+ *blocks = 0; -+ } -+ else if (track->blocks_num <= 0) -+ *blocks = priv->block_num - track->blocks_num; -+ else -+ *blocks = track->blocks_num; -+ } -+} -+ -+void -+brasero_medium_get_capacity (BraseroMedium *medium, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ if (priv->info & BRASERO_MEDIUM_REWRITABLE) { -+ if (size) -+ *size = priv->block_num * priv->block_size; -+ -+ if (blocks) -+ *blocks = priv->block_num; -+ } -+ else if (priv->info & BRASERO_MEDIUM_CLOSED) -+ brasero_medium_get_data_size (medium, size, blocks); -+ else -+ brasero_medium_get_free_space (medium, size, blocks); -+} -+ -+/** -+ * Function to retrieve the capacity of a media -+ */ -+ -+static BraseroBurnResult -+brasero_medium_get_capacity_CD_RW (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ unsigned char *atip_data = NULL; -+ unsigned char *desc; -+ BraseroMediumPrivate *priv; -+ int result; -+ int size; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ BRASERO_BURN_LOG ("Retrieving capacity from atip"); -+ -+ result = brasero_cdrom_read_atip (cdrom, &atip_data); -+ -+ if (result != 0) { -+ g_free (atip_data); -+ -+ BRASERO_BURN_LOG ("READ ATIP failed (scsi error)"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ size = (atip_data[0] << 8 | atip_data[1]) - 2; -+ -+ /* check the size of the structure: it must be at least 16 bytes long */ -+ if (size < 16) { -+ if (size) -+ g_free (atip_data); -+ -+ BRASERO_BURN_LOG ("READ ATIP failed (wrong size)"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ desc = atip_data + 8; -+ -+ priv->block_num = BRASERO_MSF_TO_LBA (desc[8], desc[9], desc[10]); -+ g_free (atip_data); -+ -+ BRASERO_BURN_LOG ("Format capacity %lli %lli", -+ priv->block_num, -+ priv->block_size); -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_capacity_DVD_RW (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ unsigned char *hdr = NULL; -+ unsigned char *current; -+ BraseroMediumPrivate *priv; -+ int result; -+ -+ BRASERO_BURN_LOG ("Retrieving format capacity"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ result = brasero_cdrom_read_format_capacities (cdrom, &hdr); -+ if (result != 0) { -+ g_free (hdr); -+ -+ BRASERO_BURN_LOG ("READ FORMAT CAPACITIES failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ current = hdr + 5; -+ -+ /* see if the media is already formatted */ -+ if ((current[4] & 3) != BRASERO_SCSI_DESC_FORMATTED) { -+ int i, max; -+ unsigned char *desc; -+ -+ max = (hdr[4] - 8) / 8; -+ -+ desc = hdr + 5; -+ for (i = 0; i < max; i ++, desc += 8) { -+ /* search for the correct descriptor */ -+ if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)) { -+ if ((desc[4] >> 2) == BRASERO_SCSI_DVDRW_PLUS) { -+ priv->block_num = (desc[0] << 24 | desc[1] << 16 | desc[2] << 8 | desc[3]); -+ priv->block_size = (desc[5] << 16 | desc[6] << 8 | desc[7]); -+ -+ /* that can happen */ -+ if (!priv->block_size) -+ priv->block_size = 2048; -+ break; -+ } -+ } -+ else if ((desc[4] >> 2) == BRASERO_SCSI_BLOCK_SIZE_DEFAULT_AND_DB) { -+ priv->block_num = (desc[0] << 24 | desc[1] << 16 | desc[2] << 8 | desc[3]); -+ priv->block_size = (desc[5] << 16 | desc[6] << 8 | desc[7]); -+ break; -+ } -+ } -+ } -+ else { -+ priv->block_num = (current[0] << 24 | current[1] << 16 | current[2] << 8 | current[3]); -+ priv->block_size = (current[5] << 16 | current[6] << 8 | current[7]); -+ } -+ -+ BRASERO_BURN_LOG ("Format capacity %lli %lli", -+ priv->block_num, -+ priv->block_size); -+ -+ g_free (hdr); -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_capacity_by_type (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ priv->block_size = 2048; -+ -+ if (!(priv->info & BRASERO_MEDIUM_REWRITABLE)) -+ return BRASERO_BURN_OK; -+ -+ if (priv->info & BRASERO_MEDIUM_CD) -+ brasero_medium_get_capacity_CD_RW (self, cdrom); -+ else -+ brasero_medium_get_capacity_DVD_RW (self, cdrom); -+ -+ return BRASERO_BURN_OK; -+} -+ -+/** -+ * Functions to retrieve the speed -+ */ -+ -+static BraseroBurnResult -+brasero_medium_get_speed_mmc3 (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ int size; -+ int num_desc, i; -+ gint max_rd, max_wrt; -+ int result; -+ BraseroMediumPrivate *priv; -+ unsigned char *desc; -+ unsigned char *wrt_perf = NULL; -+ -+ BRASERO_BURN_LOG ("Retrieving speed (Get Performance)"); -+ -+ /* NOTE: this only work if there is RT streaming feature with -+ * wspd bit set to 1. At least an MMC3 drive. */ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ result = brasero_cdrom_get_performance_wrt_spd_desc (cdrom, &wrt_perf); -+ -+ if (result != 0) { -+ g_free (wrt_perf); -+ -+ BRASERO_BURN_LOG ("GET PERFORMANCE failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ size = 4 + (wrt_perf[0] << 24 | wrt_perf[1] << 16 | wrt_perf[2] << 8 | wrt_perf[3]); -+ -+ num_desc = (size - 8) / 16; -+ -+ if (num_desc <= 0) -+ goto end; -+ -+ priv->rd_speeds = g_new0 (gint, num_desc + 1); -+ priv->wr_speeds = g_new0 (gint, num_desc + 1); -+ -+ max_rd = 0; -+ max_wrt = 0; -+ -+ desc = wrt_perf + 8; -+ for (i = 0; i < num_desc; i ++, desc += 16) { -+ priv->rd_speeds [i] = (desc[8] << 24 | desc[9] << 16 | desc[10] << 8 || desc[11]); -+ priv->wr_speeds [i] = (desc[12] << 24 | desc[13] << 16 | desc[14] << 8 | desc[15]); -+ -+ max_rd = MAX (max_rd, priv->rd_speeds [i]); -+ max_wrt = MAX (max_wrt, priv->wr_speeds [i]); -+ } -+ -+ priv->max_rd = max_rd; -+ priv->max_wrt = max_wrt; -+ -+end: -+ -+ g_free (wrt_perf); -+ -+ /* strangely there are so drives (I know one case) which support this -+ * function but don't report any speed. So if our top speed is 0 then -+ * use the other way to get the speed. It was a Teac */ -+ if (!priv->max_wrt) -+ return BRASERO_BURN_ERR; -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_page_2A_write_speed_desc (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ BraseroMediumPrivate *priv; -+ int result; -+ char *wspeeds; -+ int rspeed, wspeed; -+ -+ BRASERO_BURN_LOG ("Retrieving speed (2A speeds)"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ result = brasero_cdrom_get_read_write_speed (cdrom, &rspeed, &wspeed, &wspeeds); -+ -+ if (result != 0) { -+ BRASERO_BURN_LOG ("MODE SENSE failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ if (wspeeds != NULL) { -+ char **speedv; -+ int i; -+ -+ speedv = g_strsplit_set (wspeeds, ",", 0); -+ g_free (wspeeds); -+ priv->wr_speeds = g_new0 (gint, g_strv_length (speedv) + 1); -+ for (i = 0; speedv[i] != NULL; i++) { -+ if (*(speedv[i])) -+ priv->wr_speeds[i] = atoi (speedv[i]); -+ } -+ g_strfreev (speedv); -+ } -+ -+ priv->max_wrt = wspeed; -+ priv->max_rd = rspeed; -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_page_2A_max_speed (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ BraseroMediumPrivate *priv; -+ int result; -+ int rspeed, wspeed; -+ char *wspeeds; -+ -+ BRASERO_BURN_LOG ("Retrieving speed (2A max)"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ result = brasero_cdrom_get_read_write_speed (cdrom, &rspeed, &wspeed, &wspeeds); -+ -+ if (result != 0) { -+ BRASERO_BURN_LOG ("MODE SENSE failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ priv->max_rd = rspeed; -+ priv->max_wrt = wspeed; -+ -+ g_free (wspeeds); -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_medium_type (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ unsigned char *hdr = NULL; -+ unsigned char *confdesc; -+ BraseroMediumPrivate *priv; -+ BraseroBurnResult result; -+ int profile; -+ int res; -+ -+ BRASERO_BURN_LOG ("Retrieving media profile"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ res = brasero_cdrom_get_configuration_feature (cdrom, -+ BRASERO_SCSI_FEAT_REAL_TIME_STREAM, -+ &hdr); -+ if (res != 0) { -+ unsigned char *data = NULL; -+ unsigned char *desc; -+ int size; -+ -+ BRASERO_BURN_LOG ("GET CONFIGURATION failed"); -+ -+ /* This could be a MMC1 drive since this command was -+ * introduced in MMC2 and is supported onward. So it -+ * has to be a CD (R/RW). The rest of the information -+ * will be provided by read_disc_information. */ -+ -+ /* The only thing here left to determine is if that's a WRITABLE -+ * or a REWRITABLE. To determine that information, we need to -+ * read TocPmaAtip. It if fails that's a ROM, if it succeeds. -+ */ -+ res = brasero_cdrom_read_atip (cdrom, &data); -+ if (res != 0) { -+ /* CDROM */ -+ priv->info = BRASERO_MEDIUM_CDROM; -+ priv->type = types [1]; -+ priv->icon = icons [1]; -+ } -+ else { -+ /* check the size of the structure: it must be at least 8 bytes long */ -+ size = (data[0] << 8 | data[1]) - 2; -+ if (size < 8) { -+ if (size) -+ g_free (data); -+ -+ BRASERO_BURN_LOG ("READ ATIP failed (wrong size)"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ desc = data + 4; -+ -+ if ((desc[2] >> 6) & 1) { -+ /* CDRW */ -+ priv->info = BRASERO_MEDIUM_CDRW; -+ priv->type = types [3]; -+ priv->icon = icons [3]; -+ } -+ else { -+ /* CDR */ -+ priv->info = BRASERO_MEDIUM_CDR; -+ priv->type = types [2]; -+ priv->icon = icons [2]; -+ } -+ -+ g_free (data); -+ } -+ -+ /* retrieve the speed */ -+ result = brasero_medium_get_page_2A_max_speed (self, cdrom); -+ return result; -+ } -+ -+ profile = (hdr[6] << 8 | hdr[7]); -+ -+ switch (profile) { -+ case BRASERO_SCSI_PROF_CDROM: -+ priv->info = BRASERO_MEDIUM_CDROM; -+ priv->type = types [1]; -+ priv->icon = icons [1]; -+ break; -+ -+ case BRASERO_SCSI_PROF_CDR: -+ priv->info = BRASERO_MEDIUM_CDR; -+ priv->type = types [2]; -+ priv->icon = icons [2]; -+ break; -+ -+ case BRASERO_SCSI_PROF_CDRW: -+ priv->info = BRASERO_MEDIUM_CDRW; -+ priv->type = types [3]; -+ priv->icon = icons [3]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_ROM: -+ priv->info = BRASERO_MEDIUM_DVD_ROM; -+ priv->type = types [4]; -+ priv->icon = icons [4]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_R: -+ priv->info = BRASERO_MEDIUM_DVDR; -+ priv->type = types [5]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RW_RESTRICTED: -+ priv->info = BRASERO_MEDIUM_DVDRW_RESTRICTED; -+ priv->type = types [6]; -+ priv->icon = icons [6]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RW_SEQUENTIAL: -+ priv->info = BRASERO_MEDIUM_DVDRW; -+ priv->type = types [6]; -+ priv->icon = icons [6]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_R_PLUS: -+ priv->info = BRASERO_MEDIUM_DVDR_PLUS; -+ priv->type = types [7]; -+ priv->icon = icons [7]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RW_PLUS: -+ priv->info = BRASERO_MEDIUM_DVDRW_PLUS; -+ priv->type = types [8]; -+ priv->icon = icons [7]; -+ break; -+ -+ /* WARNING: these types are recognized, no more */ -+ case BRASERO_SCSI_PROF_DVD_R_PLUS_DL: -+ priv->info = BRASERO_MEDIUM_DVDR_PLUS_DL; -+ priv->type = types [9]; -+ priv->icon = icons [7]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RW_PLUS_DL: -+ priv->info = BRASERO_MEDIUM_DVDRW_PLUS_DL; -+ priv->type = types [10]; -+ priv->icon = icons [7]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_R_DL_SEQUENTIAL: -+ priv->info = BRASERO_MEDIUM_DVDR_DL; -+ priv->type = types [11]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_R_DL_JUMP: -+ priv->info = BRASERO_MEDIUM_DVDR_JUMP_DL; -+ priv->type = types [11]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RAM: -+ priv->info = BRASERO_MEDIUM_DVD_RAM; -+ priv->type = types [12]; -+ priv->icon = icons [8]; -+ break; -+ -+ case BRASERO_SCSI_PROF_BD_ROM: -+ priv->info = BRASERO_MEDIUM_BD_ROM; -+ priv->type = types [13]; -+ priv->icon = icons [4]; -+ break; -+ -+ case BRASERO_SCSI_PROF_BR_R_SEQUENTIAL: -+ priv->info = BRASERO_MEDIUM_BDR; -+ priv->type = types [14]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_BR_R_RANDOM: -+ priv->info = BRASERO_MEDIUM_BDR_RANDOM; -+ priv->type = types [14]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_BD_RW: -+ priv->info = BRASERO_MEDIUM_BDRW; -+ priv->type = types [15]; -+ priv->icon = icons [6]; -+ break; -+ -+ case BRASERO_SCSI_PROF_NON_REMOVABLE: -+ case BRASERO_SCSI_PROF_REMOVABLE: -+ case BRASERO_SCSI_PROF_MO_ERASABLE: -+ case BRASERO_SCSI_PROF_MO_WRITE_ONCE: -+ case BRASERO_SCSI_PROF_MO_ADVANCED_STORAGE: -+ case BRASERO_SCSI_PROF_DDCD_ROM: -+ case BRASERO_SCSI_PROF_DDCD_R: -+ case BRASERO_SCSI_PROF_DDCD_RW: -+ case BRASERO_SCSI_PROF_HD_DVD_ROM: -+ case BRASERO_SCSI_PROF_HD_DVD_R: -+ case BRASERO_SCSI_PROF_HD_DVD_RAM: -+ priv->info = BRASERO_MEDIUM_UNSUPPORTED; -+ priv->icon = icons [0]; -+ g_free (hdr); -+ return BRASERO_BURN_NOT_SUPPORTED; -+ } -+ -+ confdesc = hdr + 8; -+ -+ /* try all SCSI functions to get write/read speeds in order */ -+ if (confdesc[4] >= 4) { -+ unsigned char *stream; -+ -+ /* means it's at least an MMC3 drive */ -+ stream = confdesc + 5; -+ if ((stream[0] >> 1) & 1) { -+ result = brasero_medium_get_speed_mmc3 (self, cdrom); -+ if (result == BRASERO_BURN_OK) -+ goto end; -+ } -+ -+ if ((stream[0] >> 2) & 1) { -+ result = brasero_medium_get_page_2A_write_speed_desc (self, cdrom); -+ if (result == BRASERO_BURN_OK) -+ goto end; -+ } -+ } -+ -+ /* fallback for speeds */ -+ result = brasero_medium_get_page_2A_max_speed (self, cdrom); -+ -+end: -+ -+ g_free (hdr); -+ -+ if (result != BRASERO_BURN_OK) -+ return result; -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_css_feature (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ unsigned char *hdr = NULL; -+ BraseroMediumPrivate *priv; -+ int result; -+ int size; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ BRASERO_BURN_LOG ("Testing for Css encrypted media"); -+ result = brasero_cdrom_get_configuration_feature (cdrom, -+ BRASERO_SCSI_FEAT_DVD_CSS, -+ &hdr); -+ if (result != 0) { -+ g_free (hdr); -+ -+ BRASERO_BURN_LOG ("GET CONFIGURATION failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ size = 4 + (hdr[0] << 24 | hdr[1] << 16 | hdr[2] << 8 | hdr[3]); -+ -+ if (size < 9 || hdr[12] < 4) { -+ g_free (hdr); -+ return BRASERO_BURN_OK; -+ } -+ -+ /* here we just need to see if this feature is current or not */ -+ if (hdr[11] & 1) { -+ priv->info |= BRASERO_MEDIUM_PROTECTED; -+ BRASERO_BURN_LOG ("media is Css protected"); -+ } -+ -+ g_free (hdr); -+ return BRASERO_BURN_OK; -+} -+ -+/** -+ * Functions to get information about disc contents -+ */ -+ -+static void -+brasero_medium_set_track_type (BraseroMedium *self, -+ BraseroMediumTrack *track, -+ guchar control) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ if (control & BRASERO_SCSI_TRACK_COPY) -+ track->type |= BRASERO_MEDIUM_TRACK_COPY; -+ -+ if (!(control & BRASERO_SCSI_TRACK_DATA)) { -+ track->type |= BRASERO_MEDIUM_TRACK_AUDIO; -+ priv->info |= BRASERO_MEDIUM_HAS_AUDIO; -+ -+ if (control & BRASERO_SCSI_TRACK_PREEMP) -+ track->type |= BRASERO_MEDIUM_TRACK_PREEMP; -+ -+ if (control & BRASERO_SCSI_TRACK_4_CHANNELS) -+ track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS; -+ } -+ else { -+ track->type |= BRASERO_MEDIUM_TRACK_DATA; -+ priv->info |= BRASERO_MEDIUM_HAS_DATA; -+ -+ if (control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -+ track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -+ } -+} -+ -+static BraseroBurnResult -+brasero_medium_track_volume_size (BraseroMedium *self, -+ BraseroMediumTrack *track, -+ BRASEROCDROM *cdrom) -+{ -+ BraseroMediumPrivate *priv; -+ BraseroBurnResult res; -+ GError *error = NULL; -+ gint64 nb_blocks; -+ -+ if (!track) -+ return BRASERO_BURN_ERR; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ /* This is a special case. For DVD+RW and DVD-RW in restricted -+ * mode, there is only one session that takes the whole disc size -+ * once formatted. That doesn't necessarily means they have data -+ * Note also that they are reported as complete though you can -+ * still add data (with growisofs). It is nevertheless on the -+ * condition that the fs is valid. -+ * So we check if their first and only volume is valid. -+ * That's also used when the track size is reported a 300 Kio -+ * see below */ -+ res = brasero_volume_get_size_fd (brasero_cdrom_get_fd (cdrom), -+ track->start, -+ &nb_blocks, -+ NULL); -+ if (!res) { -+ BRASERO_BURN_LOG ("Failed to retrieve the volume size: %s", -+ error && error->message ? -+ error->message:"unknown error"); -+ -+ if (error) -+ g_error_free (error); -+ return BRASERO_BURN_ERR; -+ } -+ -+ track->blocks_num = nb_blocks; -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_track_get_info (BraseroMedium *self, -+ BraseroMediumTrack *track, -+ int track_num, -+ BRASEROCDROM *cdrom) -+{ -+ unsigned char track_info[48]; -+ BraseroMediumPrivate *priv; -+ int result; -+ int size; -+ int next_wrt; -+ -+ BRASERO_BURN_LOG ("Retrieving track information for %i", track_num); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ /* at this point we know the type of the disc that's why we set the -+ * size according to this type. That may help to avoid outrange address -+ * errors. */ -+ if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DL|BRASERO_MEDIUM_WRITABLE)) -+ size = 48; -+ else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_PLUS|BRASERO_MEDIUM_WRITABLE)) -+ size = 40; -+ else -+ size = 36; -+ -+ result = brasero_cdrom_read_track_info (cdrom, track_num, track_info, size); -+ -+ if (result != 0) { -+ BRASERO_BURN_LOG ("READ TRACK INFO failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ track->blocks_num = (track_info[24] << 24 | track_info[25] << 16 | track_info[26] << 8 | track_info[27]); -+ track->session = (track_info[33] << 8 | track_info[3]); -+ -+ /* Now here is a potential bug: we can write tracks (data or not) -+ * shorter than 300 Kio /2 sec but they will be padded to reach this -+ * floor value. That means that is blocks_num is 300 blocks that may -+ * mean that the data length on the track is actually shorter. -+ * So we read the volume descriptor. If it works, good otherwise -+ * use the old value. -+ * That's important for checksuming to have a perfect account of the -+ * data size. */ -+ if (track->blocks_num <= 300) { -+ BRASERO_BURN_LOG ("300 sectors size. Checking for real size"); -+ brasero_medium_track_volume_size (self, track, cdrom); -+ } -+ -+ next_wrt = (track_info[12] << 24 | track_info[13] << 16 | track_info[14] << 7 | track_info[15]); -+ -+ if (next_wrt); -+ priv->next_wr_add = next_wrt; -+ -+ BRASERO_BURN_LOG ("Track %i (session %i): type = %i start = %llu size = %llu", -+ track_num, -+ track->session, -+ track->type, -+ track->start, -+ track->blocks_num); -+ -+ return BRASERO_BURN_OK; -+} -+ -+/** -+ * return : -+ * 0 when it's not possible to determine (fallback to formatted toc) -+ * -1 for BCD -+ * 1 for HEX */ -+static guint -+brasero_medium_check_BCD_use (BraseroMedium *self, -+ BRASEROCDROM *cdrom, -+ unsigned char *desc, -+ guint num) -+{ -+ guint i; -+ int size; -+ guint leadout = 0; -+ guint track_num = 0; -+ gboolean use_BCD = TRUE; -+ gboolean use_HEX = TRUE; -+ int result; -+ unsigned char *dptr; -+ unsigned char track_info[48]; -+ guint start_BCD, start_LBA, track_start; -+ -+ /* first check if all values are valid BCD numbers in the descriptors */ -+ dptr = desc; -+ for (i = 0; i < num; i++, dptr += 11) { -+ if ((dptr[1] >> 4) == 1 && dptr[3] <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) { -+ if (!BRASERO_IS_BCD_VALID (dptr[8]) -+ || !BRASERO_IS_BCD_VALID (dptr[9]) -+ || !BRASERO_IS_BCD_VALID (dptr[10])) { -+ use_BCD = FALSE; -+ break; -+ } -+ } -+ else if (dptr[3] == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) { -+ if (!BRASERO_IS_BCD_VALID (dptr[8]) -+ || !BRASERO_IS_BCD_VALID (dptr[9]) -+ || !BRASERO_IS_BCD_VALID (dptr[10])) { -+ use_BCD = FALSE; -+ break; -+ } -+ } -+ } -+ -+ /* then check if there are valid Hex values */ -+ dptr = desc; -+ for (i = 0; i < num; i++, dptr += 11) { -+ if ((dptr[i] >> 4) != 1 || dptr[3] > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) -+ continue; -+ -+ if (dptr[8] > 99 -+ || dptr[9] > 59 -+ || dptr[10] > 74) { -+ use_HEX = FALSE; -+ break; -+ } -+ } -+ -+ if (use_BCD != use_HEX) { -+ if (use_BCD) -+ return -1; -+ -+ return 1; -+ } -+ -+ /* To check if the drive uses BCD values or HEX values we ask for the -+ * track information that contains also the start for the track but in -+ * HEX values. If values are the same then it works. */ -+ -+ /* NOTE: there could be another way to do it: get first track, in LBA -+ * and BCD it must be 150. */ -+ -+ /* First find the first track and get track start address in BCD */ -+ BRASERO_BURN_LOG ("Retrieving track information to determine number format"); -+ -+ dptr = desc; -+ for (i = 0; i < num; i++, dptr += 11) { -+ if ((dptr[1] >> 4) == BRASERO_SCSI_Q_SUB_CHANNEL_LEADIN_MODE5 -+ && dptr[3] == BRASERO_SCSI_Q_SUB_CHANNEL_MULTI_NEXT_SESSION) { -+ /* store the leadout number just in case */ -+ leadout = i; -+ continue; -+ } -+ -+ if ((dptr[1] >> 4) != 1 || dptr[3] > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) -+ continue; -+ -+ track_num ++; -+ -+ start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (dptr[8]), -+ BRASERO_GET_BCD (dptr[9]), -+ BRASERO_GET_BCD (dptr[10])); -+ -+ start_LBA = BRASERO_MSF_TO_LBA (dptr[8], dptr[9], dptr[10]); -+ -+ BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for track %i", track_num); -+ -+ size = 36; -+ start_LBA -= 150; -+ start_BCD -= 150; -+ -+ result = brasero_cdrom_read_track_info (cdrom, -+ track_num, -+ track_info, -+ size); -+ -+ if (result != 0) { -+ BRASERO_BURN_LOG ("READ TRACK INFO failed"); -+ /* Fallback to formatted toc */ -+ return 0; -+ } -+ -+ track_start = (track_info[8] << 24 | track_info[9] << 16 | track_info[10] << 8 | track_info[11]); -+ BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i", -+ start_BCD, start_LBA, track_start); -+ -+ /* try to find a conclusive match */ -+ if (track_start == start_BCD && track_start != start_LBA) -+ return -1; -+ -+ if (track_start == start_LBA && track_start != start_BCD) -+ return 1; -+ } -+ -+ /* Our last chance, the leadout. -+ * NOTE: no need to remove 150 sectors here. */ -+ dptr = desc + (leadout * 11); -+ start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (dptr[4]), -+ BRASERO_GET_BCD (dptr[5]), -+ BRASERO_GET_BCD (dptr[6])); -+ -+ start_LBA = BRASERO_MSF_TO_LBA (dptr[4], dptr[5], dptr[6]); -+ -+ BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for leadout"); -+ -+ size = 36; -+ -+ /* leadout number is number of tracks + 1 */ -+ result = brasero_cdrom_read_track_info (cdrom, -+ track_num + 1, -+ track_info, -+ size); -+ -+ if (result != 0) { -+ BRASERO_BURN_LOG ("READ TRACK INFO failed for leadout"); -+ /* Fallback to formatted toc */ -+ return 0; -+ } -+ -+ track_start = (track_info[8] << 24 | track_info[9] << 16 | track_info[10] << 8 | track_info[11]); -+ BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i", -+ start_BCD, start_LBA, track_start); -+ -+ /* try to find a conclusive match */ -+ if (track_start == start_BCD && track_start != start_LBA) -+ return -1; -+ -+ if (track_start == start_LBA && track_start != start_BCD) -+ return 1; -+ -+ /* fallback to formatted toc */ -+ return 0; -+} -+ -+/** -+ * The reason why we use this perhaps more lengthy method is that with -+ * multisession discs, the first track is reported to be two sectors shorter -+ * than it should. As I don't know why and since the following works we use -+ * this one. */ -+static BraseroBurnResult -+brasero_medium_get_CD_sessions_info (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ gint use_bcd; -+ GSList *iter; -+ int num, i, size, res; -+ gint leadout_start = 0; -+ BraseroMediumPrivate *priv; -+ unsigned char *desc; -+ unsigned char *toc = NULL; -+ -+ BRASERO_BURN_LOG ("Reading Raw Toc"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ res = brasero_cdrom_read_toc_raw (cdrom, 0, &toc); -+ if (res != 0) { -+ BRASERO_BURN_LOG ("READ TOC failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ size = (toc[0] << 8 | toc[1]) - 2; -+ num = size / 11; -+ -+ BRASERO_BURN_LOG ("%i track(s) found", num); -+ -+ desc = toc + 4; -+ use_bcd = brasero_medium_check_BCD_use (self, cdrom, desc, num); -+ if (!use_bcd) { -+ g_free (toc); -+ -+ BRASERO_BURN_LOG ("Fallback to formatted toc"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ if (use_bcd > 0) -+ use_bcd = 0; -+ -+ if (use_bcd) { -+ BRASERO_BURN_LOG ("Using BCD format"); -+ } -+ else { -+ BRASERO_BURN_LOG ("Using HEX format"); -+ } -+ -+ for (i = 0; i < num; i++, desc += 11) { -+ BraseroMediumTrack *track; -+ -+ track = NULL; -+ if ((desc[1] >> 4) == 1 && desc[3] <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) { -+ track = g_new0 (BraseroMediumTrack, 1); -+ track->session = desc[0]; -+ -+ brasero_medium_set_track_type (self, track, (desc[1] & 15)); -+ if (use_bcd) -+ track->start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc[8]), -+ BRASERO_GET_BCD (desc[9]), -+ BRASERO_GET_BCD (desc[10])); -+ else -+ track->start = BRASERO_MSF_TO_LBA (desc[8], -+ desc[9], -+ desc[10]); -+ -+ track->start -= 150; -+ -+ /* if there are tracks and the last previously added track is in -+ * the same session then set the size */ -+ if (priv->tracks) { -+ BraseroMediumTrack *last_track; -+ -+ last_track = priv->tracks->data; -+ if (last_track->session == track->session) -+ last_track->blocks_num = track->start - last_track->start; -+ } -+ -+ priv->tracks = g_slist_prepend (priv->tracks, track); -+ } -+ else if (desc[3] == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) { -+ /* NOTE: the leadout session is first in the list. So if -+ * we have tracks in the list set the last session track -+ * size when we reach a new leadout (and therefore a new -+ * session). */ -+ -+ if (priv->tracks) { -+ BraseroMediumTrack *last_track; -+ -+ last_track = priv->tracks->data; -+ last_track->blocks_num = leadout_start - last_track->start; -+ } -+ -+ if (use_bcd) -+ leadout_start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc[8]), -+ BRASERO_GET_BCD (desc[9]), -+ BRASERO_GET_BCD (desc[10])); -+ else -+ leadout_start = BRASERO_MSF_TO_LBA (desc[8], -+ desc[9], -+ desc[10]); -+ leadout_start -= 150; -+ } -+ } -+ -+ if (priv->tracks) { -+ BraseroMediumTrack *last_track; -+ -+ /* set the last found track size */ -+ last_track = priv->tracks->data; -+ last_track->blocks_num = leadout_start - last_track->start; -+ } -+ -+ /* Add a leadout */ -+ if (!(priv->info & BRASERO_MEDIUM_CLOSED)) { -+ BraseroMediumTrack *track; -+ -+ /* we shouldn't request info on leadout if the disc is closed */ -+ track = g_new0 (BraseroMediumTrack, 1); -+ priv->tracks = g_slist_prepend (priv->tracks, track); -+ track->start = leadout_start; -+ track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -+ -+ brasero_medium_track_get_info (self, track, g_slist_length (priv->tracks), cdrom); -+ } -+ -+ priv->tracks = g_slist_reverse (priv->tracks); -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *track; -+ -+ track = iter->data; -+ -+ /* check for tracks less that 300 sectors */ -+ if (track->blocks_num <= 300 && track->type != BRASERO_MEDIUM_TRACK_LEADOUT) { -+ BRASERO_BURN_LOG ("300 sectors size. Checking for real size"); -+ brasero_medium_track_volume_size (self, track, cdrom); -+ } -+ -+ BRASERO_BURN_LOG ("Track %i: type = %i start = %llu size = %llu", -+ g_slist_index (priv->tracks, track), -+ track->type, -+ track->start, -+ track->blocks_num); -+ } -+ -+ g_free (toc); -+ return BRASERO_BURN_OK; -+} -+ -+/** -+ * NOTE: for DVD-R multisession we lose 28688 blocks for each session -+ * so the capacity is the addition of all session sizes + 28688 for each -+ * For all multisession DVD-/+R and CDR-RW the remaining size is given -+ * in the leadout. One exception though with DVD+/-RW. -+ */ -+ -+static void -+brasero_medium_add_DVD_plus_RW_leadout (BraseroMedium *self, -+ gint32 start) -+{ -+ BraseroMediumTrack *leadout; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ leadout = g_new0 (BraseroMediumTrack, 1); -+ priv->tracks = g_slist_append (priv->tracks, leadout); -+ -+ leadout->start = start; -+ leadout->type = BRASERO_MEDIUM_TRACK_LEADOUT; -+ -+ /* we fabricate the leadout here. We don't really need one in -+ * fact since it is always at the last sector whatever the -+ * amount of data written. So we need in fact to read the file -+ * system and get the last sector from it. Hopefully it won't be -+ * buggy */ -+ priv->next_wr_add = 0; -+ -+ leadout->blocks_num = priv->block_num; -+ if (g_slist_length (priv->tracks) > 1) { -+ BraseroMediumTrack *track; -+ -+ track = priv->tracks->data; -+ leadout->blocks_num -= ((track->blocks_num > 300) ? track->blocks_num : 300); -+ } -+ BRASERO_BURN_LOG ("Adding fabricated leadout start = %llu length = %llu", -+ leadout->start, -+ leadout->blocks_num); -+} -+ -+static BraseroBurnResult -+brasero_medium_get_sessions_info (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ int num, i, size, res; -+ gint32 tstart; -+ unsigned char *toc = NULL; -+ unsigned char *desc; -+ BraseroMediumPrivate *priv; -+ -+ BRASERO_BURN_LOG ("Reading Toc"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ res = brasero_cdrom_read_toc_formatted (cdrom, 0, &toc); -+ if (res != 0) { -+ g_free (toc); -+ -+ BRASERO_BURN_LOG ("READ TOC failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ size = (toc[0] << 8 | toc[1]) - 2; -+ -+ num = size / 8; /* Each track description is 8 bytes. */ -+ -+ BRASERO_BURN_LOG ("%i track(s) found", num); -+ -+ for (desc = toc + 4, i = 0; i < num; i ++, desc += 8) { -+ BraseroMediumTrack *track; -+ -+ if (desc[2] == BRASERO_SCSI_TRACK_LEADOUT_START) -+ break; -+ -+ tstart = (desc[4] << 24 | desc[5] << 16 | desc[6] << 8 | desc[7]); -+ -+ track = g_new0 (BraseroMediumTrack, 1); -+ priv->tracks = g_slist_prepend (priv->tracks, track); -+ track->start = tstart; -+ -+ /* we shouldn't request info on a track if the disc is closed */ -+ brasero_medium_track_get_info (self, -+ track, -+ g_slist_length (priv->tracks), -+ cdrom); -+ -+ if ((desc[1] & 15) & BRASERO_SCSI_TRACK_COPY) -+ track->type |= BRASERO_MEDIUM_TRACK_COPY; -+ -+ if (!((desc[1] & 15) & BRASERO_SCSI_TRACK_DATA)) { -+ track->type |= BRASERO_MEDIUM_TRACK_AUDIO; -+ priv->info |= BRASERO_MEDIUM_HAS_AUDIO; -+ -+ if ((desc[1] & 15) & BRASERO_SCSI_TRACK_PREEMP) -+ track->type |= BRASERO_MEDIUM_TRACK_PREEMP; -+ -+ if ((desc[1] & 15) & BRASERO_SCSI_TRACK_4_CHANNELS) -+ track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS; -+ } -+ else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -+ || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) { -+ BraseroBurnResult result; -+ -+ /* a special case for these two kinds of media (DVD+RW) -+ * which have only one track: the first. */ -+ result = brasero_medium_track_volume_size (self, -+ track, -+ cdrom); -+ if (result == BRASERO_BURN_OK) { -+ track->type |= BRASERO_MEDIUM_TRACK_DATA; -+ priv->info |= BRASERO_MEDIUM_HAS_DATA; -+ -+ priv->next_wr_add = 0; -+ -+ if ((desc[1] & 15) & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -+ track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -+ } -+ else { -+ priv->tracks = g_slist_remove (priv->tracks, track); -+ g_free (track); -+ -+ priv->info |= BRASERO_MEDIUM_BLANK; -+ priv->info &= ~BRASERO_MEDIUM_CLOSED; -+ } -+ } -+ else { -+ track->type |= BRASERO_MEDIUM_TRACK_DATA; -+ priv->info |= BRASERO_MEDIUM_HAS_DATA; -+ -+ if ((desc[1] & 15) & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -+ track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -+ } -+ } -+ -+ /* put the tracks in the right order */ -+ priv->tracks = g_slist_reverse (priv->tracks); -+ tstart = (desc[4] << 24 | desc[5] << 16 | desc[6] << 8 | desc[7]); -+ -+ if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -+ || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) -+ brasero_medium_add_DVD_plus_RW_leadout (self, tstart); -+ else if (!(priv->info & BRASERO_MEDIUM_CLOSED)) { -+ BraseroMediumTrack *track; -+ -+ /* we shouldn't request info on leadout if the disc is closed -+ * (except for DVD+/- (restricted) RW (see above) */ -+ track = g_new0 (BraseroMediumTrack, 1); -+ priv->tracks = g_slist_append (priv->tracks, track); -+ track->start = tstart; -+ track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -+ -+ brasero_medium_track_get_info (self, -+ track, -+ g_slist_length (priv->tracks), -+ cdrom); -+ } -+ -+ g_free (toc); -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_contents (BraseroMedium *self, -+ BRASEROCDROM *cdrom) -+{ -+ BraseroBurnResult result; -+ int res; -+ BraseroMediumPrivate *priv; -+ unsigned char buf[32]; -+ -+ BRASERO_BURN_LOG ("Retrieving media status"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ res = brasero_cdrom_read_disc_information_std (cdrom, buf); -+ if (res != 0) { -+ BRASERO_BURN_LOG ("READ DISC INFORMATION failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ if (buf[2] & 16) /* Erasable */ -+ priv->info |= BRASERO_MEDIUM_REWRITABLE; -+ -+ if ((buf[2] & 3) == 0) { /* Empty disc */ -+ BraseroMediumTrack *track; -+ -+ BRASERO_BURN_LOG ("Empty media"); -+ -+ priv->info |= BRASERO_MEDIUM_BLANK; -+ priv->block_size = 2048; -+ -+ if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -+ || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) -+ brasero_medium_add_DVD_plus_RW_leadout (self, 0); -+ else { -+ track = g_new0 (BraseroMediumTrack, 1); -+ track->start = 0; -+ track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -+ priv->tracks = g_slist_prepend (priv->tracks, track); -+ -+ brasero_medium_track_get_info (self, -+ track, -+ 1, -+ cdrom); -+ } -+ goto end; -+ } -+ -+ if (buf[2] & 1) { /* Appendable */ -+ priv->info |= BRASERO_MEDIUM_APPENDABLE; -+ BRASERO_BURN_LOG ("Appendable media"); -+ } -+ else if (buf[2] & 2) { /* Complete */ -+ priv->info |= BRASERO_MEDIUM_CLOSED; -+ BRASERO_BURN_LOG ("Closed media"); -+ } -+ -+ if (priv->info & BRASERO_MEDIUM_CD) { -+ result = brasero_medium_get_CD_sessions_info (self, cdrom); -+ if (result != BRASERO_BURN_OK) -+ result = brasero_medium_get_sessions_info (self, cdrom); -+ } -+ else -+ result = brasero_medium_get_sessions_info (self, cdrom); -+ -+ if (result != BRASERO_BURN_OK) -+ goto end; -+ -+end: -+ -+ return BRASERO_BURN_OK; -+} -+ -+static void -+brasero_medium_init_real (BraseroMedium *object, BRASEROCDROM *cdrom) -+{ -+ gchar *name; -+ BraseroBurnResult result; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ -+ name = nautilus_burn_drive_get_name_for_display (priv->drive); -+ BRASERO_BURN_LOG ("Initializing information for medium in %s", name); -+ g_free (name); -+ -+ result = brasero_medium_get_medium_type (object, cdrom); -+ if (result != BRASERO_BURN_OK) -+ return; -+ -+ brasero_medium_get_capacity_by_type (object, cdrom); -+ -+ result = brasero_medium_get_contents (object, cdrom); -+ if (result != BRASERO_BURN_OK) -+ return; -+ -+ /* assume that css feature is only for DVD-ROM which might be wrong but -+ * some drives wrongly reports that css is enabled for blank DVD+R/W */ -+ if (BRASERO_MEDIUM_IS (priv->info, (BRASERO_MEDIUM_DVD|BRASERO_MEDIUM_ROM))) -+ brasero_medium_get_css_feature (object, cdrom); -+ -+ BRASERO_BURN_LOG_DISC_TYPE (priv->info, "media is "); -+} -+ -+static void -+brasero_medium_try_open (BraseroMedium *self) -+{ -+ const gchar *path; -+ BRASEROCDROM *cdrom; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ path = nautilus_burn_drive_get_device (priv->drive); -+ -+ BRASERO_BURN_LOG ("Trying to create BRASERCDROM for device %s", path); -+ cdrom = brasero_cdrom_new (path); -+ if (cdrom == NULL) { -+ BRASERO_BURN_LOG ("Creation failed"); -+ return; -+ } -+ -+ BRASERO_BURN_LOG ("Creation succeeded"); -+ brasero_medium_init_real (self, cdrom); -+ brasero_cdrom_free (cdrom); -+} -+ -+static void -+brasero_medium_init (BraseroMedium *object) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ priv->next_wr_add = -1; -+ -+ /* we can't do anything here since properties haven't been set yet */ -+} -+ -+static void -+brasero_medium_finalize (GObject *object) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ -+ if (priv->retry_id) { -+ g_source_remove (priv->retry_id); -+ priv->retry_id = 0; -+ } -+ -+ g_free (priv->rd_speeds); -+ priv->rd_speeds = NULL; -+ -+ g_free (priv->wr_speeds); -+ priv->wr_speeds = NULL; -+ -+ g_slist_foreach (priv->tracks, (GFunc) g_free, NULL); -+ g_slist_free (priv->tracks); -+ priv->tracks = NULL; -+ -+ nautilus_burn_drive_unref (priv->drive); -+ priv->drive = NULL; -+ -+ G_OBJECT_CLASS (parent_class)->finalize (object); -+} -+ -+static void -+brasero_medium_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) -+{ -+ BraseroMediumPrivate *priv; -+ -+ g_return_if_fail (BRASERO_IS_MEDIUM (object)); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ -+ switch (prop_id) -+ { -+ case PROP_DRIVE: -+ priv->drive = g_value_get_object (value); -+ nautilus_burn_drive_ref (priv->drive); -+ brasero_medium_try_open (BRASERO_MEDIUM (object)); -+ break; -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -+ break; -+ } -+} -+ -+static void -+brasero_medium_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) -+{ -+ BraseroMediumPrivate *priv; -+ -+ g_return_if_fail (BRASERO_IS_MEDIUM (object)); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ -+ switch (prop_id) -+ { -+ case PROP_DRIVE: -+ nautilus_burn_drive_ref (priv->drive); -+ g_value_set_object (value, priv->drive); -+ break; -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -+ break; -+ } -+} -+ -+static void -+brasero_medium_class_init (BraseroMediumClass *klass) -+{ -+ GObjectClass* object_class = G_OBJECT_CLASS (klass); -+ parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass)); -+ -+ g_type_class_add_private (klass, sizeof (BraseroMediumPrivate)); -+ -+ object_class->finalize = brasero_medium_finalize; -+ object_class->set_property = brasero_medium_set_property; -+ object_class->get_property = brasero_medium_get_property; -+ -+ g_object_class_install_property (object_class, -+ PROP_DRIVE, -+ g_param_spec_object ("drive", -+ "drive", -+ "drive in which medium is inserted", -+ NAUTILUS_BURN_TYPE_DRIVE, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); -+} -+ -+GType -+brasero_medium_get_type (void) -+{ -+ static GType our_type = 0; -+ -+ if (our_type == 0) -+ { -+ static const GTypeInfo our_info = -+ { -+ sizeof (BraseroMediumClass), /* class_size */ -+ (GBaseInitFunc) NULL, /* base_init */ -+ (GBaseFinalizeFunc) NULL, /* base_finalize */ -+ (GClassInitFunc) brasero_medium_class_init, /* class_init */ -+ (GClassFinalizeFunc) NULL, /* class_finalize */ -+ NULL /* class_data */, -+ sizeof (BraseroMedium), /* instance_size */ -+ 0, /* n_preallocs */ -+ (GInstanceInitFunc) brasero_medium_init, /* instance_init */ -+ NULL /* value_table */ -+ }; -+ -+ our_type = g_type_register_static (G_TYPE_OBJECT, "BraseroMedium", -+ &our_info, 0); -+ } -+ -+ return our_type; -+} -+ -+BraseroMedium * -+brasero_medium_new (NautilusBurnDrive *drive) -+{ -+ g_return_val_if_fail (drive != NULL, NULL); -+ return BRASERO_MEDIUM (g_object_new (BRASERO_TYPE_MEDIUM, -+ "drive", drive, -+ NULL)); -+} diff --git a/sysutils/brasero/files/patch-src_burn-medium-scsi.c b/sysutils/brasero/files/patch-src_burn-medium-scsi.c deleted file mode 100644 index 974754cdef2b..000000000000 --- a/sysutils/brasero/files/patch-src_burn-medium-scsi.c +++ /dev/null @@ -1,2073 +0,0 @@ ---- src/burn-medium-scsi.c.orig 2008-02-06 01:53:39.000000000 -0500 -+++ src/burn-medium-scsi.c 2008-02-06 01:54:19.000000000 -0500 -@@ -0,0 +1,2070 @@ -+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -+/* -+ * brasero -+ * Copyright (C) Philippe Rouquier 2007 <bonfire-app@wanadoo.fr> -+ * -+ * brasero is free software. -+ * -+ * You may redistribute it and/or modify it under the terms of the -+ * GNU General Public License, as published by the Free Software -+ * Foundation; either version 2 of the License, or (at your option) -+ * any later version. -+ * -+ * brasero is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ * See the GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with brasero. If not, write to: -+ * The Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor -+ * Boston, MA 02110-1301, USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> -+#include <errno.h> -+ -+#include <glib.h> -+#include <glib/gi18n-lib.h> -+ -+#include <nautilus-burn-drive.h> -+ -+#include "burn-basics.h" -+#include "burn-debug.h" -+#include "burn-medium.h" -+#include "scsi-mmc1.h" -+#include "scsi-mmc2.h" -+#include "scsi-mmc3.h" -+#include "scsi-spc1.h" -+#include "scsi-utils.h" -+#include "scsi-mode-pages.h" -+#include "scsi-status-page.h" -+#include "scsi-q-subchannel.h" -+#include "scsi-dvd-structures.h" -+#include "burn-volume.h" -+#include "brasero-ncb.h" -+ -+const gchar *icons [] = { "gnome-dev-removable", -+ "gnome-dev-cdrom", -+ "gnome-dev-disc-cdr", -+ "gnome-dev-disc-cdrw", -+ "gnome-dev-disc-dvdrom", -+ "gnome-dev-disc-dvdr", -+ "gnome-dev-disc-dvdrw", -+ "gnome-dev-disc-dvdr-plus", -+ "gnome-dev-disc-dvdram", -+ NULL }; -+const gchar *types [] = { N_("file"), -+ N_("CDROM"), -+ N_("CD-R"), -+ N_("CD-RW"), -+ N_("DVDROM"), -+ N_("DVD-R"), -+ N_("DVD-RW"), -+ N_("DVD+R"), -+ N_("DVD+RW"), -+ N_("DVD+R dual layer"), -+ N_("DVD+RW dual layer"), -+ N_("DVD-R dual layer"), -+ N_("DVD-RAM"), -+ N_("Blu-ray disc"), -+ N_("Writable Blu-ray disc"), -+ N_("Rewritable Blu-ray disc"), -+ NULL }; -+ -+ -+typedef struct _BraseroMediumPrivate BraseroMediumPrivate; -+struct _BraseroMediumPrivate -+{ -+ gint retry_id; -+ -+ GSList * tracks; -+ -+ const gchar *type; -+ const gchar *icon; -+ -+ gint max_rd; -+ gint max_wrt; -+ -+ gint *rd_speeds; -+ gint *wr_speeds; -+ -+ gint64 block_num; -+ gint64 block_size; -+ -+ guint64 next_wr_add; -+ BraseroMedia info; -+ NautilusBurnDrive * drive; -+}; -+ -+#define BRASERO_MEDIUM_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_MEDIUM, BraseroMediumPrivate)) -+ -+/** -+ * Try to open the drive exclusively but don't block; if drive can't be opened -+ * exclusively then retry every second until we're shut or the drive state -+ * changes to not busy. -+ * No exclusive at the moment since when the medium is mounted we can't use excl -+ */ -+ -+#define OPEN_FLAGS O_RDONLY /*|O_EXCL */|O_NONBLOCK -+#define BUSY_RETRY_TIME 1000 -+ -+enum -+{ -+ PROP_0, -+ PROP_DRIVE -+}; -+ -+static GObjectClass* parent_class = NULL; -+ -+const gchar * -+brasero_medium_get_type_string (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->type; -+} -+ -+const gchar * -+brasero_medium_get_icon (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->icon; -+} -+ -+BraseroMedia -+brasero_medium_get_status (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->info; -+} -+ -+GSList * -+brasero_medium_get_tracks (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return g_slist_copy (priv->tracks); -+} -+ -+gboolean -+brasero_medium_get_last_data_track_address (BraseroMedium *medium, -+ gint64 *byte, -+ gint64 *sector) -+{ -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track = NULL; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *current; -+ -+ current = iter->data; -+ if (current->type & BRASERO_MEDIUM_TRACK_DATA) -+ track = current; -+ } -+ -+ if (!track) { -+ if (byte) -+ *byte = -1; -+ if (sector) -+ *sector = -1; -+ return FALSE; -+ } -+ -+ if (byte) -+ *byte = track->start * priv->block_size; -+ -+ if (sector) -+ *sector = track->start; -+ -+ return TRUE; -+} -+ -+gboolean -+brasero_medium_get_last_data_track_space (BraseroMedium *medium, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track = NULL; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *current; -+ -+ current = iter->data; -+ if (current->type & BRASERO_MEDIUM_TRACK_DATA) -+ track = current; -+ } -+ -+ if (!track) { -+ if (size) -+ *size = -1; -+ if (blocks) -+ *blocks = -1; -+ return FALSE; -+ } -+ -+ if (size) -+ *size = track->blocks_num * priv->block_size; -+ if (blocks) -+ *blocks = track->blocks_num; -+ -+ return TRUE; -+} -+ -+guint -+brasero_medium_get_track_num (BraseroMedium *medium) -+{ -+ guint retval = 0; -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *current; -+ -+ current = iter->data; -+ if (current->type & BRASERO_MEDIUM_TRACK_LEADOUT) -+ break; -+ -+ retval ++; -+ } -+ -+ return retval; -+} -+ -+static BraseroMediumTrack * -+brasero_medium_get_track (BraseroMedium *medium, -+ guint num) -+{ -+ guint i = 1; -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *current; -+ -+ current = iter->data; -+ if (current->type == BRASERO_MEDIUM_TRACK_LEADOUT) -+ break; -+ -+ if (i == num) -+ return current; -+ -+ i++; -+ } -+ -+ return NULL; -+} -+ -+gboolean -+brasero_medium_get_track_space (BraseroMedium *medium, -+ guint num, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ track = brasero_medium_get_track (medium, num); -+ if (!track) { -+ if (size) -+ *size = -1; -+ if (blocks) -+ *blocks = -1; -+ return FALSE; -+ } -+ -+ if (size) -+ *size = track->blocks_num * priv->block_size; -+ if (blocks) -+ *blocks = track->blocks_num; -+ -+ return TRUE; -+} -+ -+gboolean -+brasero_medium_get_track_address (BraseroMedium *medium, -+ guint num, -+ gint64 *byte, -+ gint64 *sector) -+{ -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ track = brasero_medium_get_track (medium, num); -+ if (!track) { -+ if (byte) -+ *byte = -1; -+ if (sector) -+ *sector = -1; -+ return FALSE; -+ } -+ -+ if (byte) -+ *byte = track->start * priv->block_size; -+ if (sector) -+ *sector = track->start; -+ -+ return TRUE; -+} -+ -+gint64 -+brasero_medium_get_next_writable_address (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->next_wr_add; -+} -+ -+gint64 -+brasero_medium_get_max_write_speed (BraseroMedium *medium) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ return priv->max_wrt * 1024; -+} -+ -+/** -+ * NOTEs about the following functions: -+ * for all closed media (including ROM types) capacity == size of data and -+ * should be the size of all data on the disc, free space is 0 -+ * for all blank -R types capacity == free space and size of data == 0 -+ * for all multisession -R types capacity == free space since having the real -+ * capacity of the media would be useless as we can only use this type of media -+ * to append more data -+ * for all -RW types capacity = free space + size of data. Here they can be -+ * appended (use free space) or rewritten (whole capacity). -+ * -+ * Usually: -+ * the free space is the size of the leadout track -+ * the size of data is the sum of track sizes (excluding leadout) -+ * the capacity depends on the media: -+ * for closed discs == sum of track sizes -+ * for multisession discs == free space (leadout size) -+ * for blank discs == (free space) leadout size -+ * for rewritable/blank == use SCSI functions to get capacity (see below) -+ * -+ * In fact we should really need the size of data in DVD+/-RW cases since the -+ * session is always equal to the size of the disc. -+ */ -+ -+void -+brasero_medium_get_data_size (BraseroMedium *medium, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track = NULL; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ if (!priv->tracks) { -+ /* that's probably because it wasn't possible to retrieve info */ -+ if (size) -+ *size = 0; -+ -+ if (blocks) -+ *blocks = 0; -+ -+ return; -+ } -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *tmp; -+ -+ tmp = iter->data; -+ if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) -+ break; -+ -+ track = iter->data; -+ } -+ -+ if (size) -+ *size = track ? (track->start + track->blocks_num) * priv->block_size: 0; -+ -+ if (blocks) -+ *blocks = track ? track->start + track->blocks_num: 0; -+} -+ -+void -+brasero_medium_get_free_space (BraseroMedium *medium, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ GSList *iter; -+ BraseroMediumPrivate *priv; -+ BraseroMediumTrack *track = NULL; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ if (!priv->tracks) { -+ /* that's probably because it wasn't possible to retrieve info. -+ * maybe it also happens with unformatted DVD+RW */ -+ -+ if (priv->info & BRASERO_MEDIUM_CLOSED) { -+ if (size) -+ *size = 0; -+ -+ if (blocks) -+ *blocks = 0; -+ } -+ else { -+ if (size) -+ *size = priv->block_num * priv->block_size; -+ -+ if (blocks) -+ *blocks = priv->block_num; -+ } -+ -+ return; -+ } -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *tmp; -+ -+ tmp = iter->data; -+ if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) { -+ track = iter->data; -+ break; -+ } -+ } -+ -+ if (size) { -+ if (!track) { -+ /* No leadout was found so the disc is probably closed: -+ * no free space left. */ -+ *size = 0; -+ } -+ else if (track->blocks_num <= 0) -+ *size = (priv->block_num - track->start) * priv->block_size; -+ else -+ *size = track->blocks_num * priv->block_size; -+ } -+ -+ if (blocks) { -+ if (!track) { -+ /* No leadout was found so the disc is probably closed: -+ * no free space left. */ -+ *blocks = 0; -+ } -+ else if (track->blocks_num <= 0) -+ *blocks = priv->block_num - track->blocks_num; -+ else -+ *blocks = track->blocks_num; -+ } -+} -+ -+void -+brasero_medium_get_capacity (BraseroMedium *medium, -+ gint64 *size, -+ gint64 *blocks) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (medium); -+ -+ if (priv->info & BRASERO_MEDIUM_REWRITABLE) { -+ if (size) -+ *size = priv->block_num * priv->block_size; -+ -+ if (blocks) -+ *blocks = priv->block_num; -+ } -+ else if (priv->info & BRASERO_MEDIUM_CLOSED) -+ brasero_medium_get_data_size (medium, size, blocks); -+ else -+ brasero_medium_get_free_space (medium, size, blocks); -+} -+ -+/** -+ * Function to retrieve the capacity of a media -+ */ -+ -+static BraseroBurnResult -+brasero_medium_get_capacity_CD_RW (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ BraseroScsiAtipData *atip_data = NULL; -+ BraseroMediumPrivate *priv; -+ BraseroScsiResult result; -+ int size = 0; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ BRASERO_BURN_LOG ("Retrieving capacity from atip"); -+ -+ result = brasero_mmc1_read_atip (fd, -+ &atip_data, -+ &size, -+ NULL); -+ -+ if (result != BRASERO_SCSI_OK) { -+ BRASERO_BURN_LOG ("READ ATIP failed (scsi error)"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ /* check the size of the structure: it must be at least 16 bytes long */ -+ if (size < 16) { -+ if (size) -+ g_free (atip_data); -+ -+ BRASERO_BURN_LOG ("READ ATIP failed (wrong size)"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ priv->block_num = BRASERO_MSF_TO_LBA (atip_data->desc->leadout_mn, -+ atip_data->desc->leadout_sec, -+ atip_data->desc->leadout_frame); -+ g_free (atip_data); -+ -+ BRASERO_BURN_LOG ("Format capacity %lli %lli", -+ priv->block_num, -+ priv->block_size); -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_capacity_DVD_RW (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ BraseroScsiFormatCapacitiesHdr *hdr = NULL; -+ BraseroScsiMaxCapacityDesc *current; -+ BraseroMediumPrivate *priv; -+ BraseroScsiResult result; -+ gint size; -+ -+ BRASERO_BURN_LOG ("Retrieving format capacity"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ result = brasero_mmc2_read_format_capacities (fd, -+ &hdr, -+ &size, -+ code); -+ if (result != BRASERO_SCSI_OK) { -+ g_free (hdr); -+ -+ BRASERO_BURN_LOG ("READ FORMAT CAPACITIES failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ current = hdr->max_caps; -+ -+ /* see if the media is already formatted */ -+ if (current->type != BRASERO_SCSI_DESC_FORMATTED) { -+ int i, max; -+ BraseroScsiFormattableCapacityDesc *desc; -+ -+ max = (hdr->len - -+ sizeof (BraseroScsiMaxCapacityDesc)) / -+ sizeof (BraseroScsiFormattableCapacityDesc); -+ -+ desc = hdr->desc; -+ for (i = 0; i < max; i ++, desc ++) { -+ /* search for the correct descriptor */ -+ if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)) { -+ if (desc->format_type == BRASERO_SCSI_DVDRW_PLUS) { -+ priv->block_num = BRASERO_GET_32 (desc->blocks_num); -+ priv->block_size = BRASERO_GET_24 (desc->type_param); -+ -+ /* that can happen */ -+ if (!priv->block_size) -+ priv->block_size = 2048; -+ break; -+ } -+ } -+ else if (desc->format_type == BRASERO_SCSI_BLOCK_SIZE_DEFAULT_AND_DB) { -+ priv->block_num = BRASERO_GET_32 (desc->blocks_num); -+ priv->block_size = BRASERO_GET_24 (desc->type_param); -+ break; -+ } -+ } -+ } -+ else { -+ priv->block_num = BRASERO_GET_32 (current->blocks_num); -+ priv->block_size = BRASERO_GET_24 (current->block_size); -+ } -+ -+ BRASERO_BURN_LOG ("Format capacity %lli %lli", -+ priv->block_num, -+ priv->block_size); -+ -+ g_free (hdr); -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_capacity_by_type (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ priv->block_size = 2048; -+ -+ if (!(priv->info & BRASERO_MEDIUM_REWRITABLE)) -+ return BRASERO_BURN_OK; -+ -+ if (priv->info & BRASERO_MEDIUM_CD) -+ brasero_medium_get_capacity_CD_RW (self, fd, code); -+ else -+ brasero_medium_get_capacity_DVD_RW (self, fd, code); -+ -+ return BRASERO_BURN_OK; -+} -+ -+/** -+ * Functions to retrieve the speed -+ */ -+ -+static BraseroBurnResult -+brasero_medium_get_speed_mmc3 (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ int size; -+ int num_desc, i; -+ gint max_rd, max_wrt; -+ BraseroScsiResult result; -+ BraseroMediumPrivate *priv; -+ BraseroScsiWrtSpdDesc *desc; -+ BraseroScsiGetPerfData *wrt_perf = NULL; -+ -+ BRASERO_BURN_LOG ("Retrieving speed (Get Performance)"); -+ -+ /* NOTE: this only work if there is RT streaming feature with -+ * wspd bit set to 1. At least an MMC3 drive. */ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ result = brasero_mmc3_get_performance_wrt_spd_desc (fd, -+ &wrt_perf, -+ &size, -+ code); -+ -+ if (result != BRASERO_SCSI_OK) { -+ g_free (wrt_perf); -+ -+ BRASERO_BURN_LOG ("GET PERFORMANCE failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ num_desc = (size - sizeof (BraseroScsiGetPerfHdr)) / -+ sizeof (BraseroScsiWrtSpdDesc); -+ -+ if (num_desc <= 0) -+ goto end; -+ -+ priv->rd_speeds = g_new0 (gint, num_desc + 1); -+ priv->wr_speeds = g_new0 (gint, num_desc + 1); -+ -+ max_rd = 0; -+ max_wrt = 0; -+ -+ desc = (BraseroScsiWrtSpdDesc*) &wrt_perf->data; -+ for (i = 0; i < num_desc; i ++, desc ++) { -+ priv->rd_speeds [i] = BRASERO_GET_32 (desc->rd_speed); -+ priv->wr_speeds [i] = BRASERO_GET_32 (desc->wr_speed); -+ -+ max_rd = MAX (max_rd, priv->rd_speeds [i]); -+ max_wrt = MAX (max_wrt, priv->wr_speeds [i]); -+ } -+ -+ priv->max_rd = max_rd; -+ priv->max_wrt = max_wrt; -+ -+end: -+ -+ g_free (wrt_perf); -+ -+ /* strangely there are so drives (I know one case) which support this -+ * function but don't report any speed. So if our top speed is 0 then -+ * use the other way to get the speed. It was a Teac */ -+ if (!priv->max_wrt) -+ return BRASERO_BURN_ERR; -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_page_2A_write_speed_desc (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ BraseroScsiStatusPage *page_2A = NULL; -+ BraseroScsiStatusWrSpdDesc *desc; -+ BraseroScsiModeData *data = NULL; -+ BraseroMediumPrivate *priv; -+ BraseroScsiResult result; -+ gint desc_num, i; -+ gint max_wrt = 0; -+ gint max_num; -+ int size = 0; -+ -+ BRASERO_BURN_LOG ("Retrieving speed (2A speeds)"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ result = brasero_spc1_mode_sense_get_page (fd, -+ BRASERO_SPC_PAGE_STATUS, -+ &data, -+ &size, -+ code); -+ if (result != BRASERO_SCSI_OK) { -+ g_free (data); -+ -+ BRASERO_BURN_LOG ("MODE SENSE failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ page_2A = (BraseroScsiStatusPage *) &data->page; -+ -+ /* FIXME: the following is not necessarily true */ -+ if (size < sizeof (BraseroScsiStatusPage)) { -+ g_free (data); -+ -+ BRASERO_BURN_LOG ("wrong size in page"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ desc_num = BRASERO_GET_16 (page_2A->wr_speed_desc_num); -+ max_num = size - -+ sizeof (BraseroScsiStatusPage) - -+ sizeof (BraseroScsiModeHdr); -+ max_num /= sizeof (BraseroScsiWrtSpdDesc); -+ -+ if (max_num < 0) -+ max_num = 0; -+ -+ if (desc_num > max_num) -+ desc_num = max_num; -+ -+ priv->wr_speeds = g_new0 (gint, desc_num + 1); -+ desc = page_2A->wr_spd_desc; -+ for (i = 0; i < desc_num; i ++, desc ++) { -+ priv->wr_speeds [i] = BRASERO_GET_16 (desc->speed); -+ max_wrt = MAX (max_wrt, priv->wr_speeds [i]); -+ } -+ -+ if (!max_wrt) -+ priv->max_wrt = BRASERO_GET_16 (page_2A->wr_max_speed); -+ else -+ priv->max_wrt = max_wrt; -+ -+ priv->max_rd = BRASERO_GET_16 (page_2A->rd_max_speed); -+ g_free (data); -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_page_2A_max_speed (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ BraseroScsiStatusPage *page_2A = NULL; -+ BraseroScsiModeData *data = NULL; -+ BraseroMediumPrivate *priv; -+ BraseroScsiResult result; -+ int size = 0; -+ -+ BRASERO_BURN_LOG ("Retrieving speed (2A max)"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ result = brasero_spc1_mode_sense_get_page (fd, -+ BRASERO_SPC_PAGE_STATUS, -+ &data, -+ &size, -+ code); -+ if (result != BRASERO_SCSI_OK) { -+ g_free (data); -+ -+ BRASERO_BURN_LOG ("MODE SENSE failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ page_2A = (BraseroScsiStatusPage *) &data->page; -+ -+ if (size < 0x14) { -+ g_free (data); -+ -+ BRASERO_BURN_LOG ("wrong page size"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ priv->max_rd = BRASERO_GET_16 (page_2A->rd_max_speed); -+ priv->max_wrt = BRASERO_GET_16 (page_2A->wr_max_speed); -+ -+ g_free (data); -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_medium_type (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ BraseroScsiGetConfigHdr *hdr = NULL; -+ BraseroMediumPrivate *priv; -+ BraseroScsiResult result; -+ int size; -+ -+ BRASERO_BURN_LOG ("Retrieving media profile"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ result = brasero_mmc2_get_configuration_feature (fd, -+ BRASERO_SCSI_FEAT_REAL_TIME_STREAM, -+ &hdr, -+ &size, -+ code); -+ if (result != BRASERO_SCSI_OK) { -+ BraseroScsiAtipData *data = NULL; -+ int size = 0; -+ -+ BRASERO_BURN_LOG ("GET CONFIGURATION failed"); -+ -+ /* This could be a MMC1 drive since this command was -+ * introduced in MMC2 and is supported onward. So it -+ * has to be a CD (R/RW). The rest of the information -+ * will be provided by read_disc_information. */ -+ -+ /* The only thing here left to determine is if that's a WRITABLE -+ * or a REWRITABLE. To determine that information, we need to -+ * read TocPmaAtip. It if fails that's a ROM, if it succeeds. -+ * No need to set error code since we consider that it's a ROM -+ * if a failure happens. */ -+ result = brasero_mmc1_read_atip (fd, -+ &data, -+ &size, -+ NULL); -+ if (result != BRASERO_SCSI_OK) { -+ /* CDROM */ -+ priv->info = BRASERO_MEDIUM_CDROM; -+ priv->type = types [1]; -+ priv->icon = icons [1]; -+ } -+ else { -+ /* check the size of the structure: it must be at least 8 bytes long */ -+ if (size < 8) { -+ if (size) -+ g_free (data); -+ -+ BRASERO_BURN_LOG ("READ ATIP failed (wrong size)"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ if (data->desc->erasable) { -+ /* CDRW */ -+ priv->info = BRASERO_MEDIUM_CDRW; -+ priv->type = types [3]; -+ priv->icon = icons [3]; -+ } -+ else { -+ /* CDR */ -+ priv->info = BRASERO_MEDIUM_CDR; -+ priv->type = types [2]; -+ priv->icon = icons [2]; -+ } -+ -+ g_free (data); -+ } -+ -+ /* retrieve the speed */ -+ result = brasero_medium_get_page_2A_max_speed (self, -+ fd, -+ code); -+ return result; -+ } -+ -+ switch (BRASERO_GET_16 (hdr->current_profile)) { -+ case BRASERO_SCSI_PROF_CDROM: -+ priv->info = BRASERO_MEDIUM_CDROM; -+ priv->type = types [1]; -+ priv->icon = icons [1]; -+ break; -+ -+ case BRASERO_SCSI_PROF_CDR: -+ priv->info = BRASERO_MEDIUM_CDR; -+ priv->type = types [2]; -+ priv->icon = icons [2]; -+ break; -+ -+ case BRASERO_SCSI_PROF_CDRW: -+ priv->info = BRASERO_MEDIUM_CDRW; -+ priv->type = types [3]; -+ priv->icon = icons [3]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_ROM: -+ priv->info = BRASERO_MEDIUM_DVD_ROM; -+ priv->type = types [4]; -+ priv->icon = icons [4]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_R: -+ priv->info = BRASERO_MEDIUM_DVDR; -+ priv->type = types [5]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RW_RESTRICTED: -+ priv->info = BRASERO_MEDIUM_DVDRW_RESTRICTED; -+ priv->type = types [6]; -+ priv->icon = icons [6]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RW_SEQUENTIAL: -+ priv->info = BRASERO_MEDIUM_DVDRW; -+ priv->type = types [6]; -+ priv->icon = icons [6]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_R_PLUS: -+ priv->info = BRASERO_MEDIUM_DVDR_PLUS; -+ priv->type = types [7]; -+ priv->icon = icons [7]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RW_PLUS: -+ priv->info = BRASERO_MEDIUM_DVDRW_PLUS; -+ priv->type = types [8]; -+ priv->icon = icons [7]; -+ break; -+ -+ /* WARNING: these types are recognized, no more */ -+ case BRASERO_SCSI_PROF_DVD_R_PLUS_DL: -+ priv->info = BRASERO_MEDIUM_DVDR_PLUS_DL; -+ priv->type = types [9]; -+ priv->icon = icons [7]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RW_PLUS_DL: -+ priv->info = BRASERO_MEDIUM_DVDRW_PLUS_DL; -+ priv->type = types [10]; -+ priv->icon = icons [7]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_R_DL_SEQUENTIAL: -+ priv->info = BRASERO_MEDIUM_DVDR_DL; -+ priv->type = types [11]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_R_DL_JUMP: -+ priv->info = BRASERO_MEDIUM_DVDR_JUMP_DL; -+ priv->type = types [11]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_DVD_RAM: -+ priv->info = BRASERO_MEDIUM_DVD_RAM; -+ priv->type = types [12]; -+ priv->icon = icons [8]; -+ break; -+ -+ case BRASERO_SCSI_PROF_BD_ROM: -+ priv->info = BRASERO_MEDIUM_BD_ROM; -+ priv->type = types [13]; -+ priv->icon = icons [4]; -+ break; -+ -+ case BRASERO_SCSI_PROF_BR_R_SEQUENTIAL: -+ priv->info = BRASERO_MEDIUM_BDR; -+ priv->type = types [14]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_BR_R_RANDOM: -+ priv->info = BRASERO_MEDIUM_BDR_RANDOM; -+ priv->type = types [14]; -+ priv->icon = icons [5]; -+ break; -+ -+ case BRASERO_SCSI_PROF_BD_RW: -+ priv->info = BRASERO_MEDIUM_BDRW; -+ priv->type = types [15]; -+ priv->icon = icons [6]; -+ break; -+ -+ case BRASERO_SCSI_PROF_NON_REMOVABLE: -+ case BRASERO_SCSI_PROF_REMOVABLE: -+ case BRASERO_SCSI_PROF_MO_ERASABLE: -+ case BRASERO_SCSI_PROF_MO_WRITE_ONCE: -+ case BRASERO_SCSI_PROF_MO_ADVANCED_STORAGE: -+ case BRASERO_SCSI_PROF_DDCD_ROM: -+ case BRASERO_SCSI_PROF_DDCD_R: -+ case BRASERO_SCSI_PROF_DDCD_RW: -+ case BRASERO_SCSI_PROF_HD_DVD_ROM: -+ case BRASERO_SCSI_PROF_HD_DVD_R: -+ case BRASERO_SCSI_PROF_HD_DVD_RAM: -+ priv->info = BRASERO_MEDIUM_UNSUPPORTED; -+ priv->icon = icons [0]; -+ g_free (hdr); -+ return BRASERO_BURN_NOT_SUPPORTED; -+ } -+ -+ /* try all SCSI functions to get write/read speeds in order */ -+ if (hdr->desc->add_len >= sizeof (BraseroScsiRTStreamDesc)) { -+ BraseroScsiRTStreamDesc *stream; -+ -+ /* means it's at least an MMC3 drive */ -+ stream = (BraseroScsiRTStreamDesc *) hdr->desc->data; -+ if (stream->wrt_spd) { -+ result = brasero_medium_get_speed_mmc3 (self, fd, code); -+ if (result == BRASERO_BURN_OK) -+ goto end; -+ } -+ -+ if (stream->mp2a) { -+ result = brasero_medium_get_page_2A_write_speed_desc (self, fd, code); -+ if (result == BRASERO_BURN_OK) -+ goto end; -+ } -+ } -+ -+ /* fallback for speeds */ -+ result = brasero_medium_get_page_2A_max_speed (self, fd, code); -+ -+end: -+ -+ g_free (hdr); -+ -+ if (result != BRASERO_BURN_OK) -+ return result; -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_css_feature (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ BraseroScsiGetConfigHdr *hdr = NULL; -+ BraseroMediumPrivate *priv; -+ BraseroScsiResult result; -+ int size; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ BRASERO_BURN_LOG ("Testing for Css encrypted media"); -+ result = brasero_mmc2_get_configuration_feature (fd, -+ BRASERO_SCSI_FEAT_DVD_CSS, -+ &hdr, -+ &size, -+ code); -+ if (result != BRASERO_SCSI_OK) { -+ g_free (hdr); -+ -+ BRASERO_BURN_LOG ("GET CONFIGURATION failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ if (hdr->desc->add_len < sizeof (BraseroScsiDVDCssDesc)) { -+ g_free (hdr); -+ return BRASERO_BURN_OK; -+ } -+ -+ /* here we just need to see if this feature is current or not */ -+ if (hdr->desc->current) { -+ priv->info |= BRASERO_MEDIUM_PROTECTED; -+ BRASERO_BURN_LOG ("media is Css protected"); -+ } -+ -+ g_free (hdr); -+ return BRASERO_BURN_OK; -+} -+ -+/** -+ * Functions to get information about disc contents -+ */ -+ -+static void -+brasero_medium_set_track_type (BraseroMedium *self, -+ BraseroMediumTrack *track, -+ guchar control) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ if (control & BRASERO_SCSI_TRACK_COPY) -+ track->type |= BRASERO_MEDIUM_TRACK_COPY; -+ -+ if (!(control & BRASERO_SCSI_TRACK_DATA)) { -+ track->type |= BRASERO_MEDIUM_TRACK_AUDIO; -+ priv->info |= BRASERO_MEDIUM_HAS_AUDIO; -+ -+ if (control & BRASERO_SCSI_TRACK_PREEMP) -+ track->type |= BRASERO_MEDIUM_TRACK_PREEMP; -+ -+ if (control & BRASERO_SCSI_TRACK_4_CHANNELS) -+ track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS; -+ } -+ else { -+ track->type |= BRASERO_MEDIUM_TRACK_DATA; -+ priv->info |= BRASERO_MEDIUM_HAS_DATA; -+ -+ if (control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -+ track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -+ } -+} -+ -+static BraseroBurnResult -+brasero_medium_track_volume_size (BraseroMedium *self, -+ BraseroMediumTrack *track, -+ int fd) -+{ -+ BraseroMediumPrivate *priv; -+ BraseroBurnResult res; -+ GError *error = NULL; -+ gint64 nb_blocks; -+ -+ if (!track) -+ return BRASERO_BURN_ERR; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ /* This is a special case. For DVD+RW and DVD-RW in restricted -+ * mode, there is only one session that takes the whole disc size -+ * once formatted. That doesn't necessarily means they have data -+ * Note also that they are reported as complete though you can -+ * still add data (with growisofs). It is nevertheless on the -+ * condition that the fs is valid. -+ * So we check if their first and only volume is valid. -+ * That's also used when the track size is reported a 300 Kio -+ * see below */ -+ res = brasero_volume_get_size_fd (fd, -+ track->start, -+ &nb_blocks, -+ NULL); -+ if (!res) { -+ BRASERO_BURN_LOG ("Failed to retrieve the volume size: %s", -+ error && error->message ? -+ error->message:"unknown error"); -+ -+ if (error) -+ g_error_free (error); -+ return BRASERO_BURN_ERR; -+ } -+ -+ track->blocks_num = nb_blocks; -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_track_get_info (BraseroMedium *self, -+ BraseroMediumTrack *track, -+ int track_num, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ BraseroScsiTrackInfo track_info; -+ BraseroMediumPrivate *priv; -+ BraseroScsiResult result; -+ int size; -+ -+ BRASERO_BURN_LOG ("Retrieving track information for %i", track_num); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ /* at this point we know the type of the disc that's why we set the -+ * size according to this type. That may help to avoid outrange address -+ * errors. */ -+ if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DL|BRASERO_MEDIUM_WRITABLE)) -+ size = 48; -+ else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_PLUS|BRASERO_MEDIUM_WRITABLE)) -+ size = 40; -+ else -+ size = 36; -+ -+ result = brasero_mmc1_read_track_info (fd, -+ track_num, -+ &track_info, -+ &size, -+ code); -+ -+ if (result != BRASERO_SCSI_OK) { -+ BRASERO_BURN_LOG ("READ TRACK INFO failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ track->blocks_num = BRASERO_GET_32 (track_info.track_size); -+ track->session = BRASERO_SCSI_SESSION_NUM (track_info); -+ -+ /* Now here is a potential bug: we can write tracks (data or not) -+ * shorter than 300 Kio /2 sec but they will be padded to reach this -+ * floor value. That means that is blocks_num is 300 blocks that may -+ * mean that the data length on the track is actually shorter. -+ * So we read the volume descriptor. If it works, good otherwise -+ * use the old value. -+ * That's important for checksuming to have a perfect account of the -+ * data size. */ -+ if (track->blocks_num <= 300) { -+ BRASERO_BURN_LOG ("300 sectors size. Checking for real size"); -+ brasero_medium_track_volume_size (self, track, fd); -+ } -+ -+ if (track_info.next_wrt_address_valid) -+ priv->next_wr_add = BRASERO_GET_32 (track_info.next_wrt_address); -+ -+ BRASERO_BURN_LOG ("Track %i (session %i): type = %i start = %llu size = %llu", -+ track_num, -+ track->session, -+ track->type, -+ track->start, -+ track->blocks_num); -+ -+ return BRASERO_BURN_OK; -+} -+ -+/** -+ * return : -+ * 0 when it's not possible to determine (fallback to formatted toc) -+ * -1 for BCD -+ * 1 for HEX */ -+static guint -+brasero_medium_check_BCD_use (BraseroMedium *self, -+ int fd, -+ BraseroScsiRawTocDesc *desc, -+ guint num, -+ BraseroScsiErrCode *code) -+{ -+ guint i; -+ int size; -+ guint leadout = 0; -+ guint track_num = 0; -+ gboolean use_BCD = TRUE; -+ gboolean use_HEX = TRUE; -+ BraseroScsiResult result; -+ BraseroScsiTrackInfo track_info; -+ guint start_BCD, start_LBA, track_start; -+ -+ /* first check if all values are valid BCD numbers in the descriptors */ -+ for (i = 0; i < num; i++) { -+ if (desc [i].adr == 1 && desc [i].point <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) { -+ if (!BRASERO_IS_BCD_VALID (desc [i].p_min) -+ || !BRASERO_IS_BCD_VALID (desc [i].p_sec) -+ || !BRASERO_IS_BCD_VALID (desc [i].p_frame)) { -+ use_BCD = FALSE; -+ break; -+ } -+ } -+ else if (desc [i].point == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) { -+ if (!BRASERO_IS_BCD_VALID (desc [i].p_min) -+ || !BRASERO_IS_BCD_VALID (desc [i].p_sec) -+ || !BRASERO_IS_BCD_VALID (desc [i].p_frame)) { -+ use_BCD = FALSE; -+ break; -+ } -+ } -+ } -+ -+ /* then check if there are valid Hex values */ -+ for (i = 0; i < num; i++) { -+ if (desc [i].adr != 1 || desc [i].point > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) -+ continue; -+ -+ if (desc [i].p_min > 99 -+ || desc [i].p_sec > 59 -+ || desc [i].p_frame > 74) { -+ use_HEX = FALSE; -+ break; -+ } -+ } -+ -+ if (use_BCD != use_HEX) { -+ if (use_BCD) -+ return -1; -+ -+ return 1; -+ } -+ -+ /* To check if the drive uses BCD values or HEX values we ask for the -+ * track information that contains also the start for the track but in -+ * HEX values. If values are the same then it works. */ -+ -+ /* NOTE: there could be another way to do it: get first track, in LBA -+ * and BCD it must be 150. */ -+ -+ /* First find the first track and get track start address in BCD */ -+ BRASERO_BURN_LOG ("Retrieving track information to determine number format"); -+ -+ for (i = 0; i < num; i++) { -+ if (desc [i].adr == BRASERO_SCSI_Q_SUB_CHANNEL_LEADIN_MODE5 -+ && desc [i].point == BRASERO_SCSI_Q_SUB_CHANNEL_MULTI_NEXT_SESSION) { -+ /* store the leadout number just in case */ -+ leadout = i; -+ continue; -+ } -+ -+ if (desc [i].adr != 1 || desc [i].point > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) -+ continue; -+ -+ track_num ++; -+ -+ start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc [i].p_min), -+ BRASERO_GET_BCD (desc [i].p_sec), -+ BRASERO_GET_BCD (desc [i].p_frame)); -+ -+ start_LBA = BRASERO_MSF_TO_LBA (desc [i].p_min, -+ desc [i].p_sec, -+ desc [i].p_frame); -+ -+ BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for track %i", track_num); -+ -+ size = 36; -+ start_LBA -= 150; -+ start_BCD -= 150; -+ -+ result = brasero_mmc1_read_track_info (fd, -+ track_num, -+ &track_info, -+ &size, -+ code); -+ -+ if (result != BRASERO_SCSI_OK) { -+ BRASERO_BURN_LOG ("READ TRACK INFO failed"); -+ /* Fallback to formatted toc */ -+ return 0; -+ } -+ -+ track_start = BRASERO_GET_32 (track_info.start_lba); -+ BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i", -+ start_BCD, start_LBA, track_start); -+ -+ /* try to find a conclusive match */ -+ if (track_start == start_BCD && track_start != start_LBA) -+ return -1; -+ -+ if (track_start == start_LBA && track_start != start_BCD) -+ return 1; -+ } -+ -+ /* Our last chance, the leadout. -+ * NOTE: no need to remove 150 sectors here. */ -+ start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc [leadout].min), -+ BRASERO_GET_BCD (desc [leadout].sec), -+ BRASERO_GET_BCD (desc [leadout].frame)); -+ -+ start_LBA = BRASERO_MSF_TO_LBA (desc [leadout].min, -+ desc [leadout].sec, -+ desc [leadout].frame); -+ -+ BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for leadout"); -+ -+ size = 36; -+ -+ /* leadout number is number of tracks + 1 */ -+ result = brasero_mmc1_read_track_info (fd, -+ track_num + 1, -+ &track_info, -+ &size, -+ code); -+ -+ if (result != BRASERO_SCSI_OK) { -+ BRASERO_BURN_LOG ("READ TRACK INFO failed for leadout"); -+ /* Fallback to formatted toc */ -+ return 0; -+ } -+ -+ track_start = BRASERO_GET_32 (track_info.start_lba); -+ BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i", -+ start_BCD, start_LBA, track_start); -+ -+ /* try to find a conclusive match */ -+ if (track_start == start_BCD && track_start != start_LBA) -+ return -1; -+ -+ if (track_start == start_LBA && track_start != start_BCD) -+ return 1; -+ -+ /* fallback to formatted toc */ -+ return 0; -+} -+ -+/** -+ * The reason why we use this perhaps more lengthy method is that with -+ * multisession discs, the first track is reported to be two sectors shorter -+ * than it should. As I don't know why and since the following works we use -+ * this one. */ -+static BraseroBurnResult -+brasero_medium_get_CD_sessions_info (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ gint use_bcd; -+ GSList *iter; -+ int num, i, size; -+ gint leadout_start = 0; -+ BraseroScsiResult result; -+ BraseroMediumPrivate *priv; -+ BraseroScsiRawTocDesc *desc; -+ BraseroScsiRawTocData *toc = NULL; -+ -+ BRASERO_BURN_LOG ("Reading Raw Toc"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ size = 0; -+ result = brasero_mmc1_read_toc_raw (fd, -+ 0, -+ &toc, -+ &size, -+ code); -+ if (result != BRASERO_SCSI_OK) { -+ BRASERO_BURN_LOG ("READ TOC failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ num = (size - sizeof (BraseroScsiRawTocData)) / -+ sizeof (BraseroScsiRawTocDesc); -+ -+ BRASERO_BURN_LOG ("%i track(s) found", num); -+ -+ desc = toc->desc; -+ use_bcd = brasero_medium_check_BCD_use (self, fd, desc, num, code); -+ if (!use_bcd) { -+ g_free (toc); -+ -+ BRASERO_BURN_LOG ("Fallback to formatted toc"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ if (use_bcd > 0) -+ use_bcd = 0; -+ -+ if (use_bcd) { -+ BRASERO_BURN_LOG ("Using BCD format"); -+ } -+ else { -+ BRASERO_BURN_LOG ("Using HEX format"); -+ } -+ -+ for (i = 0; i < num; i++, desc ++) { -+ BraseroMediumTrack *track; -+ -+ track = NULL; -+ if (desc->adr == 1 && desc->point <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) { -+ track = g_new0 (BraseroMediumTrack, 1); -+ track->session = desc->session_num; -+ -+ brasero_medium_set_track_type (self, track, desc->control); -+ if (use_bcd) -+ track->start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc->p_min), -+ BRASERO_GET_BCD (desc->p_sec), -+ BRASERO_GET_BCD (desc->p_frame)); -+ else -+ track->start = BRASERO_MSF_TO_LBA (desc->p_min, -+ desc->p_sec, -+ desc->p_frame); -+ -+ track->start -= 150; -+ -+ /* if there are tracks and the last previously added track is in -+ * the same session then set the size */ -+ if (priv->tracks) { -+ BraseroMediumTrack *last_track; -+ -+ last_track = priv->tracks->data; -+ if (last_track->session == track->session) -+ last_track->blocks_num = track->start - last_track->start; -+ } -+ -+ priv->tracks = g_slist_prepend (priv->tracks, track); -+ } -+ else if (desc->point == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) { -+ /* NOTE: the leadout session is first in the list. So if -+ * we have tracks in the list set the last session track -+ * size when we reach a new leadout (and therefore a new -+ * session). */ -+ -+ if (priv->tracks) { -+ BraseroMediumTrack *last_track; -+ -+ last_track = priv->tracks->data; -+ last_track->blocks_num = leadout_start - last_track->start; -+ } -+ -+ if (use_bcd) -+ leadout_start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc->p_min), -+ BRASERO_GET_BCD (desc->p_sec), -+ BRASERO_GET_BCD (desc->p_frame)); -+ else -+ leadout_start = BRASERO_MSF_TO_LBA (desc->p_min, -+ desc->p_sec, -+ desc->p_frame); -+ leadout_start -= 150; -+ } -+ } -+ -+ if (priv->tracks) { -+ BraseroMediumTrack *last_track; -+ -+ /* set the last found track size */ -+ last_track = priv->tracks->data; -+ last_track->blocks_num = leadout_start - last_track->start; -+ } -+ -+ /* Add a leadout */ -+ if (!(priv->info & BRASERO_MEDIUM_CLOSED)) { -+ BraseroMediumTrack *track; -+ -+ /* we shouldn't request info on leadout if the disc is closed */ -+ track = g_new0 (BraseroMediumTrack, 1); -+ priv->tracks = g_slist_prepend (priv->tracks, track); -+ track->start = leadout_start; -+ track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -+ -+ brasero_medium_track_get_info (self, track, g_slist_length (priv->tracks), fd, code); -+ } -+ -+ priv->tracks = g_slist_reverse (priv->tracks); -+ -+ for (iter = priv->tracks; iter; iter = iter->next) { -+ BraseroMediumTrack *track; -+ -+ track = iter->data; -+ -+ /* check for tracks less that 300 sectors */ -+ if (track->blocks_num <= 300 && track->type != BRASERO_MEDIUM_TRACK_LEADOUT) { -+ BRASERO_BURN_LOG ("300 sectors size. Checking for real size"); -+ brasero_medium_track_volume_size (self, track, fd); -+ } -+ -+ BRASERO_BURN_LOG ("Track %i: type = %i start = %llu size = %llu", -+ g_slist_index (priv->tracks, track), -+ track->type, -+ track->start, -+ track->blocks_num); -+ } -+ -+ g_free (toc); -+ return BRASERO_BURN_OK; -+} -+ -+/** -+ * NOTE: for DVD-R multisession we lose 28688 blocks for each session -+ * so the capacity is the addition of all session sizes + 28688 for each -+ * For all multisession DVD-/+R and CDR-RW the remaining size is given -+ * in the leadout. One exception though with DVD+/-RW. -+ */ -+ -+static void -+brasero_medium_add_DVD_plus_RW_leadout (BraseroMedium *self, -+ gint32 start) -+{ -+ BraseroMediumTrack *leadout; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ leadout = g_new0 (BraseroMediumTrack, 1); -+ priv->tracks = g_slist_append (priv->tracks, leadout); -+ -+ leadout->start = start; -+ leadout->type = BRASERO_MEDIUM_TRACK_LEADOUT; -+ -+ /* we fabricate the leadout here. We don't really need one in -+ * fact since it is always at the last sector whatever the -+ * amount of data written. So we need in fact to read the file -+ * system and get the last sector from it. Hopefully it won't be -+ * buggy */ -+ priv->next_wr_add = 0; -+ -+ leadout->blocks_num = priv->block_num; -+ if (g_slist_length (priv->tracks) > 1) { -+ BraseroMediumTrack *track; -+ -+ track = priv->tracks->data; -+ leadout->blocks_num -= ((track->blocks_num > 300) ? track->blocks_num : 300); -+ } -+ BRASERO_BURN_LOG ("Adding fabricated leadout start = %llu length = %llu", -+ leadout->start, -+ leadout->blocks_num); -+} -+ -+static BraseroBurnResult -+brasero_medium_get_sessions_info (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ int num, i, size; -+ BraseroScsiResult result; -+ BraseroScsiTocDesc *desc; -+ BraseroMediumPrivate *priv; -+ BraseroScsiFormattedTocData *toc = NULL; -+ -+ BRASERO_BURN_LOG ("Reading Toc"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ result = brasero_mmc1_read_toc_formatted (fd, -+ 0, -+ &toc, -+ &size, -+ code); -+ if (result != BRASERO_SCSI_OK) { -+ g_free (toc); -+ -+ BRASERO_BURN_LOG ("READ TOC failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ num = (size - sizeof (BraseroScsiFormattedTocData)) / -+ sizeof (BraseroScsiTocDesc); -+ -+ BRASERO_BURN_LOG ("%i track(s) found", num); -+ -+ desc = toc->desc; -+ for (i = 0; i < num; i ++, desc ++) { -+ BraseroMediumTrack *track; -+ -+ if (desc->track_num == BRASERO_SCSI_TRACK_LEADOUT_START) -+ break; -+ -+ track = g_new0 (BraseroMediumTrack, 1); -+ priv->tracks = g_slist_prepend (priv->tracks, track); -+ track->start = BRASERO_GET_32 (desc->track_start); -+ -+ /* we shouldn't request info on a track if the disc is closed */ -+ brasero_medium_track_get_info (self, -+ track, -+ g_slist_length (priv->tracks), -+ fd, -+ code); -+ -+ if (desc->control & BRASERO_SCSI_TRACK_COPY) -+ track->type |= BRASERO_MEDIUM_TRACK_COPY; -+ -+ if (!(desc->control & BRASERO_SCSI_TRACK_DATA)) { -+ track->type |= BRASERO_MEDIUM_TRACK_AUDIO; -+ priv->info |= BRASERO_MEDIUM_HAS_AUDIO; -+ -+ if (desc->control & BRASERO_SCSI_TRACK_PREEMP) -+ track->type |= BRASERO_MEDIUM_TRACK_PREEMP; -+ -+ if (desc->control & BRASERO_SCSI_TRACK_4_CHANNELS) -+ track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS; -+ } -+ else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -+ || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) { -+ BraseroBurnResult result; -+ -+ /* a special case for these two kinds of media (DVD+RW) -+ * which have only one track: the first. */ -+ result = brasero_medium_track_volume_size (self, -+ track, -+ fd); -+ if (result == BRASERO_BURN_OK) { -+ track->type |= BRASERO_MEDIUM_TRACK_DATA; -+ priv->info |= BRASERO_MEDIUM_HAS_DATA; -+ -+ priv->next_wr_add = 0; -+ -+ if (desc->control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -+ track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -+ } -+ else { -+ priv->tracks = g_slist_remove (priv->tracks, track); -+ g_free (track); -+ -+ priv->info |= BRASERO_MEDIUM_BLANK; -+ priv->info &= ~BRASERO_MEDIUM_CLOSED; -+ } -+ } -+ else { -+ track->type |= BRASERO_MEDIUM_TRACK_DATA; -+ priv->info |= BRASERO_MEDIUM_HAS_DATA; -+ -+ if (desc->control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -+ track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -+ } -+ } -+ -+ /* put the tracks in the right order */ -+ priv->tracks = g_slist_reverse (priv->tracks); -+ -+ if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -+ || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) -+ brasero_medium_add_DVD_plus_RW_leadout (self, BRASERO_GET_32 (desc->track_start)); -+ else if (!(priv->info & BRASERO_MEDIUM_CLOSED)) { -+ BraseroMediumTrack *track; -+ -+ /* we shouldn't request info on leadout if the disc is closed -+ * (except for DVD+/- (restricted) RW (see above) */ -+ track = g_new0 (BraseroMediumTrack, 1); -+ priv->tracks = g_slist_append (priv->tracks, track); -+ track->start = BRASERO_GET_32 (desc->track_start); -+ track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -+ -+ brasero_medium_track_get_info (self, -+ track, -+ g_slist_length (priv->tracks), -+ fd, -+ code); -+ } -+ -+ g_free (toc); -+ -+ return BRASERO_BURN_OK; -+} -+ -+static BraseroBurnResult -+brasero_medium_get_contents (BraseroMedium *self, -+ int fd, -+ BraseroScsiErrCode *code) -+{ -+ int size; -+ BraseroScsiResult result; -+ BraseroMediumPrivate *priv; -+ BraseroScsiDiscInfoStd *info = NULL; -+ -+ BRASERO_BURN_LOG ("Retrieving media status"); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ -+ result = brasero_mmc1_read_disc_information_std (fd, -+ &info, -+ &size, -+ code); -+ if (result != BRASERO_SCSI_OK) { -+ g_free (info); -+ -+ BRASERO_BURN_LOG ("READ DISC INFORMATION failed"); -+ return BRASERO_BURN_ERR; -+ } -+ -+ if (info->erasable) -+ priv->info |= BRASERO_MEDIUM_REWRITABLE; -+ -+ if (info->status == BRASERO_SCSI_DISC_EMPTY) { -+ BraseroMediumTrack *track; -+ -+ BRASERO_BURN_LOG ("Empty media"); -+ -+ priv->info |= BRASERO_MEDIUM_BLANK; -+ priv->block_size = 2048; -+ -+ if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -+ || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) -+ brasero_medium_add_DVD_plus_RW_leadout (self, 0); -+ else { -+ track = g_new0 (BraseroMediumTrack, 1); -+ track->start = 0; -+ track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -+ priv->tracks = g_slist_prepend (priv->tracks, track); -+ -+ brasero_medium_track_get_info (self, -+ track, -+ 1, -+ fd, -+ code); -+ } -+ goto end; -+ } -+ -+ if (info->status == BRASERO_SCSI_DISC_INCOMPLETE) { -+ priv->info |= BRASERO_MEDIUM_APPENDABLE; -+ BRASERO_BURN_LOG ("Appendable media"); -+ } -+ else if (info->status == BRASERO_SCSI_DISC_FINALIZED) { -+ priv->info |= BRASERO_MEDIUM_CLOSED; -+ BRASERO_BURN_LOG ("Closed media"); -+ } -+ -+ if (priv->info & BRASERO_MEDIUM_CD) { -+ result = brasero_medium_get_CD_sessions_info (self, fd, code); -+ if (result != BRASERO_BURN_OK) -+ result = brasero_medium_get_sessions_info (self, fd, code); -+ } -+ else -+ result = brasero_medium_get_sessions_info (self, fd, code); -+ -+ if (result != BRASERO_BURN_OK) -+ goto end; -+ -+end: -+ -+ g_free (info); -+ return BRASERO_BURN_OK; -+} -+ -+static void -+brasero_medium_init_real (BraseroMedium *object, int fd) -+{ -+ gchar *name; -+ BraseroBurnResult result; -+ BraseroMediumPrivate *priv; -+ BraseroScsiErrCode code = 0; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ -+ name = nautilus_burn_drive_get_name_for_display (priv->drive); -+ BRASERO_BURN_LOG ("Initializing information for medium in %s", name); -+ g_free (name); -+ -+ result = brasero_medium_get_medium_type (object, fd, &code); -+ if (result != BRASERO_BURN_OK) -+ return; -+ -+ brasero_medium_get_capacity_by_type (object, fd, &code); -+ -+ result = brasero_medium_get_contents (object, fd, &code); -+ if (result != BRASERO_BURN_OK) -+ return; -+ -+ /* assume that css feature is only for DVD-ROM which might be wrong but -+ * some drives wrongly reports that css is enabled for blank DVD+R/W */ -+ if (BRASERO_MEDIUM_IS (priv->info, (BRASERO_MEDIUM_DVD|BRASERO_MEDIUM_ROM))) -+ brasero_medium_get_css_feature (object, fd, &code); -+ -+ BRASERO_BURN_LOG_DISC_TYPE (priv->info, "media is "); -+} -+ -+static gboolean -+brasero_medium_retry_open (gpointer object) -+{ -+ int fd; -+ const gchar *path; -+ BraseroMedium *self; -+ BraseroMediumPrivate *priv; -+ -+ self = BRASERO_MEDIUM (object); -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ path = nautilus_burn_drive_get_device (priv->drive); -+ -+ BRASERO_BURN_LOG ("Retrying to open device %s", path); -+ fd = open (path, OPEN_FLAGS); -+ if (fd < 0) { -+ if (errno == EBUSY -+ || errno == EAGAIN -+ || errno == EWOULDBLOCK) { -+ BRASERO_BURN_LOG ("Device busy"); -+ /* we'll retry in a second */ -+ return TRUE; -+ } -+ -+ BRASERO_BURN_LOG ("Open () failed"); -+ priv->info = BRASERO_MEDIUM_UNSUPPORTED; -+ priv->retry_id = 0; -+ return FALSE; -+ } -+ -+ BRASERO_BURN_LOG ("Open () succeeded\n"); -+ priv->info = BRASERO_MEDIUM_NONE; -+ priv->icon = icons [0]; -+ -+ priv->retry_id = 0; -+ -+ brasero_medium_init_real (self, fd); -+ close (fd); -+ -+ return FALSE; -+} -+ -+static void -+brasero_medium_try_open (BraseroMedium *self) -+{ -+ int fd; -+ const gchar *path; -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (self); -+ path = nautilus_burn_drive_get_device (priv->drive); -+ -+ /* the drive might be busy (a burning is going on) so we don't block -+ * but we re-try to open it every second */ -+ BRASERO_BURN_LOG ("Trying to open device %s", path); -+ fd = open (path, OPEN_FLAGS); -+ if (fd < 0) { -+ if (errno == EAGAIN -+ || errno == EWOULDBLOCK -+ || errno == EBUSY) { -+ BRASERO_BURN_LOG ("Device busy"); -+ priv->info = BRASERO_MEDIUM_BUSY; -+ priv->icon = icons [0]; -+ -+ priv->retry_id = g_timeout_add (BUSY_RETRY_TIME, -+ brasero_medium_retry_open, -+ self); -+ } -+ -+ BRASERO_BURN_LOG ("Open () failed"); -+ return; -+ } -+ -+ BRASERO_BURN_LOG ("Open () succeeded"); -+ brasero_medium_init_real (self, fd); -+ close (fd); -+} -+ -+static void -+brasero_medium_init (BraseroMedium *object) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ priv->next_wr_add = -1; -+ -+ /* we can't do anything here since properties haven't been set yet */ -+} -+ -+static void -+brasero_medium_finalize (GObject *object) -+{ -+ BraseroMediumPrivate *priv; -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ -+ if (priv->retry_id) { -+ g_source_remove (priv->retry_id); -+ priv->retry_id = 0; -+ } -+ -+ g_free (priv->rd_speeds); -+ priv->rd_speeds = NULL; -+ -+ g_free (priv->wr_speeds); -+ priv->wr_speeds = NULL; -+ -+ g_slist_foreach (priv->tracks, (GFunc) g_free, NULL); -+ g_slist_free (priv->tracks); -+ priv->tracks = NULL; -+ -+ nautilus_burn_drive_unref (priv->drive); -+ priv->drive = NULL; -+ -+ G_OBJECT_CLASS (parent_class)->finalize (object); -+} -+ -+static void -+brasero_medium_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) -+{ -+ BraseroMediumPrivate *priv; -+ -+ g_return_if_fail (BRASERO_IS_MEDIUM (object)); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ -+ switch (prop_id) -+ { -+ case PROP_DRIVE: -+ priv->drive = g_value_get_object (value); -+ nautilus_burn_drive_ref (priv->drive); -+ brasero_medium_try_open (BRASERO_MEDIUM (object)); -+ break; -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -+ break; -+ } -+} -+ -+static void -+brasero_medium_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) -+{ -+ BraseroMediumPrivate *priv; -+ -+ g_return_if_fail (BRASERO_IS_MEDIUM (object)); -+ -+ priv = BRASERO_MEDIUM_PRIVATE (object); -+ -+ switch (prop_id) -+ { -+ case PROP_DRIVE: -+ nautilus_burn_drive_ref (priv->drive); -+ g_value_set_object (value, priv->drive); -+ break; -+ default: -+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -+ break; -+ } -+} -+ -+static void -+brasero_medium_class_init (BraseroMediumClass *klass) -+{ -+ GObjectClass* object_class = G_OBJECT_CLASS (klass); -+ parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass)); -+ -+ g_type_class_add_private (klass, sizeof (BraseroMediumPrivate)); -+ -+ object_class->finalize = brasero_medium_finalize; -+ object_class->set_property = brasero_medium_set_property; -+ object_class->get_property = brasero_medium_get_property; -+ -+ g_object_class_install_property (object_class, -+ PROP_DRIVE, -+ g_param_spec_object ("drive", -+ "drive", -+ "drive in which medium is inserted", -+ NAUTILUS_BURN_TYPE_DRIVE, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); -+} -+ -+GType -+brasero_medium_get_type (void) -+{ -+ static GType our_type = 0; -+ -+ if (our_type == 0) -+ { -+ static const GTypeInfo our_info = -+ { -+ sizeof (BraseroMediumClass), /* class_size */ -+ (GBaseInitFunc) NULL, /* base_init */ -+ (GBaseFinalizeFunc) NULL, /* base_finalize */ -+ (GClassInitFunc) brasero_medium_class_init, /* class_init */ -+ (GClassFinalizeFunc) NULL, /* class_finalize */ -+ NULL /* class_data */, -+ sizeof (BraseroMedium), /* instance_size */ -+ 0, /* n_preallocs */ -+ (GInstanceInitFunc) brasero_medium_init, /* instance_init */ -+ NULL /* value_table */ -+ }; -+ -+ our_type = g_type_register_static (G_TYPE_OBJECT, "BraseroMedium", -+ &our_info, 0); -+ } -+ -+ return our_type; -+} -+ -+BraseroMedium * -+brasero_medium_new (NautilusBurnDrive *drive) -+{ -+ g_return_val_if_fail (drive != NULL, NULL); -+ return BRASERO_MEDIUM (g_object_new (BRASERO_TYPE_MEDIUM, -+ "drive", drive, -+ NULL)); -+} diff --git a/sysutils/brasero/files/patch-src_burn-medium.c b/sysutils/brasero/files/patch-src_burn-medium.c deleted file mode 100644 index accb659e2516..000000000000 --- a/sysutils/brasero/files/patch-src_burn-medium.c +++ /dev/null @@ -1,2073 +0,0 @@ ---- src/burn-medium.c.orig 2008-01-27 10:25:14.000000000 -0500 -+++ src/burn-medium.c 2008-02-06 01:55:21.000000000 -0500 -@@ -1,2070 +0,0 @@ --/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ --/* -- * brasero -- * Copyright (C) Philippe Rouquier 2007 <bonfire-app@wanadoo.fr> -- * -- * brasero is free software. -- * -- * You may redistribute it and/or modify it under the terms of the -- * GNU General Public License, as published by the Free Software -- * Foundation; either version 2 of the License, or (at your option) -- * any later version. -- * -- * brasero is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -- * See the GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with brasero. If not, write to: -- * The Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor -- * Boston, MA 02110-1301, USA. -- */ -- --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- --#include <sys/types.h> --#include <sys/stat.h> --#include <fcntl.h> --#include <errno.h> -- --#include <glib.h> --#include <glib/gi18n-lib.h> -- --#include <nautilus-burn-drive.h> -- --#include "burn-basics.h" --#include "burn-debug.h" --#include "burn-medium.h" --#include "scsi-mmc1.h" --#include "scsi-mmc2.h" --#include "scsi-mmc3.h" --#include "scsi-spc1.h" --#include "scsi-utils.h" --#include "scsi-mode-pages.h" --#include "scsi-status-page.h" --#include "scsi-q-subchannel.h" --#include "scsi-dvd-structures.h" --#include "burn-volume.h" --#include "brasero-ncb.h" -- --const gchar *icons [] = { "gnome-dev-removable", -- "gnome-dev-cdrom", -- "gnome-dev-disc-cdr", -- "gnome-dev-disc-cdrw", -- "gnome-dev-disc-dvdrom", -- "gnome-dev-disc-dvdr", -- "gnome-dev-disc-dvdrw", -- "gnome-dev-disc-dvdr-plus", -- "gnome-dev-disc-dvdram", -- NULL }; --const gchar *types [] = { N_("file"), -- N_("CDROM"), -- N_("CD-R"), -- N_("CD-RW"), -- N_("DVDROM"), -- N_("DVD-R"), -- N_("DVD-RW"), -- N_("DVD+R"), -- N_("DVD+RW"), -- N_("DVD+R dual layer"), -- N_("DVD+RW dual layer"), -- N_("DVD-R dual layer"), -- N_("DVD-RAM"), -- N_("Blu-ray disc"), -- N_("Writable Blu-ray disc"), -- N_("Rewritable Blu-ray disc"), -- NULL }; -- -- --typedef struct _BraseroMediumPrivate BraseroMediumPrivate; --struct _BraseroMediumPrivate --{ -- gint retry_id; -- -- GSList * tracks; -- -- const gchar *type; -- const gchar *icon; -- -- gint max_rd; -- gint max_wrt; -- -- gint *rd_speeds; -- gint *wr_speeds; -- -- gint64 block_num; -- gint64 block_size; -- -- guint64 next_wr_add; -- BraseroMedia info; -- NautilusBurnDrive * drive; --}; -- --#define BRASERO_MEDIUM_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_MEDIUM, BraseroMediumPrivate)) -- --/** -- * Try to open the drive exclusively but don't block; if drive can't be opened -- * exclusively then retry every second until we're shut or the drive state -- * changes to not busy. -- * No exclusive at the moment since when the medium is mounted we can't use excl -- */ -- --#define OPEN_FLAGS O_RDONLY /*|O_EXCL */|O_NONBLOCK --#define BUSY_RETRY_TIME 1000 -- --enum --{ -- PROP_0, -- PROP_DRIVE --}; -- --static GObjectClass* parent_class = NULL; -- --const gchar * --brasero_medium_get_type_string (BraseroMedium *medium) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- return priv->type; --} -- --const gchar * --brasero_medium_get_icon (BraseroMedium *medium) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- return priv->icon; --} -- --BraseroMedia --brasero_medium_get_status (BraseroMedium *medium) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- return priv->info; --} -- --GSList * --brasero_medium_get_tracks (BraseroMedium *medium) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- return g_slist_copy (priv->tracks); --} -- --gboolean --brasero_medium_get_last_data_track_address (BraseroMedium *medium, -- gint64 *byte, -- gint64 *sector) --{ -- GSList *iter; -- BraseroMediumPrivate *priv; -- BraseroMediumTrack *track = NULL; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- -- for (iter = priv->tracks; iter; iter = iter->next) { -- BraseroMediumTrack *current; -- -- current = iter->data; -- if (current->type & BRASERO_MEDIUM_TRACK_DATA) -- track = current; -- } -- -- if (!track) { -- if (byte) -- *byte = -1; -- if (sector) -- *sector = -1; -- return FALSE; -- } -- -- if (byte) -- *byte = track->start * priv->block_size; -- -- if (sector) -- *sector = track->start; -- -- return TRUE; --} -- --gboolean --brasero_medium_get_last_data_track_space (BraseroMedium *medium, -- gint64 *size, -- gint64 *blocks) --{ -- GSList *iter; -- BraseroMediumPrivate *priv; -- BraseroMediumTrack *track = NULL; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- -- for (iter = priv->tracks; iter; iter = iter->next) { -- BraseroMediumTrack *current; -- -- current = iter->data; -- if (current->type & BRASERO_MEDIUM_TRACK_DATA) -- track = current; -- } -- -- if (!track) { -- if (size) -- *size = -1; -- if (blocks) -- *blocks = -1; -- return FALSE; -- } -- -- if (size) -- *size = track->blocks_num * priv->block_size; -- if (blocks) -- *blocks = track->blocks_num; -- -- return TRUE; --} -- --guint --brasero_medium_get_track_num (BraseroMedium *medium) --{ -- guint retval = 0; -- GSList *iter; -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- for (iter = priv->tracks; iter; iter = iter->next) { -- BraseroMediumTrack *current; -- -- current = iter->data; -- if (current->type & BRASERO_MEDIUM_TRACK_LEADOUT) -- break; -- -- retval ++; -- } -- -- return retval; --} -- --static BraseroMediumTrack * --brasero_medium_get_track (BraseroMedium *medium, -- guint num) --{ -- guint i = 1; -- GSList *iter; -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- -- for (iter = priv->tracks; iter; iter = iter->next) { -- BraseroMediumTrack *current; -- -- current = iter->data; -- if (current->type == BRASERO_MEDIUM_TRACK_LEADOUT) -- break; -- -- if (i == num) -- return current; -- -- i++; -- } -- -- return NULL; --} -- --gboolean --brasero_medium_get_track_space (BraseroMedium *medium, -- guint num, -- gint64 *size, -- gint64 *blocks) --{ -- BraseroMediumPrivate *priv; -- BraseroMediumTrack *track; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- -- track = brasero_medium_get_track (medium, num); -- if (!track) { -- if (size) -- *size = -1; -- if (blocks) -- *blocks = -1; -- return FALSE; -- } -- -- if (size) -- *size = track->blocks_num * priv->block_size; -- if (blocks) -- *blocks = track->blocks_num; -- -- return TRUE; --} -- --gboolean --brasero_medium_get_track_address (BraseroMedium *medium, -- guint num, -- gint64 *byte, -- gint64 *sector) --{ -- BraseroMediumPrivate *priv; -- BraseroMediumTrack *track; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- -- track = brasero_medium_get_track (medium, num); -- if (!track) { -- if (byte) -- *byte = -1; -- if (sector) -- *sector = -1; -- return FALSE; -- } -- -- if (byte) -- *byte = track->start * priv->block_size; -- if (sector) -- *sector = track->start; -- -- return TRUE; --} -- --gint64 --brasero_medium_get_next_writable_address (BraseroMedium *medium) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- return priv->next_wr_add; --} -- --gint64 --brasero_medium_get_max_write_speed (BraseroMedium *medium) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- return priv->max_wrt * 1024; --} -- --/** -- * NOTEs about the following functions: -- * for all closed media (including ROM types) capacity == size of data and -- * should be the size of all data on the disc, free space is 0 -- * for all blank -R types capacity == free space and size of data == 0 -- * for all multisession -R types capacity == free space since having the real -- * capacity of the media would be useless as we can only use this type of media -- * to append more data -- * for all -RW types capacity = free space + size of data. Here they can be -- * appended (use free space) or rewritten (whole capacity). -- * -- * Usually: -- * the free space is the size of the leadout track -- * the size of data is the sum of track sizes (excluding leadout) -- * the capacity depends on the media: -- * for closed discs == sum of track sizes -- * for multisession discs == free space (leadout size) -- * for blank discs == (free space) leadout size -- * for rewritable/blank == use SCSI functions to get capacity (see below) -- * -- * In fact we should really need the size of data in DVD+/-RW cases since the -- * session is always equal to the size of the disc. -- */ -- --void --brasero_medium_get_data_size (BraseroMedium *medium, -- gint64 *size, -- gint64 *blocks) --{ -- GSList *iter; -- BraseroMediumPrivate *priv; -- BraseroMediumTrack *track = NULL; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- -- if (!priv->tracks) { -- /* that's probably because it wasn't possible to retrieve info */ -- if (size) -- *size = 0; -- -- if (blocks) -- *blocks = 0; -- -- return; -- } -- -- for (iter = priv->tracks; iter; iter = iter->next) { -- BraseroMediumTrack *tmp; -- -- tmp = iter->data; -- if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) -- break; -- -- track = iter->data; -- } -- -- if (size) -- *size = track ? (track->start + track->blocks_num) * priv->block_size: 0; -- -- if (blocks) -- *blocks = track ? track->start + track->blocks_num: 0; --} -- --void --brasero_medium_get_free_space (BraseroMedium *medium, -- gint64 *size, -- gint64 *blocks) --{ -- GSList *iter; -- BraseroMediumPrivate *priv; -- BraseroMediumTrack *track = NULL; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- -- if (!priv->tracks) { -- /* that's probably because it wasn't possible to retrieve info. -- * maybe it also happens with unformatted DVD+RW */ -- -- if (priv->info & BRASERO_MEDIUM_CLOSED) { -- if (size) -- *size = 0; -- -- if (blocks) -- *blocks = 0; -- } -- else { -- if (size) -- *size = priv->block_num * priv->block_size; -- -- if (blocks) -- *blocks = priv->block_num; -- } -- -- return; -- } -- -- for (iter = priv->tracks; iter; iter = iter->next) { -- BraseroMediumTrack *tmp; -- -- tmp = iter->data; -- if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) { -- track = iter->data; -- break; -- } -- } -- -- if (size) { -- if (!track) { -- /* No leadout was found so the disc is probably closed: -- * no free space left. */ -- *size = 0; -- } -- else if (track->blocks_num <= 0) -- *size = (priv->block_num - track->start) * priv->block_size; -- else -- *size = track->blocks_num * priv->block_size; -- } -- -- if (blocks) { -- if (!track) { -- /* No leadout was found so the disc is probably closed: -- * no free space left. */ -- *blocks = 0; -- } -- else if (track->blocks_num <= 0) -- *blocks = priv->block_num - track->blocks_num; -- else -- *blocks = track->blocks_num; -- } --} -- --void --brasero_medium_get_capacity (BraseroMedium *medium, -- gint64 *size, -- gint64 *blocks) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (medium); -- -- if (priv->info & BRASERO_MEDIUM_REWRITABLE) { -- if (size) -- *size = priv->block_num * priv->block_size; -- -- if (blocks) -- *blocks = priv->block_num; -- } -- else if (priv->info & BRASERO_MEDIUM_CLOSED) -- brasero_medium_get_data_size (medium, size, blocks); -- else -- brasero_medium_get_free_space (medium, size, blocks); --} -- --/** -- * Function to retrieve the capacity of a media -- */ -- --static BraseroBurnResult --brasero_medium_get_capacity_CD_RW (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- BraseroScsiAtipData *atip_data = NULL; -- BraseroMediumPrivate *priv; -- BraseroScsiResult result; -- int size = 0; -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- BRASERO_BURN_LOG ("Retrieving capacity from atip"); -- -- result = brasero_mmc1_read_atip (fd, -- &atip_data, -- &size, -- NULL); -- -- if (result != BRASERO_SCSI_OK) { -- BRASERO_BURN_LOG ("READ ATIP failed (scsi error)"); -- return BRASERO_BURN_ERR; -- } -- -- /* check the size of the structure: it must be at least 16 bytes long */ -- if (size < 16) { -- if (size) -- g_free (atip_data); -- -- BRASERO_BURN_LOG ("READ ATIP failed (wrong size)"); -- return BRASERO_BURN_ERR; -- } -- -- priv->block_num = BRASERO_MSF_TO_LBA (atip_data->desc->leadout_mn, -- atip_data->desc->leadout_sec, -- atip_data->desc->leadout_frame); -- g_free (atip_data); -- -- BRASERO_BURN_LOG ("Format capacity %lli %lli", -- priv->block_num, -- priv->block_size); -- -- return BRASERO_BURN_OK; --} -- --static BraseroBurnResult --brasero_medium_get_capacity_DVD_RW (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- BraseroScsiFormatCapacitiesHdr *hdr = NULL; -- BraseroScsiMaxCapacityDesc *current; -- BraseroMediumPrivate *priv; -- BraseroScsiResult result; -- gint size; -- -- BRASERO_BURN_LOG ("Retrieving format capacity"); -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- result = brasero_mmc2_read_format_capacities (fd, -- &hdr, -- &size, -- code); -- if (result != BRASERO_SCSI_OK) { -- g_free (hdr); -- -- BRASERO_BURN_LOG ("READ FORMAT CAPACITIES failed"); -- return BRASERO_BURN_ERR; -- } -- -- current = hdr->max_caps; -- -- /* see if the media is already formatted */ -- if (current->type != BRASERO_SCSI_DESC_FORMATTED) { -- int i, max; -- BraseroScsiFormattableCapacityDesc *desc; -- -- max = (hdr->len - -- sizeof (BraseroScsiMaxCapacityDesc)) / -- sizeof (BraseroScsiFormattableCapacityDesc); -- -- desc = hdr->desc; -- for (i = 0; i < max; i ++, desc ++) { -- /* search for the correct descriptor */ -- if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)) { -- if (desc->format_type == BRASERO_SCSI_DVDRW_PLUS) { -- priv->block_num = BRASERO_GET_32 (desc->blocks_num); -- priv->block_size = BRASERO_GET_24 (desc->type_param); -- -- /* that can happen */ -- if (!priv->block_size) -- priv->block_size = 2048; -- break; -- } -- } -- else if (desc->format_type == BRASERO_SCSI_BLOCK_SIZE_DEFAULT_AND_DB) { -- priv->block_num = BRASERO_GET_32 (desc->blocks_num); -- priv->block_size = BRASERO_GET_24 (desc->type_param); -- break; -- } -- } -- } -- else { -- priv->block_num = BRASERO_GET_32 (current->blocks_num); -- priv->block_size = BRASERO_GET_24 (current->block_size); -- } -- -- BRASERO_BURN_LOG ("Format capacity %lli %lli", -- priv->block_num, -- priv->block_size); -- -- g_free (hdr); -- return BRASERO_BURN_OK; --} -- --static BraseroBurnResult --brasero_medium_get_capacity_by_type (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- priv->block_size = 2048; -- -- if (!(priv->info & BRASERO_MEDIUM_REWRITABLE)) -- return BRASERO_BURN_OK; -- -- if (priv->info & BRASERO_MEDIUM_CD) -- brasero_medium_get_capacity_CD_RW (self, fd, code); -- else -- brasero_medium_get_capacity_DVD_RW (self, fd, code); -- -- return BRASERO_BURN_OK; --} -- --/** -- * Functions to retrieve the speed -- */ -- --static BraseroBurnResult --brasero_medium_get_speed_mmc3 (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- int size; -- int num_desc, i; -- gint max_rd, max_wrt; -- BraseroScsiResult result; -- BraseroMediumPrivate *priv; -- BraseroScsiWrtSpdDesc *desc; -- BraseroScsiGetPerfData *wrt_perf = NULL; -- -- BRASERO_BURN_LOG ("Retrieving speed (Get Performance)"); -- -- /* NOTE: this only work if there is RT streaming feature with -- * wspd bit set to 1. At least an MMC3 drive. */ -- priv = BRASERO_MEDIUM_PRIVATE (self); -- result = brasero_mmc3_get_performance_wrt_spd_desc (fd, -- &wrt_perf, -- &size, -- code); -- -- if (result != BRASERO_SCSI_OK) { -- g_free (wrt_perf); -- -- BRASERO_BURN_LOG ("GET PERFORMANCE failed"); -- return BRASERO_BURN_ERR; -- } -- -- num_desc = (size - sizeof (BraseroScsiGetPerfHdr)) / -- sizeof (BraseroScsiWrtSpdDesc); -- -- if (num_desc <= 0) -- goto end; -- -- priv->rd_speeds = g_new0 (gint, num_desc + 1); -- priv->wr_speeds = g_new0 (gint, num_desc + 1); -- -- max_rd = 0; -- max_wrt = 0; -- -- desc = (BraseroScsiWrtSpdDesc*) &wrt_perf->data; -- for (i = 0; i < num_desc; i ++, desc ++) { -- priv->rd_speeds [i] = BRASERO_GET_32 (desc->rd_speed); -- priv->wr_speeds [i] = BRASERO_GET_32 (desc->wr_speed); -- -- max_rd = MAX (max_rd, priv->rd_speeds [i]); -- max_wrt = MAX (max_wrt, priv->wr_speeds [i]); -- } -- -- priv->max_rd = max_rd; -- priv->max_wrt = max_wrt; -- --end: -- -- g_free (wrt_perf); -- -- /* strangely there are so drives (I know one case) which support this -- * function but don't report any speed. So if our top speed is 0 then -- * use the other way to get the speed. It was a Teac */ -- if (!priv->max_wrt) -- return BRASERO_BURN_ERR; -- -- return BRASERO_BURN_OK; --} -- --static BraseroBurnResult --brasero_medium_get_page_2A_write_speed_desc (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- BraseroScsiStatusPage *page_2A = NULL; -- BraseroScsiStatusWrSpdDesc *desc; -- BraseroScsiModeData *data = NULL; -- BraseroMediumPrivate *priv; -- BraseroScsiResult result; -- gint desc_num, i; -- gint max_wrt = 0; -- gint max_num; -- int size = 0; -- -- BRASERO_BURN_LOG ("Retrieving speed (2A speeds)"); -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- result = brasero_spc1_mode_sense_get_page (fd, -- BRASERO_SPC_PAGE_STATUS, -- &data, -- &size, -- code); -- if (result != BRASERO_SCSI_OK) { -- g_free (data); -- -- BRASERO_BURN_LOG ("MODE SENSE failed"); -- return BRASERO_BURN_ERR; -- } -- -- page_2A = (BraseroScsiStatusPage *) &data->page; -- -- /* FIXME: the following is not necessarily true */ -- if (size < sizeof (BraseroScsiStatusPage)) { -- g_free (data); -- -- BRASERO_BURN_LOG ("wrong size in page"); -- return BRASERO_BURN_ERR; -- } -- -- desc_num = BRASERO_GET_16 (page_2A->wr_speed_desc_num); -- max_num = size - -- sizeof (BraseroScsiStatusPage) - -- sizeof (BraseroScsiModeHdr); -- max_num /= sizeof (BraseroScsiWrtSpdDesc); -- -- if (max_num < 0) -- max_num = 0; -- -- if (desc_num > max_num) -- desc_num = max_num; -- -- priv->wr_speeds = g_new0 (gint, desc_num + 1); -- desc = page_2A->wr_spd_desc; -- for (i = 0; i < desc_num; i ++, desc ++) { -- priv->wr_speeds [i] = BRASERO_GET_16 (desc->speed); -- max_wrt = MAX (max_wrt, priv->wr_speeds [i]); -- } -- -- if (!max_wrt) -- priv->max_wrt = BRASERO_GET_16 (page_2A->wr_max_speed); -- else -- priv->max_wrt = max_wrt; -- -- priv->max_rd = BRASERO_GET_16 (page_2A->rd_max_speed); -- g_free (data); -- -- return BRASERO_BURN_OK; --} -- --static BraseroBurnResult --brasero_medium_get_page_2A_max_speed (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- BraseroScsiStatusPage *page_2A = NULL; -- BraseroScsiModeData *data = NULL; -- BraseroMediumPrivate *priv; -- BraseroScsiResult result; -- int size = 0; -- -- BRASERO_BURN_LOG ("Retrieving speed (2A max)"); -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- result = brasero_spc1_mode_sense_get_page (fd, -- BRASERO_SPC_PAGE_STATUS, -- &data, -- &size, -- code); -- if (result != BRASERO_SCSI_OK) { -- g_free (data); -- -- BRASERO_BURN_LOG ("MODE SENSE failed"); -- return BRASERO_BURN_ERR; -- } -- -- page_2A = (BraseroScsiStatusPage *) &data->page; -- -- if (size < 0x14) { -- g_free (data); -- -- BRASERO_BURN_LOG ("wrong page size"); -- return BRASERO_BURN_ERR; -- } -- -- priv->max_rd = BRASERO_GET_16 (page_2A->rd_max_speed); -- priv->max_wrt = BRASERO_GET_16 (page_2A->wr_max_speed); -- -- g_free (data); -- return BRASERO_BURN_OK; --} -- --static BraseroBurnResult --brasero_medium_get_medium_type (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- BraseroScsiGetConfigHdr *hdr = NULL; -- BraseroMediumPrivate *priv; -- BraseroScsiResult result; -- int size; -- -- BRASERO_BURN_LOG ("Retrieving media profile"); -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- result = brasero_mmc2_get_configuration_feature (fd, -- BRASERO_SCSI_FEAT_REAL_TIME_STREAM, -- &hdr, -- &size, -- code); -- if (result != BRASERO_SCSI_OK) { -- BraseroScsiAtipData *data = NULL; -- int size = 0; -- -- BRASERO_BURN_LOG ("GET CONFIGURATION failed"); -- -- /* This could be a MMC1 drive since this command was -- * introduced in MMC2 and is supported onward. So it -- * has to be a CD (R/RW). The rest of the information -- * will be provided by read_disc_information. */ -- -- /* The only thing here left to determine is if that's a WRITABLE -- * or a REWRITABLE. To determine that information, we need to -- * read TocPmaAtip. It if fails that's a ROM, if it succeeds. -- * No need to set error code since we consider that it's a ROM -- * if a failure happens. */ -- result = brasero_mmc1_read_atip (fd, -- &data, -- &size, -- NULL); -- if (result != BRASERO_SCSI_OK) { -- /* CDROM */ -- priv->info = BRASERO_MEDIUM_CDROM; -- priv->type = types [1]; -- priv->icon = icons [1]; -- } -- else { -- /* check the size of the structure: it must be at least 8 bytes long */ -- if (size < 8) { -- if (size) -- g_free (data); -- -- BRASERO_BURN_LOG ("READ ATIP failed (wrong size)"); -- return BRASERO_BURN_ERR; -- } -- -- if (data->desc->erasable) { -- /* CDRW */ -- priv->info = BRASERO_MEDIUM_CDRW; -- priv->type = types [3]; -- priv->icon = icons [3]; -- } -- else { -- /* CDR */ -- priv->info = BRASERO_MEDIUM_CDR; -- priv->type = types [2]; -- priv->icon = icons [2]; -- } -- -- g_free (data); -- } -- -- /* retrieve the speed */ -- result = brasero_medium_get_page_2A_max_speed (self, -- fd, -- code); -- return result; -- } -- -- switch (BRASERO_GET_16 (hdr->current_profile)) { -- case BRASERO_SCSI_PROF_CDROM: -- priv->info = BRASERO_MEDIUM_CDROM; -- priv->type = types [1]; -- priv->icon = icons [1]; -- break; -- -- case BRASERO_SCSI_PROF_CDR: -- priv->info = BRASERO_MEDIUM_CDR; -- priv->type = types [2]; -- priv->icon = icons [2]; -- break; -- -- case BRASERO_SCSI_PROF_CDRW: -- priv->info = BRASERO_MEDIUM_CDRW; -- priv->type = types [3]; -- priv->icon = icons [3]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_ROM: -- priv->info = BRASERO_MEDIUM_DVD_ROM; -- priv->type = types [4]; -- priv->icon = icons [4]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_R: -- priv->info = BRASERO_MEDIUM_DVDR; -- priv->type = types [5]; -- priv->icon = icons [5]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_RW_RESTRICTED: -- priv->info = BRASERO_MEDIUM_DVDRW_RESTRICTED; -- priv->type = types [6]; -- priv->icon = icons [6]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_RW_SEQUENTIAL: -- priv->info = BRASERO_MEDIUM_DVDRW; -- priv->type = types [6]; -- priv->icon = icons [6]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_R_PLUS: -- priv->info = BRASERO_MEDIUM_DVDR_PLUS; -- priv->type = types [7]; -- priv->icon = icons [7]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_RW_PLUS: -- priv->info = BRASERO_MEDIUM_DVDRW_PLUS; -- priv->type = types [8]; -- priv->icon = icons [7]; -- break; -- -- /* WARNING: these types are recognized, no more */ -- case BRASERO_SCSI_PROF_DVD_R_PLUS_DL: -- priv->info = BRASERO_MEDIUM_DVDR_PLUS_DL; -- priv->type = types [9]; -- priv->icon = icons [7]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_RW_PLUS_DL: -- priv->info = BRASERO_MEDIUM_DVDRW_PLUS_DL; -- priv->type = types [10]; -- priv->icon = icons [7]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_R_DL_SEQUENTIAL: -- priv->info = BRASERO_MEDIUM_DVDR_DL; -- priv->type = types [11]; -- priv->icon = icons [5]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_R_DL_JUMP: -- priv->info = BRASERO_MEDIUM_DVDR_JUMP_DL; -- priv->type = types [11]; -- priv->icon = icons [5]; -- break; -- -- case BRASERO_SCSI_PROF_DVD_RAM: -- priv->info = BRASERO_MEDIUM_DVD_RAM; -- priv->type = types [12]; -- priv->icon = icons [8]; -- break; -- -- case BRASERO_SCSI_PROF_BD_ROM: -- priv->info = BRASERO_MEDIUM_BD_ROM; -- priv->type = types [13]; -- priv->icon = icons [4]; -- break; -- -- case BRASERO_SCSI_PROF_BR_R_SEQUENTIAL: -- priv->info = BRASERO_MEDIUM_BDR; -- priv->type = types [14]; -- priv->icon = icons [5]; -- break; -- -- case BRASERO_SCSI_PROF_BR_R_RANDOM: -- priv->info = BRASERO_MEDIUM_BDR_RANDOM; -- priv->type = types [14]; -- priv->icon = icons [5]; -- break; -- -- case BRASERO_SCSI_PROF_BD_RW: -- priv->info = BRASERO_MEDIUM_BDRW; -- priv->type = types [15]; -- priv->icon = icons [6]; -- break; -- -- case BRASERO_SCSI_PROF_NON_REMOVABLE: -- case BRASERO_SCSI_PROF_REMOVABLE: -- case BRASERO_SCSI_PROF_MO_ERASABLE: -- case BRASERO_SCSI_PROF_MO_WRITE_ONCE: -- case BRASERO_SCSI_PROF_MO_ADVANCED_STORAGE: -- case BRASERO_SCSI_PROF_DDCD_ROM: -- case BRASERO_SCSI_PROF_DDCD_R: -- case BRASERO_SCSI_PROF_DDCD_RW: -- case BRASERO_SCSI_PROF_HD_DVD_ROM: -- case BRASERO_SCSI_PROF_HD_DVD_R: -- case BRASERO_SCSI_PROF_HD_DVD_RAM: -- priv->info = BRASERO_MEDIUM_UNSUPPORTED; -- priv->icon = icons [0]; -- g_free (hdr); -- return BRASERO_BURN_NOT_SUPPORTED; -- } -- -- /* try all SCSI functions to get write/read speeds in order */ -- if (hdr->desc->add_len >= sizeof (BraseroScsiRTStreamDesc)) { -- BraseroScsiRTStreamDesc *stream; -- -- /* means it's at least an MMC3 drive */ -- stream = (BraseroScsiRTStreamDesc *) hdr->desc->data; -- if (stream->wrt_spd) { -- result = brasero_medium_get_speed_mmc3 (self, fd, code); -- if (result == BRASERO_BURN_OK) -- goto end; -- } -- -- if (stream->mp2a) { -- result = brasero_medium_get_page_2A_write_speed_desc (self, fd, code); -- if (result == BRASERO_BURN_OK) -- goto end; -- } -- } -- -- /* fallback for speeds */ -- result = brasero_medium_get_page_2A_max_speed (self, fd, code); -- --end: -- -- g_free (hdr); -- -- if (result != BRASERO_BURN_OK) -- return result; -- -- return BRASERO_BURN_OK; --} -- --static BraseroBurnResult --brasero_medium_get_css_feature (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- BraseroScsiGetConfigHdr *hdr = NULL; -- BraseroMediumPrivate *priv; -- BraseroScsiResult result; -- int size; -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- BRASERO_BURN_LOG ("Testing for Css encrypted media"); -- result = brasero_mmc2_get_configuration_feature (fd, -- BRASERO_SCSI_FEAT_DVD_CSS, -- &hdr, -- &size, -- code); -- if (result != BRASERO_SCSI_OK) { -- g_free (hdr); -- -- BRASERO_BURN_LOG ("GET CONFIGURATION failed"); -- return BRASERO_BURN_ERR; -- } -- -- if (hdr->desc->add_len < sizeof (BraseroScsiDVDCssDesc)) { -- g_free (hdr); -- return BRASERO_BURN_OK; -- } -- -- /* here we just need to see if this feature is current or not */ -- if (hdr->desc->current) { -- priv->info |= BRASERO_MEDIUM_PROTECTED; -- BRASERO_BURN_LOG ("media is Css protected"); -- } -- -- g_free (hdr); -- return BRASERO_BURN_OK; --} -- --/** -- * Functions to get information about disc contents -- */ -- --static void --brasero_medium_set_track_type (BraseroMedium *self, -- BraseroMediumTrack *track, -- guchar control) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- if (control & BRASERO_SCSI_TRACK_COPY) -- track->type |= BRASERO_MEDIUM_TRACK_COPY; -- -- if (!(control & BRASERO_SCSI_TRACK_DATA)) { -- track->type |= BRASERO_MEDIUM_TRACK_AUDIO; -- priv->info |= BRASERO_MEDIUM_HAS_AUDIO; -- -- if (control & BRASERO_SCSI_TRACK_PREEMP) -- track->type |= BRASERO_MEDIUM_TRACK_PREEMP; -- -- if (control & BRASERO_SCSI_TRACK_4_CHANNELS) -- track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS; -- } -- else { -- track->type |= BRASERO_MEDIUM_TRACK_DATA; -- priv->info |= BRASERO_MEDIUM_HAS_DATA; -- -- if (control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -- track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -- } --} -- --static BraseroBurnResult --brasero_medium_track_volume_size (BraseroMedium *self, -- BraseroMediumTrack *track, -- int fd) --{ -- BraseroMediumPrivate *priv; -- BraseroBurnResult res; -- GError *error = NULL; -- gint64 nb_blocks; -- -- if (!track) -- return BRASERO_BURN_ERR; -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- /* This is a special case. For DVD+RW and DVD-RW in restricted -- * mode, there is only one session that takes the whole disc size -- * once formatted. That doesn't necessarily means they have data -- * Note also that they are reported as complete though you can -- * still add data (with growisofs). It is nevertheless on the -- * condition that the fs is valid. -- * So we check if their first and only volume is valid. -- * That's also used when the track size is reported a 300 Kio -- * see below */ -- res = brasero_volume_get_size_fd (fd, -- track->start, -- &nb_blocks, -- NULL); -- if (!res) { -- BRASERO_BURN_LOG ("Failed to retrieve the volume size: %s", -- error && error->message ? -- error->message:"unknown error"); -- -- if (error) -- g_error_free (error); -- return BRASERO_BURN_ERR; -- } -- -- track->blocks_num = nb_blocks; -- return BRASERO_BURN_OK; --} -- --static BraseroBurnResult --brasero_medium_track_get_info (BraseroMedium *self, -- BraseroMediumTrack *track, -- int track_num, -- int fd, -- BraseroScsiErrCode *code) --{ -- BraseroScsiTrackInfo track_info; -- BraseroMediumPrivate *priv; -- BraseroScsiResult result; -- int size; -- -- BRASERO_BURN_LOG ("Retrieving track information for %i", track_num); -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- /* at this point we know the type of the disc that's why we set the -- * size according to this type. That may help to avoid outrange address -- * errors. */ -- if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DL|BRASERO_MEDIUM_WRITABLE)) -- size = 48; -- else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_PLUS|BRASERO_MEDIUM_WRITABLE)) -- size = 40; -- else -- size = 36; -- -- result = brasero_mmc1_read_track_info (fd, -- track_num, -- &track_info, -- &size, -- code); -- -- if (result != BRASERO_SCSI_OK) { -- BRASERO_BURN_LOG ("READ TRACK INFO failed"); -- return BRASERO_BURN_ERR; -- } -- -- track->blocks_num = BRASERO_GET_32 (track_info.track_size); -- track->session = BRASERO_SCSI_SESSION_NUM (track_info); -- -- /* Now here is a potential bug: we can write tracks (data or not) -- * shorter than 300 Kio /2 sec but they will be padded to reach this -- * floor value. That means that is blocks_num is 300 blocks that may -- * mean that the data length on the track is actually shorter. -- * So we read the volume descriptor. If it works, good otherwise -- * use the old value. -- * That's important for checksuming to have a perfect account of the -- * data size. */ -- if (track->blocks_num <= 300) { -- BRASERO_BURN_LOG ("300 sectors size. Checking for real size"); -- brasero_medium_track_volume_size (self, track, fd); -- } -- -- if (track_info.next_wrt_address_valid) -- priv->next_wr_add = BRASERO_GET_32 (track_info.next_wrt_address); -- -- BRASERO_BURN_LOG ("Track %i (session %i): type = %i start = %llu size = %llu", -- track_num, -- track->session, -- track->type, -- track->start, -- track->blocks_num); -- -- return BRASERO_BURN_OK; --} -- --/** -- * return : -- * 0 when it's not possible to determine (fallback to formatted toc) -- * -1 for BCD -- * 1 for HEX */ --static guint --brasero_medium_check_BCD_use (BraseroMedium *self, -- int fd, -- BraseroScsiRawTocDesc *desc, -- guint num, -- BraseroScsiErrCode *code) --{ -- guint i; -- int size; -- guint leadout = 0; -- guint track_num = 0; -- gboolean use_BCD = TRUE; -- gboolean use_HEX = TRUE; -- BraseroScsiResult result; -- BraseroScsiTrackInfo track_info; -- guint start_BCD, start_LBA, track_start; -- -- /* first check if all values are valid BCD numbers in the descriptors */ -- for (i = 0; i < num; i++) { -- if (desc [i].adr == 1 && desc [i].point <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) { -- if (!BRASERO_IS_BCD_VALID (desc [i].p_min) -- || !BRASERO_IS_BCD_VALID (desc [i].p_sec) -- || !BRASERO_IS_BCD_VALID (desc [i].p_frame)) { -- use_BCD = FALSE; -- break; -- } -- } -- else if (desc [i].point == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) { -- if (!BRASERO_IS_BCD_VALID (desc [i].p_min) -- || !BRASERO_IS_BCD_VALID (desc [i].p_sec) -- || !BRASERO_IS_BCD_VALID (desc [i].p_frame)) { -- use_BCD = FALSE; -- break; -- } -- } -- } -- -- /* then check if there are valid Hex values */ -- for (i = 0; i < num; i++) { -- if (desc [i].adr != 1 || desc [i].point > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) -- continue; -- -- if (desc [i].p_min > 99 -- || desc [i].p_sec > 59 -- || desc [i].p_frame > 74) { -- use_HEX = FALSE; -- break; -- } -- } -- -- if (use_BCD != use_HEX) { -- if (use_BCD) -- return -1; -- -- return 1; -- } -- -- /* To check if the drive uses BCD values or HEX values we ask for the -- * track information that contains also the start for the track but in -- * HEX values. If values are the same then it works. */ -- -- /* NOTE: there could be another way to do it: get first track, in LBA -- * and BCD it must be 150. */ -- -- /* First find the first track and get track start address in BCD */ -- BRASERO_BURN_LOG ("Retrieving track information to determine number format"); -- -- for (i = 0; i < num; i++) { -- if (desc [i].adr == BRASERO_SCSI_Q_SUB_CHANNEL_LEADIN_MODE5 -- && desc [i].point == BRASERO_SCSI_Q_SUB_CHANNEL_MULTI_NEXT_SESSION) { -- /* store the leadout number just in case */ -- leadout = i; -- continue; -- } -- -- if (desc [i].adr != 1 || desc [i].point > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) -- continue; -- -- track_num ++; -- -- start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc [i].p_min), -- BRASERO_GET_BCD (desc [i].p_sec), -- BRASERO_GET_BCD (desc [i].p_frame)); -- -- start_LBA = BRASERO_MSF_TO_LBA (desc [i].p_min, -- desc [i].p_sec, -- desc [i].p_frame); -- -- BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for track %i", track_num); -- -- size = 36; -- start_LBA -= 150; -- start_BCD -= 150; -- -- result = brasero_mmc1_read_track_info (fd, -- track_num, -- &track_info, -- &size, -- code); -- -- if (result != BRASERO_SCSI_OK) { -- BRASERO_BURN_LOG ("READ TRACK INFO failed"); -- /* Fallback to formatted toc */ -- return 0; -- } -- -- track_start = BRASERO_GET_32 (track_info.start_lba); -- BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i", -- start_BCD, start_LBA, track_start); -- -- /* try to find a conclusive match */ -- if (track_start == start_BCD && track_start != start_LBA) -- return -1; -- -- if (track_start == start_LBA && track_start != start_BCD) -- return 1; -- } -- -- /* Our last chance, the leadout. -- * NOTE: no need to remove 150 sectors here. */ -- start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc [leadout].min), -- BRASERO_GET_BCD (desc [leadout].sec), -- BRASERO_GET_BCD (desc [leadout].frame)); -- -- start_LBA = BRASERO_MSF_TO_LBA (desc [leadout].min, -- desc [leadout].sec, -- desc [leadout].frame); -- -- BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for leadout"); -- -- size = 36; -- -- /* leadout number is number of tracks + 1 */ -- result = brasero_mmc1_read_track_info (fd, -- track_num + 1, -- &track_info, -- &size, -- code); -- -- if (result != BRASERO_SCSI_OK) { -- BRASERO_BURN_LOG ("READ TRACK INFO failed for leadout"); -- /* Fallback to formatted toc */ -- return 0; -- } -- -- track_start = BRASERO_GET_32 (track_info.start_lba); -- BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i", -- start_BCD, start_LBA, track_start); -- -- /* try to find a conclusive match */ -- if (track_start == start_BCD && track_start != start_LBA) -- return -1; -- -- if (track_start == start_LBA && track_start != start_BCD) -- return 1; -- -- /* fallback to formatted toc */ -- return 0; --} -- --/** -- * The reason why we use this perhaps more lengthy method is that with -- * multisession discs, the first track is reported to be two sectors shorter -- * than it should. As I don't know why and since the following works we use -- * this one. */ --static BraseroBurnResult --brasero_medium_get_CD_sessions_info (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- gint use_bcd; -- GSList *iter; -- int num, i, size; -- gint leadout_start = 0; -- BraseroScsiResult result; -- BraseroMediumPrivate *priv; -- BraseroScsiRawTocDesc *desc; -- BraseroScsiRawTocData *toc = NULL; -- -- BRASERO_BURN_LOG ("Reading Raw Toc"); -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- size = 0; -- result = brasero_mmc1_read_toc_raw (fd, -- 0, -- &toc, -- &size, -- code); -- if (result != BRASERO_SCSI_OK) { -- BRASERO_BURN_LOG ("READ TOC failed"); -- return BRASERO_BURN_ERR; -- } -- -- num = (size - sizeof (BraseroScsiRawTocData)) / -- sizeof (BraseroScsiRawTocDesc); -- -- BRASERO_BURN_LOG ("%i track(s) found", num); -- -- desc = toc->desc; -- use_bcd = brasero_medium_check_BCD_use (self, fd, desc, num, code); -- if (!use_bcd) { -- g_free (toc); -- -- BRASERO_BURN_LOG ("Fallback to formatted toc"); -- return BRASERO_BURN_ERR; -- } -- -- if (use_bcd > 0) -- use_bcd = 0; -- -- if (use_bcd) { -- BRASERO_BURN_LOG ("Using BCD format"); -- } -- else { -- BRASERO_BURN_LOG ("Using HEX format"); -- } -- -- for (i = 0; i < num; i++, desc ++) { -- BraseroMediumTrack *track; -- -- track = NULL; -- if (desc->adr == 1 && desc->point <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) { -- track = g_new0 (BraseroMediumTrack, 1); -- track->session = desc->session_num; -- -- brasero_medium_set_track_type (self, track, desc->control); -- if (use_bcd) -- track->start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc->p_min), -- BRASERO_GET_BCD (desc->p_sec), -- BRASERO_GET_BCD (desc->p_frame)); -- else -- track->start = BRASERO_MSF_TO_LBA (desc->p_min, -- desc->p_sec, -- desc->p_frame); -- -- track->start -= 150; -- -- /* if there are tracks and the last previously added track is in -- * the same session then set the size */ -- if (priv->tracks) { -- BraseroMediumTrack *last_track; -- -- last_track = priv->tracks->data; -- if (last_track->session == track->session) -- last_track->blocks_num = track->start - last_track->start; -- } -- -- priv->tracks = g_slist_prepend (priv->tracks, track); -- } -- else if (desc->point == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) { -- /* NOTE: the leadout session is first in the list. So if -- * we have tracks in the list set the last session track -- * size when we reach a new leadout (and therefore a new -- * session). */ -- -- if (priv->tracks) { -- BraseroMediumTrack *last_track; -- -- last_track = priv->tracks->data; -- last_track->blocks_num = leadout_start - last_track->start; -- } -- -- if (use_bcd) -- leadout_start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc->p_min), -- BRASERO_GET_BCD (desc->p_sec), -- BRASERO_GET_BCD (desc->p_frame)); -- else -- leadout_start = BRASERO_MSF_TO_LBA (desc->p_min, -- desc->p_sec, -- desc->p_frame); -- leadout_start -= 150; -- } -- } -- -- if (priv->tracks) { -- BraseroMediumTrack *last_track; -- -- /* set the last found track size */ -- last_track = priv->tracks->data; -- last_track->blocks_num = leadout_start - last_track->start; -- } -- -- /* Add a leadout */ -- if (!(priv->info & BRASERO_MEDIUM_CLOSED)) { -- BraseroMediumTrack *track; -- -- /* we shouldn't request info on leadout if the disc is closed */ -- track = g_new0 (BraseroMediumTrack, 1); -- priv->tracks = g_slist_prepend (priv->tracks, track); -- track->start = leadout_start; -- track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -- -- brasero_medium_track_get_info (self, track, g_slist_length (priv->tracks), fd, code); -- } -- -- priv->tracks = g_slist_reverse (priv->tracks); -- -- for (iter = priv->tracks; iter; iter = iter->next) { -- BraseroMediumTrack *track; -- -- track = iter->data; -- -- /* check for tracks less that 300 sectors */ -- if (track->blocks_num <= 300 && track->type != BRASERO_MEDIUM_TRACK_LEADOUT) { -- BRASERO_BURN_LOG ("300 sectors size. Checking for real size"); -- brasero_medium_track_volume_size (self, track, fd); -- } -- -- BRASERO_BURN_LOG ("Track %i: type = %i start = %llu size = %llu", -- g_slist_index (priv->tracks, track), -- track->type, -- track->start, -- track->blocks_num); -- } -- -- g_free (toc); -- return BRASERO_BURN_OK; --} -- --/** -- * NOTE: for DVD-R multisession we lose 28688 blocks for each session -- * so the capacity is the addition of all session sizes + 28688 for each -- * For all multisession DVD-/+R and CDR-RW the remaining size is given -- * in the leadout. One exception though with DVD+/-RW. -- */ -- --static void --brasero_medium_add_DVD_plus_RW_leadout (BraseroMedium *self, -- gint32 start) --{ -- BraseroMediumTrack *leadout; -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- leadout = g_new0 (BraseroMediumTrack, 1); -- priv->tracks = g_slist_append (priv->tracks, leadout); -- -- leadout->start = start; -- leadout->type = BRASERO_MEDIUM_TRACK_LEADOUT; -- -- /* we fabricate the leadout here. We don't really need one in -- * fact since it is always at the last sector whatever the -- * amount of data written. So we need in fact to read the file -- * system and get the last sector from it. Hopefully it won't be -- * buggy */ -- priv->next_wr_add = 0; -- -- leadout->blocks_num = priv->block_num; -- if (g_slist_length (priv->tracks) > 1) { -- BraseroMediumTrack *track; -- -- track = priv->tracks->data; -- leadout->blocks_num -= ((track->blocks_num > 300) ? track->blocks_num : 300); -- } -- BRASERO_BURN_LOG ("Adding fabricated leadout start = %llu length = %llu", -- leadout->start, -- leadout->blocks_num); --} -- --static BraseroBurnResult --brasero_medium_get_sessions_info (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- int num, i, size; -- BraseroScsiResult result; -- BraseroScsiTocDesc *desc; -- BraseroMediumPrivate *priv; -- BraseroScsiFormattedTocData *toc = NULL; -- -- BRASERO_BURN_LOG ("Reading Toc"); -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- result = brasero_mmc1_read_toc_formatted (fd, -- 0, -- &toc, -- &size, -- code); -- if (result != BRASERO_SCSI_OK) { -- g_free (toc); -- -- BRASERO_BURN_LOG ("READ TOC failed"); -- return BRASERO_BURN_ERR; -- } -- -- num = (size - sizeof (BraseroScsiFormattedTocData)) / -- sizeof (BraseroScsiTocDesc); -- -- BRASERO_BURN_LOG ("%i track(s) found", num); -- -- desc = toc->desc; -- for (i = 0; i < num; i ++, desc ++) { -- BraseroMediumTrack *track; -- -- if (desc->track_num == BRASERO_SCSI_TRACK_LEADOUT_START) -- break; -- -- track = g_new0 (BraseroMediumTrack, 1); -- priv->tracks = g_slist_prepend (priv->tracks, track); -- track->start = BRASERO_GET_32 (desc->track_start); -- -- /* we shouldn't request info on a track if the disc is closed */ -- brasero_medium_track_get_info (self, -- track, -- g_slist_length (priv->tracks), -- fd, -- code); -- -- if (desc->control & BRASERO_SCSI_TRACK_COPY) -- track->type |= BRASERO_MEDIUM_TRACK_COPY; -- -- if (!(desc->control & BRASERO_SCSI_TRACK_DATA)) { -- track->type |= BRASERO_MEDIUM_TRACK_AUDIO; -- priv->info |= BRASERO_MEDIUM_HAS_AUDIO; -- -- if (desc->control & BRASERO_SCSI_TRACK_PREEMP) -- track->type |= BRASERO_MEDIUM_TRACK_PREEMP; -- -- if (desc->control & BRASERO_SCSI_TRACK_4_CHANNELS) -- track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS; -- } -- else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -- || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) { -- BraseroBurnResult result; -- -- /* a special case for these two kinds of media (DVD+RW) -- * which have only one track: the first. */ -- result = brasero_medium_track_volume_size (self, -- track, -- fd); -- if (result == BRASERO_BURN_OK) { -- track->type |= BRASERO_MEDIUM_TRACK_DATA; -- priv->info |= BRASERO_MEDIUM_HAS_DATA; -- -- priv->next_wr_add = 0; -- -- if (desc->control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -- track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -- } -- else { -- priv->tracks = g_slist_remove (priv->tracks, track); -- g_free (track); -- -- priv->info |= BRASERO_MEDIUM_BLANK; -- priv->info &= ~BRASERO_MEDIUM_CLOSED; -- } -- } -- else { -- track->type |= BRASERO_MEDIUM_TRACK_DATA; -- priv->info |= BRASERO_MEDIUM_HAS_DATA; -- -- if (desc->control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL) -- track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL; -- } -- } -- -- /* put the tracks in the right order */ -- priv->tracks = g_slist_reverse (priv->tracks); -- -- if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -- || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) -- brasero_medium_add_DVD_plus_RW_leadout (self, BRASERO_GET_32 (desc->track_start)); -- else if (!(priv->info & BRASERO_MEDIUM_CLOSED)) { -- BraseroMediumTrack *track; -- -- /* we shouldn't request info on leadout if the disc is closed -- * (except for DVD+/- (restricted) RW (see above) */ -- track = g_new0 (BraseroMediumTrack, 1); -- priv->tracks = g_slist_append (priv->tracks, track); -- track->start = BRASERO_GET_32 (desc->track_start); -- track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -- -- brasero_medium_track_get_info (self, -- track, -- g_slist_length (priv->tracks), -- fd, -- code); -- } -- -- g_free (toc); -- -- return BRASERO_BURN_OK; --} -- --static BraseroBurnResult --brasero_medium_get_contents (BraseroMedium *self, -- int fd, -- BraseroScsiErrCode *code) --{ -- int size; -- BraseroScsiResult result; -- BraseroMediumPrivate *priv; -- BraseroScsiDiscInfoStd *info = NULL; -- -- BRASERO_BURN_LOG ("Retrieving media status"); -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- -- result = brasero_mmc1_read_disc_information_std (fd, -- &info, -- &size, -- code); -- if (result != BRASERO_SCSI_OK) { -- g_free (info); -- -- BRASERO_BURN_LOG ("READ DISC INFORMATION failed"); -- return BRASERO_BURN_ERR; -- } -- -- if (info->erasable) -- priv->info |= BRASERO_MEDIUM_REWRITABLE; -- -- if (info->status == BRASERO_SCSI_DISC_EMPTY) { -- BraseroMediumTrack *track; -- -- BRASERO_BURN_LOG ("Empty media"); -- -- priv->info |= BRASERO_MEDIUM_BLANK; -- priv->block_size = 2048; -- -- if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS) -- || BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) -- brasero_medium_add_DVD_plus_RW_leadout (self, 0); -- else { -- track = g_new0 (BraseroMediumTrack, 1); -- track->start = 0; -- track->type = BRASERO_MEDIUM_TRACK_LEADOUT; -- priv->tracks = g_slist_prepend (priv->tracks, track); -- -- brasero_medium_track_get_info (self, -- track, -- 1, -- fd, -- code); -- } -- goto end; -- } -- -- if (info->status == BRASERO_SCSI_DISC_INCOMPLETE) { -- priv->info |= BRASERO_MEDIUM_APPENDABLE; -- BRASERO_BURN_LOG ("Appendable media"); -- } -- else if (info->status == BRASERO_SCSI_DISC_FINALIZED) { -- priv->info |= BRASERO_MEDIUM_CLOSED; -- BRASERO_BURN_LOG ("Closed media"); -- } -- -- if (priv->info & BRASERO_MEDIUM_CD) { -- result = brasero_medium_get_CD_sessions_info (self, fd, code); -- if (result != BRASERO_BURN_OK) -- result = brasero_medium_get_sessions_info (self, fd, code); -- } -- else -- result = brasero_medium_get_sessions_info (self, fd, code); -- -- if (result != BRASERO_BURN_OK) -- goto end; -- --end: -- -- g_free (info); -- return BRASERO_BURN_OK; --} -- --static void --brasero_medium_init_real (BraseroMedium *object, int fd) --{ -- gchar *name; -- BraseroBurnResult result; -- BraseroMediumPrivate *priv; -- BraseroScsiErrCode code = 0; -- -- priv = BRASERO_MEDIUM_PRIVATE (object); -- -- name = nautilus_burn_drive_get_name_for_display (priv->drive); -- BRASERO_BURN_LOG ("Initializing information for medium in %s", name); -- g_free (name); -- -- result = brasero_medium_get_medium_type (object, fd, &code); -- if (result != BRASERO_BURN_OK) -- return; -- -- brasero_medium_get_capacity_by_type (object, fd, &code); -- -- result = brasero_medium_get_contents (object, fd, &code); -- if (result != BRASERO_BURN_OK) -- return; -- -- /* assume that css feature is only for DVD-ROM which might be wrong but -- * some drives wrongly reports that css is enabled for blank DVD+R/W */ -- if (BRASERO_MEDIUM_IS (priv->info, (BRASERO_MEDIUM_DVD|BRASERO_MEDIUM_ROM))) -- brasero_medium_get_css_feature (object, fd, &code); -- -- BRASERO_BURN_LOG_DISC_TYPE (priv->info, "media is "); --} -- --static gboolean --brasero_medium_retry_open (gpointer object) --{ -- int fd; -- const gchar *path; -- BraseroMedium *self; -- BraseroMediumPrivate *priv; -- -- self = BRASERO_MEDIUM (object); -- priv = BRASERO_MEDIUM_PRIVATE (object); -- path = nautilus_burn_drive_get_device (priv->drive); -- -- BRASERO_BURN_LOG ("Retrying to open device %s", path); -- fd = open (path, OPEN_FLAGS); -- if (fd < 0) { -- if (errno == EBUSY -- || errno == EAGAIN -- || errno == EWOULDBLOCK) { -- BRASERO_BURN_LOG ("Device busy"); -- /* we'll retry in a second */ -- return TRUE; -- } -- -- BRASERO_BURN_LOG ("Open () failed"); -- priv->info = BRASERO_MEDIUM_UNSUPPORTED; -- priv->retry_id = 0; -- return FALSE; -- } -- -- BRASERO_BURN_LOG ("Open () succeeded\n"); -- priv->info = BRASERO_MEDIUM_NONE; -- priv->icon = icons [0]; -- -- priv->retry_id = 0; -- -- brasero_medium_init_real (self, fd); -- close (fd); -- -- return FALSE; --} -- --static void --brasero_medium_try_open (BraseroMedium *self) --{ -- int fd; -- const gchar *path; -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (self); -- path = nautilus_burn_drive_get_device (priv->drive); -- -- /* the drive might be busy (a burning is going on) so we don't block -- * but we re-try to open it every second */ -- BRASERO_BURN_LOG ("Trying to open device %s", path); -- fd = open (path, OPEN_FLAGS); -- if (fd < 0) { -- if (errno == EAGAIN -- || errno == EWOULDBLOCK -- || errno == EBUSY) { -- BRASERO_BURN_LOG ("Device busy"); -- priv->info = BRASERO_MEDIUM_BUSY; -- priv->icon = icons [0]; -- -- priv->retry_id = g_timeout_add (BUSY_RETRY_TIME, -- brasero_medium_retry_open, -- self); -- } -- -- BRASERO_BURN_LOG ("Open () failed"); -- return; -- } -- -- BRASERO_BURN_LOG ("Open () succeeded"); -- brasero_medium_init_real (self, fd); -- close (fd); --} -- --static void --brasero_medium_init (BraseroMedium *object) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (object); -- priv->next_wr_add = -1; -- -- /* we can't do anything here since properties haven't been set yet */ --} -- --static void --brasero_medium_finalize (GObject *object) --{ -- BraseroMediumPrivate *priv; -- -- priv = BRASERO_MEDIUM_PRIVATE (object); -- -- if (priv->retry_id) { -- g_source_remove (priv->retry_id); -- priv->retry_id = 0; -- } -- -- g_free (priv->rd_speeds); -- priv->rd_speeds = NULL; -- -- g_free (priv->wr_speeds); -- priv->wr_speeds = NULL; -- -- g_slist_foreach (priv->tracks, (GFunc) g_free, NULL); -- g_slist_free (priv->tracks); -- priv->tracks = NULL; -- -- nautilus_burn_drive_unref (priv->drive); -- priv->drive = NULL; -- -- G_OBJECT_CLASS (parent_class)->finalize (object); --} -- --static void --brasero_medium_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) --{ -- BraseroMediumPrivate *priv; -- -- g_return_if_fail (BRASERO_IS_MEDIUM (object)); -- -- priv = BRASERO_MEDIUM_PRIVATE (object); -- -- switch (prop_id) -- { -- case PROP_DRIVE: -- priv->drive = g_value_get_object (value); -- nautilus_burn_drive_ref (priv->drive); -- brasero_medium_try_open (BRASERO_MEDIUM (object)); -- break; -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -- --static void --brasero_medium_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) --{ -- BraseroMediumPrivate *priv; -- -- g_return_if_fail (BRASERO_IS_MEDIUM (object)); -- -- priv = BRASERO_MEDIUM_PRIVATE (object); -- -- switch (prop_id) -- { -- case PROP_DRIVE: -- nautilus_burn_drive_ref (priv->drive); -- g_value_set_object (value, priv->drive); -- break; -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -- --static void --brasero_medium_class_init (BraseroMediumClass *klass) --{ -- GObjectClass* object_class = G_OBJECT_CLASS (klass); -- parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass)); -- -- g_type_class_add_private (klass, sizeof (BraseroMediumPrivate)); -- -- object_class->finalize = brasero_medium_finalize; -- object_class->set_property = brasero_medium_set_property; -- object_class->get_property = brasero_medium_get_property; -- -- g_object_class_install_property (object_class, -- PROP_DRIVE, -- g_param_spec_object ("drive", -- "drive", -- "drive in which medium is inserted", -- NAUTILUS_BURN_TYPE_DRIVE, -- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); --} -- --GType --brasero_medium_get_type (void) --{ -- static GType our_type = 0; -- -- if (our_type == 0) -- { -- static const GTypeInfo our_info = -- { -- sizeof (BraseroMediumClass), /* class_size */ -- (GBaseInitFunc) NULL, /* base_init */ -- (GBaseFinalizeFunc) NULL, /* base_finalize */ -- (GClassInitFunc) brasero_medium_class_init, /* class_init */ -- (GClassFinalizeFunc) NULL, /* class_finalize */ -- NULL /* class_data */, -- sizeof (BraseroMedium), /* instance_size */ -- 0, /* n_preallocs */ -- (GInstanceInitFunc) brasero_medium_init, /* instance_init */ -- NULL /* value_table */ -- }; -- -- our_type = g_type_register_static (G_TYPE_OBJECT, "BraseroMedium", -- &our_info, 0); -- } -- -- return our_type; --} -- --BraseroMedium * --brasero_medium_new (NautilusBurnDrive *drive) --{ -- g_return_val_if_fail (drive != NULL, NULL); -- return BRASERO_MEDIUM (g_object_new (BRASERO_TYPE_MEDIUM, -- "drive", drive, -- NULL)); --} diff --git a/sysutils/brasero/files/patch-src_cam b/sysutils/brasero/files/patch-src_cam deleted file mode 100644 index beeeb7033de1..000000000000 --- a/sysutils/brasero/files/patch-src_cam +++ /dev/null @@ -1,1361 +0,0 @@ -diff -rupN cam.orig/freebsd_dvd_rw_utils.h cam/freebsd_dvd_rw_utils.h ---- /dev/null 1969-12-31 19:00:00.000000000 -0500 -+++ src/cam/freebsd_dvd_rw_utils.h 2008-01-24 16:52:25.000000000 -0500 -@@ -0,0 +1,49 @@ -+// -+// This is part of dvd+rw-tools by Andy Polyakov <appro@fy.chalmers.se> -+// -+// Use-it-on-your-own-risk, GPL bless... -+// -+// For further details see http://fy.chalmers.se/~appro/linux/DVD+RW/ -+// -+ -+#ifndef FREEBSD_DVD_RW_UTILS_H -+#define FREEBSD_DVD_RW_UTILS_H -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <glib.h> -+ -+#include "cam-cdrom.h" -+ -+#define DRIVE_CDROM_CAPS_DVDRW 1 -+#define DRIVE_CDROM_CAPS_DVDPLUSR 2 -+#define DRIVE_CDROM_CAPS_DVDPLUSRW 4 -+#define DRIVE_CDROM_CAPS_DVDPLUSRWDL 8 -+#define DRIVE_CDROM_CAPS_DVDPLUSRDL 16 -+#define DRIVE_CDROM_CAPS_BDROM 32 -+#define DRIVE_CDROM_CAPS_BDR 64 -+#define DRIVE_CDROM_CAPS_BDRE 128 -+#define DRIVE_CDROM_CAPS_HDDVDROM 256 -+#define DRIVE_CDROM_CAPS_HDDVDR 512 -+#define DRIVE_CDROM_CAPS_HDDVDRW 1024 -+ -+int brasero_cdrom_get_dvd_r_rw_profile (BRASEROCDROM *cdrom); -+int brasero_cdrom_get_read_write_speed (BRASEROCDROM *cdrom, int *read_speed, int *write_speed, char **write_speeds); -+int brasero_cdrom_get_disc_capacity_for_type (BRASEROCDROM *cdrom, int type, guint64 *capacity); -+int brasero_cdrom_get_disc_type (BRASEROCDROM *cdrom); -+int brasero_cdrom_read_disc_information_std (BRASEROCDROM *cdrom, unsigned char *buf); -+int brasero_cdrom_disc_is_appendable (BRASEROCDROM *cdrom); -+int brasero_cdrom_disc_is_rewritable (BRASEROCDROM *cdrom); -+int brasero_cdrom_read_atip (BRASEROCDROM *cdrom, unsigned char **buf); -+int brasero_cdrom_read_format_capacities (BRASEROCDROM *cdrom, unsigned char **buf); -+int brasero_cdrom_get_performance_wrt_spd_desc (BRASEROCDROM *cdrom, unsigned char **buf); -+int brasero_cdrom_get_configuration_feature (BRASEROCDROM *cdrom, int feature, unsigned char **buf); -+int brasero_cdrom_read_track_info (BRASEROCDROM *cdrom, int track_num, unsigned char *buf, int size); -+int brasero_cdrom_read_toc_raw (BRASEROCDROM *cdrom, int track_num, unsigned char **buf); -+int brasero_cdrom_read_toc_formatted (BRASEROCDROM *cdrom, int track_num, unsigned char **buf); -+int brasero_read_disc_information_std (BRASEROCDROM *cdrom, unsigned char *buf); -+int brasero_cdrom_read_format_capacities (BRASEROCDROM *cdrom, unsigned char **buf); -+ -+#endif /* FREEBSD_DVD_RW_UTILS_H */ ---- /dev/null 2008-02-03 02:26:39.000000000 -0500 -+++ src/cam/cam-cdrom.h 2008-02-03 11:32:23.000000000 -0500 -@@ -0,0 +1,68 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * hfp-cdrom.h : SCSI CD-ROM abstraction layer -+ * -+ * Copyright (C) 2006 Jean-Yves Lefort <jylefort@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ **************************************************************************/ -+ -+#ifndef _BRASERO_CDROM_H -+#define _BRASERO_CDROM_H -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <glib.h> -+ -+#include <sys/types.h> -+ -+typedef struct _BRASEROCDROM BRASEROCDROM; -+ -+typedef enum -+{ -+ BRASERO_CDROM_DIRECTION_NONE, -+ BRASERO_CDROM_DIRECTION_IN, -+ BRASERO_CDROM_DIRECTION_OUT -+} BRASEROCDROMDirection; -+ -+/* ATAPI/SCSI commands */ -+enum -+{ -+ BRASERO_CDROM_TEST_UNIT_READY = 0x00, -+ BRASERO_CDROM_GET_EVENT_STATUS_NOTIFICATION = 0x4a, -+ BRASERO_CDROM_MODE_SENSE_BIG = 0x5a -+}; -+ -+BRASEROCDROM *brasero_cdrom_new (const char *path); -+ -+gboolean brasero_cdrom_send_ccb (BRASEROCDROM *cdrom, -+ const char *ccb, -+ int ccb_len, -+ BRASEROCDROMDirection direction, -+ void *data, -+ int len, -+ char **err); -+ -+gboolean brasero_cdrom_test_unit_ready (BRASEROCDROM *cdrom); -+ -+int brasero_cdrom_get_fd (BRASEROCDROM *cdrom); -+ -+void brasero_cdrom_free (BRASEROCDROM *cdrom); -+ -+#endif /* _BRASERO_CDROM_H */ ---- /dev/null 2008-02-03 13:11:45.000000000 -0500 -+++ src/cam/cam-cdrom.c 2008-02-03 13:24:53.000000000 -0500 -@@ -0,0 +1,156 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * cam-cdrom.c : SCSI CD-ROM abstraction layer -+ * -+ * Copyright (C) 2006 Jean-Yves Lefort <jylefort@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ **************************************************************************/ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <string.h> -+#include <errno.h> -+#include <fcntl.h> -+#include <unistd.h> -+#include <sys/ioctl.h> -+#include <sys/types.h> -+#include <sys/ata.h> -+#include <stdio.h> -+#include <camlib.h> -+#include <cam/scsi/scsi_message.h> -+#include <glib.h> -+ -+#include "cam-cdrom.h" -+ -+struct _BRASEROCDROM -+{ -+ struct cam_device *cam; /* for SCSI drives */ -+ int fd; -+}; -+ -+BRASEROCDROM * -+brasero_cdrom_new (const char *path) -+{ -+ BRASEROCDROM *cdrom = NULL; -+ struct cam_device *cam; -+ int fd; -+ -+ g_assert(path != NULL); -+ -+ /* brasero_open_device() fails unless we use O_RDWR */ -+ cam = cam_open_device(path, O_RDWR); -+ fd = open(path, O_RDONLY | O_NONBLOCK); -+ if (cam && fd > -1) -+ { -+ cdrom = g_new0(BRASEROCDROM, 1); -+ cdrom->cam = cam; -+ cdrom->fd = fd; -+ } -+ -+ return cdrom; -+} -+ -+gboolean -+brasero_cdrom_send_ccb (BRASEROCDROM *cdrom, -+ const char *ccb, -+ int ccb_len, -+ BRASEROCDROMDirection direction, -+ void *data, -+ int len, -+ char **err) -+{ -+ int timeout; -+ -+ g_assert(cdrom != NULL); -+ g_assert(ccb != NULL); -+ g_assert(direction == BRASERO_CDROM_DIRECTION_NONE -+ || direction == BRASERO_CDROM_DIRECTION_IN -+ || direction == BRASERO_CDROM_DIRECTION_OUT); -+ g_assert(direction == BRASERO_CDROM_DIRECTION_NONE || data != NULL); -+ -+ timeout = 10; -+ -+ union ccb cam_ccb; -+ static int scsi_direction[] = { CAM_DIR_NONE, CAM_DIR_IN, CAM_DIR_OUT }; -+ -+ memset(&cam_ccb, 0, sizeof(cam_ccb)); -+ -+ cam_ccb.ccb_h.path_id = cdrom->cam->path_id; -+ cam_ccb.ccb_h.target_id = cdrom->cam->target_id; -+ cam_ccb.ccb_h.target_lun = cdrom->cam->target_lun; -+ -+ cam_fill_csio(&cam_ccb.csio, -+ 1, -+ NULL, -+ scsi_direction[direction], -+ MSG_SIMPLE_Q_TAG, -+ data, -+ len, -+ sizeof(cam_ccb.csio.sense_data), -+ ccb_len, -+ timeout * 1000); -+ -+ memcpy(cam_ccb.csio.cdb_io.cdb_bytes, ccb, 16); -+ -+ if (cam_send_ccb(cdrom->cam, &cam_ccb) == -1) -+ { -+ if (err) -+ *err = g_strdup_printf("cam_send_ccb() failure: %s", g_strerror(errno)); -+ } -+ if ((cam_ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) -+ { -+ if (err) -+ *err = g_strdup_printf("CCB request failed with status %i", cam_ccb.ccb_h.status & CAM_STATUS_MASK); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ -+gboolean -+brasero_cdrom_test_unit_ready (BRASEROCDROM *cdrom) -+{ -+ static char ccb[16] = { BRASERO_CDROM_TEST_UNIT_READY }; -+ -+ g_assert(cdrom != NULL); -+ -+ return brasero_cdrom_send_ccb(cdrom, ccb, 6, BRASERO_CDROM_DIRECTION_NONE, NULL, 0, NULL); -+} -+ -+int -+brasero_cdrom_get_fd (BRASEROCDROM *cdrom) -+{ -+ g_assert(cdrom != NULL); -+ -+ return (cdrom->fd); -+} -+ -+void -+brasero_cdrom_free (BRASEROCDROM *cdrom) -+{ -+ g_assert(cdrom != NULL); -+ -+ if (cdrom->cam) -+ cam_close_device(cdrom->cam); -+ -+ close(cdrom->fd); -+ -+ g_free(cdrom); -+} ---- /dev/null 2008-02-03 13:11:45.000000000 -0500 -+++ src/cam/freebsd_dvd_rw_utils.c 2008-02-03 13:30:36.000000000 -0500 -@@ -0,0 +1,1075 @@ -+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- -+ * -+ * This is part of dvd+rw-tools by Andy Polyakov <appro@fy.chalmers.se> -+ * -+ * Use-it-on-your-own-risk, GPL bless... -+ * -+ * For further details see http://fy.chalmers.se/~appro/linux/DVD+RW/ -+*/ -+ -+#include <stdio.h> -+#include <string.h> -+#include <stdlib.h> -+#include <sys/types.h> -+ -+#include <glib.h> -+ -+#include "freebsd_dvd_rw_utils.h" -+ -+typedef enum { -+ NONE = BRASERO_CDROM_DIRECTION_NONE, -+ READ = BRASERO_CDROM_DIRECTION_IN, -+ WRITE = BRASERO_CDROM_DIRECTION_OUT -+} Direction; -+ -+typedef struct ScsiCommand ScsiCommand; -+ -+struct ScsiCommand { -+ BRASEROCDROM *cdrom; -+ char ccb[16]; -+ int len; -+}; -+ -+static ScsiCommand * -+scsi_command_new_from_cdrom (BRASEROCDROM *cdrom) -+{ -+ ScsiCommand *cmd; -+ -+ cmd = g_new0 (ScsiCommand, 1); -+ cmd->cdrom = cdrom; -+ -+ return cmd; -+} -+ -+static void -+scsi_command_free (ScsiCommand * cmd) -+{ -+ free (cmd); -+} -+ -+static void -+scsi_command_init (ScsiCommand * cmd, size_t i, int arg) -+{ -+ cmd->ccb[i] = arg; -+ if (i == 0 || i >= cmd->len) -+ cmd->len = i + 1; -+} -+ -+static int -+scsi_command_transport (ScsiCommand * cmd, Direction dir, void *buf, -+ size_t sz) -+{ -+ if (brasero_cdrom_send_ccb(cmd->cdrom, cmd->ccb, cmd->len, dir, buf, sz, NULL)) -+ return 0; -+ else -+ return -1; -+} -+ -+int -+brasero_cdrom_get_dvd_r_rw_profile (BRASEROCDROM *cdrom) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ unsigned char page[20]; -+ unsigned char *list; -+ int i, len; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x46); -+ scsi_command_init (cmd, 1, 2); -+ scsi_command_init (cmd, 8, 8); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, page, 8)) { -+ /* GET CONFIGURATION failed */ -+ scsi_command_free (cmd); -+ return -1; -+ } -+ -+ /* See if it's 2 gen drive by checking if DVD+R profile is an option */ -+ len = 4 + (page[0] << 24 | page[1] << 16 | page[2] << 8 | page[3]); -+ if (len > 264) { -+ scsi_command_free (cmd); -+ /* insane profile list length */ -+ return -1; -+ } -+ -+ list = g_new (unsigned char, len); -+ -+ scsi_command_init (cmd, 0, 0x46); -+ scsi_command_init (cmd, 1, 2); -+ scsi_command_init (cmd, 7, len >> 8); -+ scsi_command_init (cmd, 8, len); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, list, len)) { -+ /* GET CONFIGURATION failed */ -+ scsi_command_free (cmd); -+ free (list); -+ return -1; -+ } -+ -+ for (i = 12; i < list[11]; i += 4) { -+ int profile = (list[i] << 8 | list[i + 1]); -+ /* 0x13: DVD-RW Restricted Overwrite -+ * 0x14: DVD-RW Sequential -+ * 0x1B: DVD+R -+ * 0x1A: DVD+RW -+ * 0x2A: DVD+RW DL -+ * 0x2B: DVD+R DL -+ * 0x40: BD-ROM -+ * 0x41: BD-R SRM -+ * 0x42: BD-R RRM -+ * 0x43: BD-RE -+ * 0x50: HD DVD-ROM -+ * 0x51: HD DVD-R -+ * 0x52: HD DVD-Rewritable -+ */ -+ -+ switch (profile) { -+ case 0x13: -+ case 0x14: -+ retval |= DRIVE_CDROM_CAPS_DVDRW; -+ break; -+ case 0x1B: -+ retval |= DRIVE_CDROM_CAPS_DVDPLUSR; -+ break; -+ case 0x1A: -+ retval |= DRIVE_CDROM_CAPS_DVDPLUSRW; -+ break; -+ case 0x2A: -+ retval |= DRIVE_CDROM_CAPS_DVDPLUSRWDL; -+ break; -+ case 0x2B: -+ retval |= DRIVE_CDROM_CAPS_DVDPLUSRDL; -+ break; -+ case 0x40: -+ retval |= DRIVE_CDROM_CAPS_BDROM; -+ break; -+ case 0x41: -+ case 0x42: -+ retval |= DRIVE_CDROM_CAPS_BDR; -+ break; -+ case 0x43: -+ retval |= DRIVE_CDROM_CAPS_BDRE; -+ break; -+ case 0x50: -+ retval |= DRIVE_CDROM_CAPS_HDDVDROM; -+ break; -+ case 0x51: -+ retval |= DRIVE_CDROM_CAPS_HDDVDR; -+ break; -+ case 0x52: -+ retval |= DRIVE_CDROM_CAPS_HDDVDRW; -+ break; -+ default: -+ break; -+ } -+ } -+ -+ scsi_command_free (cmd); -+ free (list); -+ -+ return retval; -+ -+} -+ -+static unsigned char * -+pull_page2a_from_cdrom (BRASEROCDROM *cdrom) -+{ -+ ScsiCommand *cmd; -+ unsigned char header[12], *page2A; -+ unsigned int len, bdlen; -+ -+ g_return_val_if_fail (cdrom != NULL, NULL); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x5A); /* MODE SENSE */ -+ scsi_command_init (cmd, 1, 0x08); /* Disable Block Descriptors */ -+ scsi_command_init (cmd, 2, 0x2A); /* Capabilities and Mechanical Status */ -+ scsi_command_init (cmd, 8, sizeof (header)); /* header only to start with */ -+ scsi_command_init (cmd, 9, 0); -+ -+ if (scsi_command_transport (cmd, READ, header, sizeof (header))) { -+ /* MODE SENSE failed */ -+ scsi_command_free (cmd); -+ return NULL; -+ } -+ -+ len = (header[0] << 8 | header[1]) + 2; -+ bdlen = header[6] << 8 | header[7]; -+ -+ /* should never happen as we set "DBD" above */ -+ if (bdlen) { -+ if (len < (8 + bdlen + 30)) { -+ /* LUN impossible to bear with */ -+ scsi_command_free (cmd); -+ return NULL; -+ } -+ } else if (len < (8 + 2 + (unsigned int) header[9])) { -+ /* SANYO does this. */ -+ len = 8 + 2 + header[9]; -+ } -+ -+ page2A = g_new (unsigned char, len); -+ if (page2A == NULL) { -+ /* ENOMEM */ -+ scsi_command_free (cmd); -+ return NULL; -+ } -+ -+ scsi_command_init (cmd, 0, 0x5A); /* MODE SENSE */ -+ scsi_command_init (cmd, 1, 0x08); /* Disable Block Descriptors */ -+ scsi_command_init (cmd, 2, 0x2A); /* Capabilities and Mechanical Status */ -+ scsi_command_init (cmd, 7, len >> 8); -+ scsi_command_init (cmd, 8, len); /* Real length */ -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, page2A, len)) { -+ /* MODE SENSE failed */ -+ scsi_command_free (cmd); -+ free (page2A); -+ return NULL; -+ } -+ -+ scsi_command_free (cmd); -+ -+ len -= 2; -+ /* paranoia */ -+ if (len < ((unsigned int) page2A[0] << 8 | page2A[1])) { -+ page2A[0] = len >> 8; -+ page2A[1] = len; -+ } -+ -+ return page2A; -+} -+ -+static int -+int_compare (const void *a, const void *b) -+{ -+ /* descending order */ -+ return *((int *) b) - *((int *) a); -+} -+ -+/* gets the list of supported write speeds. in the event -+ * that anything goes wrong, returns NULL. -+ */ -+static char * -+get_write_speeds (const unsigned char *p, int length, int max_speed) -+{ -+ char *result, *str; -+ int nr_records; -+ int *tmpspeeds; -+ int i, j; -+ -+ result = NULL; -+ -+ /* paranoia */ -+ if (length < 32) -+ return NULL; -+ -+ nr_records = p[30] << 8 | p[31]; -+ -+ /* paranoia */ -+ if (length < 32 + 4 * nr_records) -+ return NULL; -+ -+ tmpspeeds = g_new (int, nr_records); -+ -+ for (i = 0; i < nr_records; i++) -+ { -+ tmpspeeds[i] = p[4*i + 34] << 8 | p[4*i + 35]; -+ -+ /* i'm not sure how likely this is to show up, but it's -+ * definitely wrong. if we see it, abort. -+ */ -+ if (tmpspeeds[i] == 0) -+ goto free_tmpspeeds; -+ } -+ -+ /* sort */ -+ qsort (tmpspeeds, nr_records, sizeof (int), int_compare); -+ -+ /* uniq */ -+ for (i = j = 0; i < nr_records; i++) -+ { -+ tmpspeeds[j] = tmpspeeds[i]; -+ -+ /* make sure we don't look past the end of the array */ -+ if (i >= (nr_records - 1) || tmpspeeds[i+1] != tmpspeeds[i]) -+ j++; -+ } -+ -+ /* j is now the number of unique entries in the array */ -+ if (j == 0) -+ /* no entries? this isn't right. */ -+ goto free_tmpspeeds; -+ -+ /* sanity check: the first item in the descending order -+ * list ought to be the highest speed as detected through -+ * other means -+ */ -+ if (tmpspeeds[0] != max_speed) -+ /* sanity check failed. */ -+ goto free_tmpspeeds; -+ -+ /* our values are 16-bit. 8 bytes per value -+ * is more than enough including space for -+ * ',' and '\0'. we know j is not zero. -+ */ -+ result = str = g_new (char, 8 * j); -+ -+ for (i = 0; i < j; i++) -+ { -+ if (i > 0) -+ *(str++) = ','; -+ -+ str += sprintf (str, "%d", tmpspeeds[i]); -+ } -+ -+free_tmpspeeds: -+ free (tmpspeeds); -+ -+ return result; -+} -+ -+int -+brasero_cdrom_get_read_write_speed (BRASEROCDROM *cdrom, int *read_speed, int *write_speed, char **write_speeds) -+{ -+ unsigned char *page2A; -+ int len, hlen; -+ unsigned char *p; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ *read_speed = 0; -+ *write_speed = 0; -+ *write_speeds = NULL; -+ -+ page2A = pull_page2a_from_cdrom (cdrom); -+ if (page2A == NULL) { -+ printf ("Failed to get Page 2A\n"); -+ /* Failed to get Page 2A */ -+ return -1; -+ } -+ -+ len = (page2A[0] << 8 | page2A[1]) + 2; -+ hlen = 8 + (page2A[6] << 8 | page2A[7]); -+ p = page2A + hlen; -+ -+ /* Values guessed from the cd_mode_page_2A struct -+ * in cdrecord's libscg/scg/scsireg.h */ -+ if (len < (hlen + 30) || p[1] < (30 - 2)) { -+ /* no MMC-3 "Current Write Speed" present, -+ * try to use the MMC-2 one */ -+ if (len < (hlen + 20) || p[1] < (20 - 2)) -+ *write_speed = 0; -+ else -+ *write_speed = p[18] << 8 | p[19]; -+ } else { -+ *write_speed = p[28] << 8 | p[29]; -+ } -+ -+ if (len >= hlen+9) -+ *read_speed = p[8] << 8 | p[9]; -+ else -+ *read_speed = 0; -+ -+ *write_speeds = get_write_speeds (p, len, *write_speed); -+ -+ free (page2A); -+ -+ return 0; -+} -+ -+ -+static int -+get_disc_capacity_cd (BRASEROCDROM *cdrom, guint64 *size) -+{ -+ ScsiCommand *cmd; -+ int retval; -+ guint64 block_size; -+ guint64 num_blocks; -+ unsigned char header [8]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ retval = -1; -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ scsi_command_init (cmd, 0, 0x25); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 8)) { -+ /* READ CDROM CAPACITY failed */ -+ goto done; -+ } -+ -+ num_blocks = (header [0] << 24) | (header [1] << 16) | (header [2] << 8) | header [3]; -+ num_blocks++; -+ block_size = header [4] << 24 | header [5] << 16 | header [6] << 8 | header [7]; -+ -+ if (size) { -+ *size = num_blocks * block_size; -+ } -+ retval = 0; -+ -+ done: -+ scsi_command_free (cmd); -+ -+ return retval; -+} -+ -+static int -+get_disc_capacity_cdr (BRASEROCDROM *cdrom, guint64 *size) -+{ -+ ScsiCommand *cmd; -+ int retval; -+ guint64 secs; -+ unsigned char toc [8]; -+ unsigned char *atip; -+ int len; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ retval = -1; -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ /* READ_TOC */ -+ scsi_command_init (cmd, 0, 0x43); -+ /* FMT_ATIP */ -+ scsi_command_init (cmd, 2, 4 & 0x0F); -+ scsi_command_init (cmd, 6, 0); -+ scsi_command_init (cmd, 8, 4); -+ scsi_command_init (cmd, 9, 0); -+ -+ if (scsi_command_transport (cmd, READ, toc, 4)) { -+ /* READ TOC failed */ -+ goto done; -+ } -+ -+ len = 2 + (toc [0] << 8 | toc [1]); -+ -+ atip = g_new (unsigned char, len); -+ -+ scsi_command_init (cmd, 0, 0x43); -+ scsi_command_init (cmd, 2, 4 & 0x0F); -+ scsi_command_init (cmd, 6, 0); -+ scsi_command_init (cmd, 7, len >> 8); -+ scsi_command_init (cmd, 8, len); -+ scsi_command_init (cmd, 9, 0); -+ -+ if (scsi_command_transport (cmd, READ, atip, len)) { -+ /* READ TOC failed */ -+ free (atip); -+ goto done; -+ } -+ -+ secs = atip [12] * 60 + atip [13] + (atip [14] / 75 + 1); -+ -+ if (size) { -+ *size = (1 + secs * 7 / 48) * 1024 * 1024; -+ } -+ retval = 0; -+ -+ free (atip); -+ done: -+ scsi_command_free (cmd); -+ -+ return retval; -+} -+ -+static int -+get_disc_capacity_dvdr_from_type (BRASEROCDROM *cdrom, int type, guint64 *size) -+{ -+ ScsiCommand *cmd; -+ unsigned char formats [260]; -+ unsigned char buf [32]; -+ guint64 blocks; -+ guint64 nwa; -+ int i; -+ int len; -+ int obligatory; -+ int retval; -+ int next_track; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ retval = -1; -+ blocks = 0; -+ next_track = 1; -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ retry: -+ if (type == 0x1A || type == 0x14 || type == 0x13 || type == 0x12) { -+ -+ /* READ FORMAT CAPACITIES */ -+ scsi_command_init (cmd, 0, 0x23); -+ scsi_command_init (cmd, 8, 12); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, formats, 12)) { -+ /* READ FORMAT CAPACITIES failed */ -+ goto done; -+ } -+ -+ len = formats [3]; -+ if (len & 7 || len < 16) { -+ /* Length isn't sane */ -+ goto done; -+ } -+ -+ scsi_command_init (cmd, 0, 0x23); -+ scsi_command_init (cmd, 7, (4 + len) >> 8); -+ scsi_command_init (cmd, 8, (4 + len) & 0xFF); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, formats, 4 + len)) { -+ /* READ FORMAT CAPACITIES failed */ -+ goto done; -+ } -+ -+ if (len != formats [3]) { -+ /* Parameter length inconsistency */ -+ goto done; -+ } -+ } -+ -+ obligatory = 0x00; -+ -+ switch (type) { -+ case 0x1A: /* DVD+RW */ -+ obligatory = 0x26; -+ case 0x13: /* DVD-RW Restricted Overwrite */ -+ case 0x14: /* DVD-RW Sequential */ -+ for (i = 8, len = formats [3]; i < len; i += 8) { -+ if ((formats [4 + i + 4] >> 2) == obligatory) { -+ break; -+ } -+ } -+ -+ if (i == len) { -+ /* Can't find obligatory format descriptor */ -+ goto done; -+ } -+ -+ blocks = formats [4 + i + 0] << 24; -+ blocks |= formats [4 + i + 1] << 16; -+ blocks |= formats [4 + i + 2] << 8; -+ blocks |= formats [4 + i + 3]; -+ nwa = formats [4 + 5] << 16 | formats [4 + 6] << 8 | formats [4 + 7]; -+ if (nwa > 2048) { -+ blocks *= nwa / 2048; -+ } else if (nwa < 2048) { -+ blocks /= 2048 / nwa; -+ } -+ -+ retval = 0; -+ break; -+ -+ case 0x12: /* DVD-RAM */ -+ -+ blocks = formats [4 + 0] << 24; -+ blocks |= formats [4 + 1] << 16; -+ blocks |= formats [4 + 2] << 8; -+ blocks |= formats [4 + 3]; -+ nwa = formats [4 + 5] << 16 | formats [4 + 6] << 8 | formats [4 + 7]; -+ if (nwa > 2048) { -+ blocks *= nwa / 2048; -+ } else if (nwa < 2048) { -+ blocks /= 2048 / nwa; -+ } -+ -+ retval = 0; -+ break; -+ -+ case 0x11: /* DVD-R */ -+ case 0x1B: /* DVD+R */ -+ case 0x2B: /* DVD+R Double Layer */ -+ case 0x41: /* BD-R SRM */ -+ -+ /* READ TRACK INFORMATION */ -+ scsi_command_init (cmd, 0, 0x52); -+ scsi_command_init (cmd, 1, 1); -+ scsi_command_init (cmd, 4, next_track >> 8); -+ scsi_command_init (cmd, 5, next_track & 0xFF); -+ scsi_command_init (cmd, 8, sizeof (buf)); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, buf, sizeof (buf))) { -+ /* READ TRACK INFORMATION failed */ -+ if (next_track > 0) { -+ goto done; -+ } else { -+ next_track = 1; -+ goto retry; -+ } -+ } -+ -+ blocks = buf [24] << 24; -+ blocks |= buf [25] << 16; -+ blocks |= buf [26] << 8; -+ blocks |= buf [27]; -+ -+ retval = 0; -+ break; -+ case 0x43: /* DB-RE */ -+ /* Pull the formatted capacity */ -+ blocks = formats [4 + 0] << 24; -+ blocks |= formats [4 + 1] << 16; -+ blocks |= formats [4 + 2] << 8; -+ blocks |= formats [4 + 3]; -+ break; -+ default: -+ blocks = 0; -+ break; -+ } -+ -+ done: -+ scsi_command_free (cmd); -+ -+ if (size) { -+ *size = blocks * 2048; -+ } -+ -+ return retval; -+} -+ -+int -+brasero_cdrom_get_disc_capacity_for_type (BRASEROCDROM *cdrom, int type, guint64 *size) -+{ -+ int retval; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ retval = -1; -+ -+ switch (type) { -+ case 0x8: -+ retval = get_disc_capacity_cd (cdrom, size); -+ break; -+ case 0x9: -+ case 0xa: -+ retval = get_disc_capacity_cdr (cdrom, size); -+ break; -+ case 0x10: -+ retval = get_disc_capacity_cd (cdrom, size); -+ break; -+ case 0x11: -+ case 0x13: -+ case 0x14: -+ case 0x1B: -+ case 0x2B: -+ case 0x1A: -+ case 0x12: -+ case 0x41: -+ case 0x43: -+ retval = get_disc_capacity_dvdr_from_type (cdrom, type, size); -+ break; -+ default: -+ retval = -1; -+ } -+ -+ return retval; -+} -+ -+int -+brasero_cdrom_get_disc_type (BRASEROCDROM *cdrom) -+{ -+ ScsiCommand *cmd; -+ int retval = -1; -+ unsigned char header[8]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x46); -+ scsi_command_init (cmd, 1, 1); -+ scsi_command_init (cmd, 8, 8); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 8)) { -+ /* GET CONFIGURATION failed */ -+ scsi_command_free (cmd); -+ return -1; -+ } -+ -+ retval = (header[6]<<8)|(header[7]); -+ -+ -+ scsi_command_free (cmd); -+ return retval; -+} -+ -+int -+brasero_cdrom_get_configuration_feature (BRASEROCDROM *cdrom, -+ int feature, -+ unsigned char **buf) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ int len; -+ unsigned char header[8]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ g_return_val_if_fail (buf != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x46); -+ scsi_command_init (cmd, 1, 2); -+ scsi_command_init (cmd, 2, feature >> 8); -+ scsi_command_init (cmd, 3, feature); -+ scsi_command_init (cmd, 8, 8); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 8)) { -+ scsi_command_free (cmd); -+ return -1; -+ } -+ -+ len = 4 + (header[0] << 24 | header[1] << 16 | header[2] << 8 | header[3]); -+ if (len > 264) { -+ scsi_command_free (cmd); -+ return -1; -+ } -+ -+ *buf = g_new (unsigned char, len); -+ -+ scsi_command_init (cmd, 0, 0x46); -+ scsi_command_init (cmd, 1, 2); -+ scsi_command_init (cmd, 2, feature >> 8); -+ scsi_command_init (cmd, 3, feature); -+ scsi_command_init (cmd, 7, len >> 8); -+ scsi_command_init (cmd, 8, len); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, *buf, len)) { -+ g_free (*buf); -+ *buf = NULL; -+ retval = -1; -+ } -+ -+ scsi_command_free (cmd); -+ -+ return retval; -+} -+ -+int -+brasero_cdrom_read_disc_information_std (BRASEROCDROM *cdrom, -+ unsigned char *buf) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ g_return_val_if_fail (buf != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ /* see section 5.19 of MMC-3 from http://www.t10.org/drafts.htm#mmc3 */ -+ scsi_command_init (cmd, 0, 0x51); /* READ_DISC_INFORMATION */ -+ scsi_command_init (cmd, 8, 32); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, buf, 32)) { -+ retval = -1; -+ } -+ -+ scsi_command_free (cmd); -+ return retval; -+} -+ -+int -+brasero_cdrom_read_track_info (BRASEROCDROM *cdrom, -+ int track_num, -+ unsigned char *buf, -+ int size) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ g_return_val_if_fail (buf != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x52); -+ scsi_command_init (cmd, 1, 1); -+ scsi_command_init (cmd, 4, track_num >> 8); -+ scsi_command_init (cmd, 5, track_num & 0xFF); -+ scsi_command_init (cmd, 8, size); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, buf, size)) { -+ retval = -1; -+ } -+ -+ scsi_command_free (cmd); -+ return retval; -+} -+ -+int -+brasero_cdrom_read_toc_formatted (BRASEROCDROM *cdrom, -+ int track_num, -+ unsigned char **buf) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ int len; -+ unsigned char header[4]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ g_return_val_if_fail (buf != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x43); -+ scsi_command_init (cmd, 2, 0); -+ scsi_command_init (cmd, 6, track_num); -+ scsi_command_init (cmd, 8, 4); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 4)) { -+ scsi_command_free (cmd); -+ *buf = NULL; -+ return -1; -+ } -+ -+ len = (header[0] << 8 | header[1]) + 2; -+ -+ *buf = g_malloc0 (len); -+ -+ scsi_command_init (cmd, 8, len); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, *buf, len)) { -+ g_free (*buf); -+ *buf = NULL; -+ retval = -1; -+ } -+ -+ scsi_command_free (cmd); -+ return retval; -+} -+ -+int -+brasero_cdrom_read_toc_raw (BRASEROCDROM *cdrom, -+ int track_num, -+ unsigned char **buf) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ int len; -+ unsigned char header[4]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ g_return_val_if_fail (buf != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x43); -+ scsi_command_init (cmd, 2, 2); -+ scsi_command_init (cmd, 6, track_num); -+ scsi_command_init (cmd, 8, 4); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 4)) { -+ scsi_command_free (cmd); -+ *buf = NULL; -+ return -1; -+ } -+ -+ len = (header[0] << 8 | header[1]) + 2; -+ -+ *buf = g_malloc0 (len); -+ -+ scsi_command_init (cmd, 8, len); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, *buf, len)) { -+ g_free (*buf); -+ *buf = NULL; -+ retval = -1; -+ } -+ -+ scsi_command_free (cmd); -+ return retval; -+} -+ -+int -+brasero_cdrom_read_atip (BRASEROCDROM *cdrom, -+ unsigned char **buf) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ int len; -+ unsigned char header[4]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ g_return_val_if_fail (buf != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x43); -+ scsi_command_init (cmd, 2, 4); -+ scsi_command_init (cmd, 6, 0); -+ scsi_command_init (cmd, 8, 4); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 4)) { -+ scsi_command_free (cmd); -+ *buf = NULL; -+ return -1; -+ } -+ -+ len = (header[0] << 8 | header[1]) + 2; -+ -+ *buf = g_malloc0 (len); -+ -+ scsi_command_init (cmd, 8, len); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, *buf, len)) { -+ g_free (*buf); -+ *buf = NULL; -+ retval = -1; -+ } -+ -+ scsi_command_free (cmd); -+ return retval; -+} -+ -+int -+brasero_cdrom_read_format_capacities (BRASEROCDROM *cdrom, -+ unsigned char **buf) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ int len; -+ unsigned char header[12]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ g_return_val_if_fail (buf != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0x23); -+ scsi_command_init (cmd, 8, 12); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 12)) { -+ /* READ FORMAT CAPACITIES failed */ -+ return -1; -+ } -+ -+ len = header [3]; -+ if (len & 7 || len < 16) { -+ /* Length isn't sane */ -+ return -1; -+ } -+ -+ *buf = g_new (unsigned char, len + 4); -+ -+ scsi_command_init (cmd, 0, 0x23); -+ scsi_command_init (cmd, 7, (4 + len) >> 8); -+ scsi_command_init (cmd, 8, (4 + len) & 0xFF); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, *buf, 4 + len)) { -+ /* READ FORMAT CAPACITIES failed */ -+ g_free (*buf); -+ *buf = NULL; -+ retval = -1; -+ } -+ -+ return retval; -+} -+ -+int -+brasero_cdrom_get_performance_wrt_spd_desc (BRASEROCDROM *cdrom, -+ unsigned char **buf) -+{ -+ ScsiCommand *cmd; -+ int retval = 0; -+ int len; -+ int desc_num; -+ unsigned char header[8]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ g_return_val_if_fail (buf != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ scsi_command_init (cmd, 0, 0xac); -+ scsi_command_init (cmd, 8, 0); -+ scsi_command_init (cmd, 9, 0); -+ scsi_command_init (cmd, 10, 3); -+ scsi_command_init (cmd, 11, 0); -+ if (scsi_command_transport (cmd, READ, header, 8)) { -+ scsi_command_free (cmd); -+ *buf = NULL; -+ return -1; -+ } -+ -+ len = (header[0] << 24 | header[1] << 16 | header[2] << 8 | header[3]) + 4; -+ if (len > 2048) { -+ len = 2048; -+ } -+ -+ desc_num = (len - 8) / 12; -+ -+ *buf = g_malloc0 (len); -+ -+ scsi_command_init (cmd, 8, desc_num >> 8); -+ scsi_command_init (cmd, 9, desc_num); -+ scsi_command_init (cmd, 11, 0); -+ if (scsi_command_transport (cmd, READ, *buf, len)) { -+ g_free (*buf); -+ *buf = NULL; -+ retval = -1; -+ } -+ -+ scsi_command_free (cmd); -+ return retval; -+} -+ -+int -+brasero_cdrom_disc_is_appendable (BRASEROCDROM *cdrom) -+{ -+ ScsiCommand *cmd; -+ int retval = -1; -+ unsigned char header[32]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ /* see section 5.19 of MMC-3 from http://www.t10.org/drafts.htm#mmc3 */ -+ scsi_command_init (cmd, 0, 0x51); /* READ_DISC_INFORMATION */ -+ scsi_command_init (cmd, 8, 32); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 32)) { -+ /* READ_DISC_INFORMATION failed */ -+ scsi_command_free (cmd); -+ return 0; -+ } -+ -+ retval = ((header[2]&0x03) == 0x01); -+ -+ scsi_command_free (cmd); -+ return retval; -+} -+ -+int -+brasero_cdrom_disc_is_rewritable (BRASEROCDROM *cdrom) -+{ -+ ScsiCommand *cmd; -+ int retval = -1; -+ unsigned char header[32]; -+ -+ g_return_val_if_fail (cdrom != NULL, -1); -+ -+ cmd = scsi_command_new_from_cdrom (cdrom); -+ -+ /* see section 5.19 of MMC-3 from http://www.t10.org/drafts.htm#mmc3 */ -+ scsi_command_init (cmd, 0, 0x51); /* READ_DISC_INFORMATION */ -+ scsi_command_init (cmd, 8, 32); -+ scsi_command_init (cmd, 9, 0); -+ if (scsi_command_transport (cmd, READ, header, 32)) { -+ /* READ_DISC_INFORMATION failed */ -+ scsi_command_free (cmd); -+ return 0; -+ } -+ -+ retval = ((header[2]&0x10) != 0); -+ -+ scsi_command_free (cmd); -+ return retval; -+} diff --git a/sysutils/brasero/files/patch-src_plugins_cdrtools_burn-cdrecord.c b/sysutils/brasero/files/patch-src_plugins_cdrtools_burn-cdrecord.c deleted file mode 100644 index 583807240735..000000000000 --- a/sysutils/brasero/files/patch-src_plugins_cdrtools_burn-cdrecord.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/cdrtools/burn-cdrecord.c.orig 2008-01-02 14:59:18.000000000 -0500 -+++ src/plugins/cdrtools/burn-cdrecord.c 2008-01-02 14:59:27.000000000 -0500 -@@ -899,7 +899,7 @@ brasero_cdrecord_set_argv (BraseroProces - g_ptr_array_add (argv, g_strdup ("cdrecord")); - g_ptr_array_add (argv, g_strdup ("-v")); - -- brasero_job_get_device (BRASERO_JOB (cdrecord), &device); -+ brasero_job_get_cdrecord_device (BRASERO_JOB (cdrecord), &device); - dev_str = g_strdup_printf ("dev=%s", device); - g_ptr_array_add (argv, dev_str); - g_free (device); diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist index acbe2314bd1f..5def420562e4 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -1,8 +1,16 @@ bin/brasero +lib/brasero/plugins/libbrasero-burn-uri.la +lib/brasero/plugins/libbrasero-burn-uri.so lib/brasero/plugins/libbrasero-cdrdao.la lib/brasero/plugins/libbrasero-cdrdao.so lib/brasero/plugins/libbrasero-cdrecord.la lib/brasero/plugins/libbrasero-cdrecord.so +lib/brasero/plugins/libbrasero-checksum-file.la +lib/brasero/plugins/libbrasero-checksum-file.so +lib/brasero/plugins/libbrasero-checksum.la +lib/brasero/plugins/libbrasero-checksum.so +lib/brasero/plugins/libbrasero-dvdauthor.la +lib/brasero/plugins/libbrasero-dvdauthor.so lib/brasero/plugins/libbrasero-dvdcss.la lib/brasero/plugins/libbrasero-dvdcss.so lib/brasero/plugins/libbrasero-dvdrwformat.la @@ -13,12 +21,10 @@ lib/brasero/plugins/libbrasero-growisofs.la lib/brasero/plugins/libbrasero-growisofs.so lib/brasero/plugins/libbrasero-local-track.la lib/brasero/plugins/libbrasero-local-track.so -lib/brasero/plugins/libbrasero-md5sum-file.la -lib/brasero/plugins/libbrasero-md5sum-file.so -lib/brasero/plugins/libbrasero-md5sum.la -lib/brasero/plugins/libbrasero-md5sum.so lib/brasero/plugins/libbrasero-mkisofs.la lib/brasero/plugins/libbrasero-mkisofs.so +lib/brasero/plugins/libbrasero-normalize.la +lib/brasero/plugins/libbrasero-normalize.so lib/brasero/plugins/libbrasero-readcd.la lib/brasero/plugins/libbrasero-readcd.so lib/brasero/plugins/libbrasero-readom.la @@ -27,9 +33,17 @@ lib/brasero/plugins/libbrasero-toc2cue.la lib/brasero/plugins/libbrasero-toc2cue.so lib/brasero/plugins/libbrasero-transcode.la lib/brasero/plugins/libbrasero-transcode.so +lib/brasero/plugins/libbrasero-vcdimager.la +lib/brasero/plugins/libbrasero-vcdimager.so +lib/brasero/plugins/libbrasero-vob.la +lib/brasero/plugins/libbrasero-vob.so lib/brasero/plugins/libbrasero-wodim.la lib/brasero/plugins/libbrasero-wodim.so share/applications/brasero.desktop +share/applications/brasero-copy-medium.desktop +share/applications/brasero-open-image.desktop +share/applications/brasero-open-playlist.desktop +share/applications/brasero-open-project.desktop %%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 @@ -38,6 +52,7 @@ share/applications/brasero.desktop %%DATADIR%%/icons/hicolor/16x16/actions/media-optical-burn.png %%DATADIR%%/icons/hicolor/16x16/actions/media-optical-copy.png %%DATADIR%%/icons/hicolor/16x16/actions/media-optical-data-new.png +%%DATADIR%%/icons/hicolor/16x16/actions/media-optical-video-new.png %%DATADIR%%/icons/hicolor/16x16/actions/transform-crop-and-resize.png %%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-00.png %%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-05.png @@ -68,6 +83,7 @@ share/applications/brasero.desktop %%DATADIR%%/icons/hicolor/22x22/actions/media-optical-burn.png %%DATADIR%%/icons/hicolor/22x22/actions/media-optical-copy.png %%DATADIR%%/icons/hicolor/22x22/actions/media-optical-data-new.png +%%DATADIR%%/icons/hicolor/22x22/actions/media-optical-video-new.png %%DATADIR%%/icons/hicolor/22x22/actions/transform-crop-and-resize.png %%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-00.png %%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-05.png @@ -98,6 +114,7 @@ share/applications/brasero.desktop %%DATADIR%%/icons/hicolor/24x24/actions/media-optical-burn.png %%DATADIR%%/icons/hicolor/24x24/actions/media-optical-copy.png %%DATADIR%%/icons/hicolor/24x24/actions/media-optical-data-new.png +%%DATADIR%%/icons/hicolor/24x24/actions/media-optical-video-new.png %%DATADIR%%/icons/hicolor/24x24/actions/transform-crop-and-resize.png %%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-00.png %%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-05.png @@ -128,6 +145,7 @@ share/applications/brasero.desktop %%DATADIR%%/icons/hicolor/32x32/actions/media-optical-burn.png %%DATADIR%%/icons/hicolor/32x32/actions/media-optical-copy.png %%DATADIR%%/icons/hicolor/32x32/actions/media-optical-data-new.png +%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-video-new.png %%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-00.png %%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-05.png %%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-10.png @@ -149,6 +167,7 @@ share/applications/brasero.desktop %%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-85.png %%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-90.png %%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-95.png +%%DATADIR%%/icons/hicolor/48x48/actions/media-optical-video-new.png %%DATADIR%%/icons/hicolor/scalable/actions/insert-pause.svg %%DATADIR%%/icons/hicolor/scalable/actions/iso-image-burn.svg %%DATADIR%%/icons/hicolor/scalable/actions/iso-image-new.svg @@ -180,6 +199,25 @@ share/applications/brasero.desktop %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg %%DATADIR%%/logo.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/de/brasero.xml +share/gnome/help/brasero/de/figures/brasero_main.png +share/gnome/help/brasero/el/brasero.xml +share/gnome/help/brasero/el/figures/brasero_main.png +share/gnome/help/brasero/es/brasero.xml +share/gnome/help/brasero/es/figures/brasero_main.png +share/gnome/help/brasero/fr/brasero.xml +share/gnome/help/brasero/fr/figures/brasero_main.png +share/gnome/help/brasero/it/brasero.xml +share/gnome/help/brasero/it/figures/brasero_main.png +share/gnome/help/brasero/pl/brasero.xml +share/gnome/help/brasero/pl/figures/brasero_main.png +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/icons/hicolor/16x16/apps/brasero.png share/icons/hicolor/22x22/apps/brasero.png share/icons/hicolor/24x24/apps/brasero.png @@ -189,10 +227,13 @@ share/icons/hicolor/scalable/apps/brasero.svg share/locale/ar/LC_MESSAGES/brasero.mo share/locale/ca/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 share/locale/dz/LC_MESSAGES/brasero.mo +share/locale/el/LC_MESSAGES/brasero.mo share/locale/en_GB/LC_MESSAGES/brasero.mo share/locale/es/LC_MESSAGES/brasero.mo +share/locale/et/LC_MESSAGES/brasero.mo share/locale/fi/LC_MESSAGES/brasero.mo share/locale/fr/LC_MESSAGES/brasero.mo share/locale/gl/LC_MESSAGES/brasero.mo @@ -203,17 +244,52 @@ share/locale/ja/LC_MESSAGES/brasero.mo share/locale/lt/LC_MESSAGES/brasero.mo share/locale/mk/LC_MESSAGES/brasero.mo share/locale/nb/LC_MESSAGES/brasero.mo +share/locale/nl/LC_MESSAGES/brasero.mo share/locale/oc/LC_MESSAGES/brasero.mo share/locale/pa/LC_MESSAGES/brasero.mo share/locale/pl/LC_MESSAGES/brasero.mo share/locale/pt/LC_MESSAGES/brasero.mo share/locale/pt_BR/LC_MESSAGES/brasero.mo +share/locale/ro/LC_MESSAGES/brasero.mo share/locale/ru/LC_MESSAGES/brasero.mo share/locale/sl/LC_MESSAGES/brasero.mo share/locale/sr/LC_MESSAGES/brasero.mo -share/locale/sr@Latn/LC_MESSAGES/brasero.mo +share/locale/sr@latin/LC_MESSAGES/brasero.mo share/locale/sv/LC_MESSAGES/brasero.mo +share/locale/th/LC_MESSAGES/brasero.mo +share/locale/zh_CN/LC_MESSAGES/brasero.mo +share/locale/zh_HK/LC_MESSAGES/brasero.mo +share/locale/zh_TW/LC_MESSAGES/brasero.mo share/mime/packages/brasero.xml +share/omf/brasero/brasero-C.omf +share/omf/brasero/brasero-de.omf +share/omf/brasero/brasero-el.omf +share/omf/brasero/brasero-es.omf +share/omf/brasero/brasero-fr.omf +share/omf/brasero/brasero-it.omf +share/omf/brasero/brasero-pl.omf +share/omf/brasero/brasero-ru.omf +share/omf/brasero/brasero-sv.omf +@dirrm share/omf/brasero +@dirrm share/gnome/help/brasero/sv/figures +@dirrm share/gnome/help/brasero/sv +@dirrm share/gnome/help/brasero/ru/figures +@dirrm share/gnome/help/brasero/ru +@dirrm share/gnome/help/brasero/pl/figures +@dirrm share/gnome/help/brasero/pl +@dirrm share/gnome/help/brasero/it/figures +@dirrm share/gnome/help/brasero/it +@dirrm share/gnome/help/brasero/fr/figures +@dirrm share/gnome/help/brasero/fr +@dirrm share/gnome/help/brasero/es/figures +@dirrm share/gnome/help/brasero/es +@dirrm share/gnome/help/brasero/el/figures +@dirrm share/gnome/help/brasero/el +@dirrm share/gnome/help/brasero/de/figures +@dirrm share/gnome/help/brasero/de +@dirrm share/gnome/help/brasero/C/figures +@dirrm share/gnome/help/brasero/C +@dirrm share/gnome/help/brasero @dirrm %%DATADIR%%/icons/hicolor/16x16/status @dirrm %%DATADIR%%/icons/hicolor/16x16/actions @dirrm %%DATADIR%%/icons/hicolor/16x16 @@ -226,6 +302,8 @@ share/mime/packages/brasero.xml @dirrm %%DATADIR%%/icons/hicolor/32x32/status @dirrm %%DATADIR%%/icons/hicolor/32x32/actions @dirrm %%DATADIR%%/icons/hicolor/32x32 +@dirrm %%DATADIR%%/icons/hicolor/48x48/actions +@dirrm %%DATADIR%%/icons/hicolor/48x48 @dirrm %%DATADIR%%/icons/hicolor/scalable/status @dirrm %%DATADIR%%/icons/hicolor/scalable/actions @dirrm %%DATADIR%%/icons/hicolor/scalable @@ -239,6 +317,12 @@ share/mime/packages/brasero.xml @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/dz/LC_MESSAGES diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index 99380b6056c2..b8f72ae5353d 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -3,10 +3,10 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/consolekit/Makefile,v 1.12 2008/02/27 15:13:25 ahze Exp $ +# $MCom: ports/sysutils/consolekit/Makefile,v 1.19 2008/12/24 16:12:03 marcus Exp $ PORTNAME= consolekit -PORTVERSION= 0.2.10 +PORTVERSION= 0.3.0 PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= http://people.freedesktop.org/~mccann/dist/ @@ -19,8 +19,9 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ polkit.2:${PORTSDIR}/sysutils/policykit WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION} +USE_BZIP2= yes USE_XORG= x11 -USE_GNOME= gnomehack gnometarget +USE_GNOME= gnomehack USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo index be86390034c1..ef1243c68ef1 100644 --- a/sysutils/consolekit/distinfo +++ b/sysutils/consolekit/distinfo @@ -1,3 +1,3 @@ -MD5 (ConsoleKit-0.2.10.tar.gz) = b85c2333a8fe31c0d3f29caa14716634 -SHA256 (ConsoleKit-0.2.10.tar.gz) = 02b9510f65256db33a5e079736bb7234cd5599bf02dc77399d81d50cf5183bcb -SIZE (ConsoleKit-0.2.10.tar.gz) = 521473 +MD5 (ConsoleKit-0.3.0.tar.bz2) = 43b02a52212330b54cfb34c4044d9ce0 +SHA256 (ConsoleKit-0.3.0.tar.bz2) = cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4 +SIZE (ConsoleKit-0.3.0.tar.bz2) = 393694 diff --git a/sysutils/consolekit/files/patch-data_ConsoleKit.conf b/sysutils/consolekit/files/patch-data_ConsoleKit.conf new file mode 100644 index 000000000000..155e92ec6edd --- /dev/null +++ b/sysutils/consolekit/files/patch-data_ConsoleKit.conf @@ -0,0 +1,11 @@ +--- data/ConsoleKit.conf.orig 2008-12-24 11:06:53.000000000 -0500 ++++ data/ConsoleKit.conf 2008-12-24 11:07:17.000000000 -0500 +@@ -91,6 +91,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/pkg-plist b/sysutils/consolekit/pkg-plist index ccd01266314e..01d42a80cbdc 100644 --- a/sysutils/consolekit/pkg-plist +++ b/sysutils/consolekit/pkg-plist @@ -17,7 +17,10 @@ libexec/ck-collect-session-info libexec/ck-get-x11-display-device libexec/ck-get-x11-server-pid sbin/console-kit-daemon -share/PolicyKit/policy/ConsoleKit.policy +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 @exec mkdir -p %D/etc/ConsoleKit/run-session.d @exec mkdir -p %D/lib/ConsoleKit/run-session.d diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index 74922e2abe50..b70b81a1d423 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.68 2008/03/11 03:54:37 mezz Exp $ +# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.73 2008/10/20 03:33:50 mezz Exp $ # PORTNAME= gconf-editor -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.24.1 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index 45fda8d93de9..be688026ef07 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconf-editor-2.22.0.tar.bz2) = 7ca99aec214dd855b5de7dacc8937055 -SHA256 (gnome2/gconf-editor-2.22.0.tar.bz2) = e701134a1f5293070ca7d8d6311468f61e3a9765ebc520fcca6a0a38b214b7dc -SIZE (gnome2/gconf-editor-2.22.0.tar.bz2) = 873868 +MD5 (gnome2/gconf-editor-2.24.1.tar.bz2) = 2fe93cb2ac8ea0d34860cc6d059076d8 +SHA256 (gnome2/gconf-editor-2.24.1.tar.bz2) = 7d63d9f4c23da91b2b06fe264ff4d1c40c20563220525837de7bb2dc442821fb +SIZE (gnome2/gconf-editor-2.24.1.tar.bz2) = 1142041 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 817b8e2afc39..0847ce9d5ddd 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -1,8 +1,18 @@ bin/gconf-editor share/applications/gconf-editor.desktop +%%DATADIR%%/icons/hicolor/16x16/status/type-boolean.png +%%DATADIR%%/icons/hicolor/16x16/status/type-float.png +%%DATADIR%%/icons/hicolor/16x16/status/type-integer.png +%%DATADIR%%/icons/hicolor/16x16/status/type-list.png +%%DATADIR%%/icons/hicolor/16x16/status/type-pair.png +%%DATADIR%%/icons/hicolor/16x16/status/type-schema.png +%%DATADIR%%/icons/hicolor/16x16/status/type-string.png +%%DATADIR%%/icons/hicolor/16x16/status/type-undefined.png share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/C/gconf-editor.xml share/gnome/help/gconf-editor/C/legal.xml +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/de/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/de/gconf-editor.xml share/gnome/help/gconf-editor/es/figures/gconf_editor_anno_window.png @@ -13,8 +23,14 @@ share/gnome/help/gconf-editor/it/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/it/gconf-editor.xml share/gnome/help/gconf-editor/oc/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/oc/gconf-editor.xml +share/gnome/help/gconf-editor/pt_BR/figures/gconf_editor_anno_window.png +share/gnome/help/gconf-editor/pt_BR/gconf-editor.xml +share/gnome/help/gconf-editor/ru/figures/gconf_editor_anno_window.png +share/gnome/help/gconf-editor/ru/gconf-editor.xml share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/sv/gconf-editor.xml +share/gnome/help/gconf-editor/th/figures/gconf_editor_anno_window.png +share/gnome/help/gconf-editor/th/gconf-editor.xml share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/uk/gconf-editor.xml share/icons/hicolor/48x48/apps/gconf-editor.png @@ -85,7 +101,7 @@ share/locale/sk/LC_MESSAGES/gconf-editor.mo share/locale/sl/LC_MESSAGES/gconf-editor.mo share/locale/sq/LC_MESSAGES/gconf-editor.mo share/locale/sr/LC_MESSAGES/gconf-editor.mo -share/locale/sr@Latn/LC_MESSAGES/gconf-editor.mo +share/locale/sr@latin/LC_MESSAGES/gconf-editor.mo share/locale/sv/LC_MESSAGES/gconf-editor.mo share/locale/ta/LC_MESSAGES/gconf-editor.mo share/locale/te/LC_MESSAGES/gconf-editor.mo @@ -99,27 +115,28 @@ share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo 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-de.omf share/omf/gconf-editor/gconf-editor-es.omf share/omf/gconf-editor/gconf-editor-fr.omf share/omf/gconf-editor/gconf-editor-it.omf share/omf/gconf-editor/gconf-editor-oc.omf +share/omf/gconf-editor/gconf-editor-pt_BR.omf +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/pixmaps/gconf-editor/entry-blank.png -share/pixmaps/gconf-editor/entry-bool.png -share/pixmaps/gconf-editor/entry-list.png -share/pixmaps/gconf-editor/entry-number.png -share/pixmaps/gconf-editor/entry-schema.png -share/pixmaps/gconf-editor/entry-string.png -share/pixmaps/gconf-editor/folder-closed.png -share/pixmaps/gconf-editor/folder-open.png -@dirrm share/pixmaps/gconf-editor @dirrm share/omf/gconf-editor @dirrm share/gnome/help/gconf-editor/uk/figures @dirrm share/gnome/help/gconf-editor/uk +@dirrm share/gnome/help/gconf-editor/th/figures +@dirrm share/gnome/help/gconf-editor/th @dirrm share/gnome/help/gconf-editor/sv/figures @dirrm share/gnome/help/gconf-editor/sv +@dirrm share/gnome/help/gconf-editor/ru/figures +@dirrm share/gnome/help/gconf-editor/ru +@dirrm share/gnome/help/gconf-editor/pt_BR/figures +@dirrm share/gnome/help/gconf-editor/pt_BR @dirrm share/gnome/help/gconf-editor/oc/figures @dirrm share/gnome/help/gconf-editor/oc @dirrm share/gnome/help/gconf-editor/it/figures @@ -130,9 +147,16 @@ share/pixmaps/gconf-editor/folder-open.png @dirrm share/gnome/help/gconf-editor/es @dirrm share/gnome/help/gconf-editor/de/figures @dirrm share/gnome/help/gconf-editor/de +@dirrm share/gnome/help/gconf-editor/ca/figures +@dirrm share/gnome/help/gconf-editor/ca @dirrm share/gnome/help/gconf-editor/C/figures @dirrm share/gnome/help/gconf-editor/C @dirrm share/gnome/help/gconf-editor +@dirrm %%DATADIR%%/icons/hicolor/16x16/status +@dirrm %%DATADIR%%/icons/hicolor/16x16 +@dirrm %%DATADIR%%/icons/hicolor +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%% @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @@ -142,6 +166,8 @@ share/pixmaps/gconf-editor/folder-open.png @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 6cfb7d37ef66..5c04d9169623 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.172 2008/03/10 21:50:24 mezz Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.185 2008/09/24 21:51:29 mezz Exp $ # PORTNAME= gnome-control-center -PORTVERSION= 2.22.2.1 -PORTREVISION= 1 +PORTVERSION= 2.24.0.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project -LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra 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 @@ -38,8 +37,7 @@ CONFIGURE_ARGS= --enable-gstreamer=0.10 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= control-center.schemas \ - fontilus.schemas themus.schemas +GCONF_SCHEMAS= 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 576909a4ab58..b44bbd7bb3d9 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-control-center-2.22.2.1.tar.bz2) = f708092437fff488656c01665cbe6ae9 -SHA256 (gnome2/gnome-control-center-2.22.2.1.tar.bz2) = a13eda3ffc0ec353d1b0414238f70e08155179f24cda2f4afba6d905a601e56a -SIZE (gnome2/gnome-control-center-2.22.2.1.tar.bz2) = 2110331 +MD5 (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = dcaf6e91fddbb1d57d045a4de34ec25c +SHA256 (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = fa5d1ba5cb2f88d3c689c8a2bceb57508777a23cff020dcf2de67ad81b0fe57d +SIZE (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = 2113356 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 ac875d14d9b9..d0e21a6c33b9 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,20 @@ ---- capplets/common/gnome-theme-info.c.orig 2007-10-30 18:58:26.000000000 -0400 -+++ capplets/common/gnome-theme-info.c 2007-11-01 08:43:25.067405773 -0400 -@@ -661,7 +661,7 @@ - theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL); - g_free (filename); - -- theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL); -+ theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL); - theme_info->name = g_strdup (theme_info->path); - - if (!strcmp (theme_info->path, cursor_font)) -@@ -1922,7 +1922,7 @@ - gnome_vfs_uri_unref (top_theme_dir_uri); +--- 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_uri = gnome_vfs_uri_new ("/usr/share/icons"); -+ top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons"); - if (!gnome_vfs_uri_exists (top_theme_dir_uri)) - gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775); - add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL); +- 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 () + #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); diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr index 26d4dbe929b2..fba462829c6c 100644 --- a/sysutils/gnome-control-center/pkg-descr +++ b/sysutils/gnome-control-center/pkg-descr @@ -1 +1,3 @@ Configuration tools tightly integrated within the GNOME 2 desktop. + +WWW: http://www.gnome.org diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 78f78520bd9d..84ba2af16290 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -6,42 +6,25 @@ bin/gnome-at-visual bin/gnome-control-center bin/gnome-default-applications-properties bin/gnome-display-properties -bin/gnome-font-viewer bin/gnome-keybinding-properties bin/gnome-keyboard-properties bin/gnome-mouse-properties bin/gnome-network-preferences bin/gnome-sound-properties -bin/gnome-theme-thumbnailer -bin/gnome-thumbnail-font bin/gnome-typing-monitor bin/gnome-window-properties -bin/themus-theme-applier -etc/gnome-vfs-2.0/modules/font-method.conf -etc/gnome-vfs-2.0/modules/theme-method.conf etc/xdg/autostart/gnome-at-session.desktop etc/xdg/menus/gnomecc.menu include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h -lib/gnome-vfs-2.0/modules/libfont-method.a -lib/gnome-vfs-2.0/modules/libfont-method.la -lib/gnome-vfs-2.0/modules/libfont-method.so -lib/gnome-vfs-2.0/modules/libtheme-method.a -lib/gnome-vfs-2.0/modules/libtheme-method.la -lib/gnome-vfs-2.0/modules/libtheme-method.so lib/libgnome-window-settings.a lib/libgnome-window-settings.la lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 -lib/nautilus/extensions-2.0/libnautilus-fontilus.a -lib/nautilus/extensions-2.0/libnautilus-fontilus.la -lib/nautilus/extensions-2.0/libnautilus-fontilus.so -lib/nautilus/extensions-2.0/libnautilus-themus.a -lib/nautilus/extensions-2.0/libnautilus-themus.la -lib/nautilus/extensions-2.0/libnautilus-themus.so lib/window-manager-settings/libmetacity.a lib/window-manager-settings/libmetacity.la lib/window-manager-settings/libmetacity.so +libdata/pkgconfig/gnome-default-applications.pc libdata/pkgconfig/gnome-keybindings.pc libdata/pkgconfig/gnome-window-settings-2.0.pc share/applications/at-properties.desktop @@ -49,7 +32,6 @@ share/applications/default-applications.desktop share/applications/display-properties.desktop %%ABOUTME%%share/applications/gnome-about-me.desktop share/applications/gnome-appearance-properties.desktop -share/applications/gnome-font-viewer.desktop share/applications/gnome-network-preferences.desktop share/applications/gnome-settings-mouse.desktop share/applications/gnome-settings-sound.desktop @@ -57,14 +39,12 @@ share/applications/gnome-theme-installer.desktop share/applications/gnomecc.desktop share/applications/keybinding.desktop share/applications/keyboard.desktop -share/applications/themus-theme-applier.desktop share/applications/window-properties.desktop -share/desktop-directories/font-method.directory share/desktop-directories/gnomecc.directory -share/desktop-directories/theme-method.directory +%%DATADIR%%/default-apps/gnome-default-applications.xml %%DATADIR%%/glade/appearance.glade -%%DATADIR%%/glade/apply-font.glade %%DATADIR%%/glade/at-enable-dialog.glade +%%DATADIR%%/glade/display-capplet.glade %%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade %%DATADIR%%/glade/gnome-default-applications-properties.glade %%DATADIR%%/glade/gnome-keybinding-properties.glade @@ -73,7 +53,6 @@ share/desktop-directories/theme-method.directory %%DATADIR%%/glade/gnome-network-preferences.glade %%DATADIR%%/glade/gnome-window-properties.glade %%DATADIR%%/glade/sound-properties.glade -%%DATADIR%%/gnome-default-applications.xml %%DATADIR%%/keybindings/00-multimedia-key.xml %%DATADIR%%/keybindings/01-desktop-key.xml %%DATADIR%%/pixmaps/at-startup.png @@ -99,7 +78,6 @@ share/desktop-directories/theme-method.directory %%DATADIR%%/pixmaps/subpixel-vbgr.png %%DATADIR%%/pixmaps/subpixel-vrgb.png %%DATADIR%%/pixmaps/theme-thumbnailing.png -%%DATADIR%%/pixmaps/visual-bell.png %%DATADIR%%/pixmaps/window-theme-thumbnailing.png share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf @@ -137,17 +115,22 @@ share/gnome/help/control-center/vi/control-center.xml share/gnome/help/control-center/zh_CN/control-center.xml share/icons/hicolor/16x16/apps/gnome-display-properties.png share/icons/hicolor/16x16/apps/gnome-network-preferences.png +share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png share/icons/hicolor/16x16/apps/gnome-sound-properties.png share/icons/hicolor/22x22/apps/gnome-display-properties.png share/icons/hicolor/22x22/apps/gnome-network-preferences.png +share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png share/icons/hicolor/22x22/apps/gnome-sound-properties.png share/icons/hicolor/24x24/apps/gnome-display-properties.png share/icons/hicolor/24x24/apps/gnome-network-preferences.png +share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png share/icons/hicolor/24x24/apps/gnome-sound-properties.png share/icons/hicolor/32x32/apps/gnome-display-properties.png share/icons/hicolor/32x32/apps/gnome-network-preferences.png +share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png share/icons/hicolor/32x32/apps/gnome-sound-properties.png share/icons/hicolor/48x48/apps/gnome-network-preferences.png +share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png share/icons/hicolor/48x48/apps/gnome-sound-properties.png share/icons/hicolor/48x48/apps/typing-monitor.png share/icons/hicolor/scalable/apps/gnome-display-properties.svg @@ -223,7 +206,7 @@ share/locale/sk/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/sl/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/sq/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/sr/LC_MESSAGES/gnome-control-center-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/sv/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo @@ -278,6 +261,7 @@ share/omf/control-center/control-center-zh_CN.omf @dirrm share/gnome/cursor-fonts @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/glade +@dirrm %%DATADIR%%/default-apps @dirrmtry share/desktop-directories @dirrmtry share/applications @dirrm lib/window-manager-settings @@ -295,6 +279,8 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index d504b852fc0a..0d3f5972d4c3 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -3,15 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.40 2008/03/10 22:50:08 ahze Exp $ +# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.50 2008/11/19 19:49:56 mezz Exp $ # PORTNAME= gnome-power-manager -PORTVERSION= 2.22.1 -PORTREVISION= 2 +PORTVERSION= 2.24.2 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,7 +18,8 @@ COMMENT= Power management system for the GNOME Desktop BUILD_DEPENDS= docbook2html:${PORTSDIR}/textproc/docbook-utils \ ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ - notify.1:${PORTSDIR}/devel/libnotify + notify.1:${PORTSDIR}/devel/libnotify \ + execinfo:${PORTSDIR}/devel/libexecinfo USE_GETTEXT= yes USE_BZIP2= yes @@ -31,8 +30,7 @@ USE_AUTOTOOLS= libtool:15 USE_GSTREAMER= good USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \ gnomedocutils gnomepanel -CONFIGURE_ARGS= --disable-icon-framing \ - --with-doc-dir=${PREFIX}/share/doc \ +CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \ --disable-docbook-docs CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo index f7a63e0531cc..c732c2195001 100644 --- a/sysutils/gnome-power-manager/distinfo +++ b/sysutils/gnome-power-manager/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-power-manager-2.22.1.tar.bz2) = bfb10f96771dd161ff16171f78a7dc21 -SHA256 (gnome2/gnome-power-manager-2.22.1.tar.bz2) = 967dc61382e85dd6d8a8da74e9847760bbb429a3fdb97ab2f4f69bf574b0c1c4 -SIZE (gnome2/gnome-power-manager-2.22.1.tar.bz2) = 3002440 +MD5 (gnome2/gnome-power-manager-2.24.2.tar.bz2) = c8971e0c4ed060e0182785321f19b961 +SHA256 (gnome2/gnome-power-manager-2.24.2.tar.bz2) = ebf81236c9405ba47e7a21767c2372f2c3abb44cc671bac8662d2aeb3e746dbc +SIZE (gnome2/gnome-power-manager-2.24.2.tar.bz2) = 2997150 diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in new file mode 100644 index 000000000000..8bbbfb172700 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-src_Makefile.in @@ -0,0 +1,29 @@ +--- src/Makefile.in.orig 2008-09-29 17:30:53.000000000 -0400 ++++ src/Makefile.in 2008-09-29 17:35:03.000000000 -0400 +@@ -471,7 +471,7 @@ gnome_power_statistics_SOURCES = \ + $(NULL) + + gnome_power_statistics_LDADD = $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) \ +- $(LOCAL_LIBDBUS_LIBS) $(LOCAL_LIBUNIQUE_LIBS) $(NULL) \ ++ $(LOCAL_LIBDBUS_LIBS) $(LOCAL_LIBUNIQUE_LIBS) -lexecinfo $(NULL) \ + $(am__append_1) + gnome_power_preferences_SOURCES = \ + egg-debug.h \ +@@ -499,7 +499,7 @@ gnome_power_preferences_SOURCES = \ + gnome_power_preferences_LDADD = $(GLIB_LIBS) $(GNOME_LIBS) $(HAL_LIBS) \ + $(DBUS_LIBS) $(POLKIT_GNOME_LIBS) $(GPM_EXTRA_LIBS) \ + $(LOCAL_LIBHAL_LIBS) $(LOCAL_LIBDBUS_LIBS) \ +- $(LOCAL_LIBUNIQUE_LIBS) $(NULL) $(am__append_2) ++ $(LOCAL_LIBUNIQUE_LIBS) -lexecinfo $(NULL) $(am__append_2) + gnome_power_manager_SOURCES = \ + egg-color.c \ + egg-color.h \ +@@ -588,7 +588,7 @@ gnome_power_manager_SOURCES = \ + gnome_power_manager_LDADD = $(GLIB_LIBS) $(GSTREAMER_LIBS) \ + $(GNOME_LIBS) $(HAL_LIBS) $(POLKIT_LIBS) $(DBUS_LIBS) \ + $(XRANDR_LIBS) $(GPM_EXTRA_LIBS) $(LOCAL_LIBHAL_LIBS) \ +- $(LOCAL_LIBDBUS_LIBS) $(NULL) $(am__append_3) ++ $(LOCAL_LIBDBUS_LIBS) -lexecinfo $(NULL) $(am__append_3) + gnome_power_self_test_SOURCES = \ + egg-color.c \ + egg-color.h \ diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist index 6e72d046a507..9329befef483 100644 --- a/sysutils/gnome-power-manager/pkg-plist +++ b/sysutils/gnome-power-manager/pkg-plist @@ -16,8 +16,6 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%DATADIR%%/gpm-feedback-widget.glade %%DATADIR%%/gpm-graph.glade %%DATADIR%%/gpm-inhibit-test.glade -%%DATADIR%%/gpm-lid-down.wav -%%DATADIR%%/gpm-lid-up.wav %%DATADIR%%/gpm-prefs.glade %%DATADIR%%/gpm-suspend-failure.wav %%DATADIR%%/gpm-unplugged.wav @@ -440,6 +438,7 @@ share/icons/hicolor/scalable/apps/gnome-power-manager.svg share/icons/hicolor/scalable/apps/gnome-power-statistics.svg share/locale/ar/LC_MESSAGES/gnome-power-manager.mo share/locale/as/LC_MESSAGES/gnome-power-manager.mo +share/locale/ast/LC_MESSAGES/gnome-power-manager.mo share/locale/be@latin/LC_MESSAGES/gnome-power-manager.mo share/locale/bg/LC_MESSAGES/gnome-power-manager.mo share/locale/bn/LC_MESSAGES/gnome-power-manager.mo @@ -466,6 +465,7 @@ share/locale/he/LC_MESSAGES/gnome-power-manager.mo share/locale/hi/LC_MESSAGES/gnome-power-manager.mo share/locale/hu/LC_MESSAGES/gnome-power-manager.mo share/locale/id/LC_MESSAGES/gnome-power-manager.mo +share/locale/is/LC_MESSAGES/gnome-power-manager.mo share/locale/it/LC_MESSAGES/gnome-power-manager.mo share/locale/ja/LC_MESSAGES/gnome-power-manager.mo share/locale/ka/LC_MESSAGES/gnome-power-manager.mo @@ -493,9 +493,10 @@ share/locale/si/LC_MESSAGES/gnome-power-manager.mo share/locale/sk/LC_MESSAGES/gnome-power-manager.mo share/locale/sl/LC_MESSAGES/gnome-power-manager.mo share/locale/sr/LC_MESSAGES/gnome-power-manager.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-power-manager.mo +share/locale/sr@latin/LC_MESSAGES/gnome-power-manager.mo share/locale/sv/LC_MESSAGES/gnome-power-manager.mo share/locale/ta/LC_MESSAGES/gnome-power-manager.mo +share/locale/te/LC_MESSAGES/gnome-power-manager.mo share/locale/th/LC_MESSAGES/gnome-power-manager.mo share/locale/tr/LC_MESSAGES/gnome-power-manager.mo share/locale/uk/LC_MESSAGES/gnome-power-manager.mo @@ -556,6 +557,10 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/oc/LC_MESSAGES @@ -572,5 +577,7 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index b55349a20c0f..78f670a8e3f5 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,14 +3,14 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.16 2008/03/14 06:19:50 mezz Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.31 2008/11/25 16:39:52 marcus Exp $ # PORTNAME= gnome-settings-daemon -PORTVERSION= 2.22.2.1 -PORTREVISION= 1 +PORTVERSION= 2.24.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 settings daemon @@ -22,11 +22,13 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd 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 \ + apps_gnome_settings_daemon_xrandr.schemas \ apps_gnome_settings_daemon_screensaver.schemas \ desktop_gnome_font_rendering.schemas \ gnome-settings-daemon.schemas diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo index 916b4aeee94b..bdcc78e1d6a5 100644 --- a/sysutils/gnome-settings-daemon/distinfo +++ b/sysutils/gnome-settings-daemon/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-settings-daemon-2.22.2.1.tar.bz2) = f4dd22b68ffd7cb0b6f6ebd570ad4365 -SHA256 (gnome-settings-daemon-2.22.2.1.tar.bz2) = 72cb9aee096019a2925fb5b99a5e880d01f7d529d4c9e75dfbbea1b1f654d7a9 -SIZE (gnome-settings-daemon-2.22.2.1.tar.bz2) = 1139262 +MD5 (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = 841447fa690a3a4712e9ddaec2584824 +SHA256 (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70 +SIZE (gnome2/gnome-settings-daemon-2.24.1.tar.bz2) = 1131518 diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c new file mode 100644 index 000000000000..8820c1482a96 --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-plugins_background_gsd-background-manager.c @@ -0,0 +1,21 @@ +--- plugins/background/gsd-background-manager.c.orig 2008-11-03 13:25:29.000000000 -0600 ++++ plugins/background/gsd-background-manager.c 2008-11-03 13:28:16.000000000 -0600 +@@ -160,6 +160,18 @@ + GdkDisplay *display; + int n_screens; + int i; ++ GConfClient *client; ++ gboolean enabled; ++ ++ client = gconf_client_get_default (); ++ ++ enabled = gconf_client_get_bool (client, ++ "/desktop/gnome/background/draw_background", ++ NULL); ++ g_object_unref (client); ++ ++ if (!enabled) ++ return FALSE; + + if (nautilus_is_running ()) { + return; diff --git a/sysutils/gnome-settings-daemon/pkg-descr b/sysutils/gnome-settings-daemon/pkg-descr index 42b586789ffe..9ce205e84f33 100644 --- a/sysutils/gnome-settings-daemon/pkg-descr +++ b/sysutils/gnome-settings-daemon/pkg-descr @@ -1 +1,3 @@ GNOME 2 settings daemon. + +WWW: http://www.gnome.org diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist index 5b7ee38e5a94..9711a5722e9f 100644 --- a/sysutils/gnome-settings-daemon/pkg-plist +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -1,9 +1,11 @@ +etc/xdg/autostart/gnome-settings-daemon.desktop include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.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 lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin lib/gnome-settings-daemon-2.0/liba11y-keyboard.a @@ -21,6 +23,9 @@ 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 +lib/gnome-settings-daemon-2.0/libhousekeeping.a +lib/gnome-settings-daemon-2.0/libhousekeeping.la +lib/gnome-settings-daemon-2.0/libhousekeeping.so lib/gnome-settings-daemon-2.0/libkeybindings.a lib/gnome-settings-daemon-2.0/libkeybindings.la lib/gnome-settings-daemon-2.0/libkeybindings.so @@ -64,6 +69,7 @@ libexec/gnome-settings-daemon share/dbus-1/services/org.gnome.SettingsDaemon.service %%DATADIR%%/acme-eject.png %%DATADIR%%/acme.glade +%%DATADIR%%/gsd-a11y-preferences-dialog.glade %%DATADIR%%/modmap-dialog.glade %%DATADIR%%/xrdb/Editres.ad %%DATADIR%%/xrdb/Emacs.ad @@ -71,6 +77,11 @@ share/dbus-1/services/org.gnome.SettingsDaemon.service %%DATADIR%%/xrdb/Motif.ad %%DATADIR%%/xrdb/Tk.ad %%DATADIR%%/xrdb/Xaw.ad +share/icons/hicolor/16x16/apps/gsd-xrandr.png +share/icons/hicolor/22x22/apps/gsd-xrandr.png +share/icons/hicolor/24x24/apps/gsd-xrandr.png +share/icons/hicolor/32x32/apps/gsd-xrandr.png +share/icons/hicolor/scalable/apps/gsd-xrandr.svg share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo @@ -109,6 +120,7 @@ share/locale/is/LC_MESSAGES/gnome-settings-daemon.mo share/locale/it/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ja/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ka/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/kn/LC_MESSAGES/gnome-settings-daemon.mo 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 @@ -138,7 +150,7 @@ share/locale/sk/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sl/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sq/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sr/LC_MESSAGES/gnome-settings-daemon.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/sr@latin/LC_MESSAGES/gnome-settings-daemon.mo share/locale/sv/LC_MESSAGES/gnome-settings-daemon.mo share/locale/ta/LC_MESSAGES/gnome-settings-daemon.mo share/locale/te/LC_MESSAGES/gnome-settings-daemon.mo @@ -157,6 +169,8 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrm lib/gnome-settings-daemon-2.0 @dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon @dirrm include/gnome-settings-daemon-2.0 +@dirrmtry etc/xdg/autostart +@dirrmtry etc/xdg @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -165,6 +179,8 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index fe550dfdab62..76c15be1bb66 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.117 2008/03/10 22:04:22 mezz Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.128 2008/10/21 03:42:01 mezz Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.22.4 +PORTVERSION= 2.24.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 9bf0b07350a3..97f5d884b504 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.22.4.tar.bz2) = ac14b969d88446a88bbadf9d53007b58 -SHA256 (gnome2/gnome-system-monitor-2.22.4.tar.bz2) = 25ae605cc7ac2f54e87103f2d2cf63397695fa5f5cb0768a16339cdd7b4ffdec -SIZE (gnome2/gnome-system-monitor-2.22.4.tar.bz2) = 1921669 +MD5 (gnome2/gnome-system-monitor-2.24.1.tar.bz2) = f28977135e37a78442f5df05b796480c +SHA256 (gnome2/gnome-system-monitor-2.24.1.tar.bz2) = 1ac282e9db2871d1274b2bd72f6d15d7ffc7cd8d9932f0ac4903d383f98cc59c +SIZE (gnome2/gnome-system-monitor-2.24.1.tar.bz2) = 2004578 diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp new file mode 100644 index 000000000000..c00526174921 --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp @@ -0,0 +1,14 @@ +--- src/openfiles.cpp.orig 2008-05-27 16:16:46.000000000 -0400 ++++ src/openfiles.cpp 2008-05-27 16:19:53.000000000 -0400 +@@ -66,7 +66,11 @@ friendlier_hostname(const char *addr_str + goto failsafe; + + if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname, ++#ifdef NI_IDN + sizeof hostname, service, sizeof service, NI_IDN)) ++#else ++ sizeof hostname, service, sizeof service, 0)) ++#endif + goto failsafe; + + if (res) freeaddrinfo(res); diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index 4ed8d93f72d6..089a05cb097f 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -15,6 +15,20 @@ share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml share/gnome/help/gnome-system-monitor/C/legal.xml +share/gnome/help/gnome-system-monitor/ar/figures/addColumn.png +share/gnome/help/gnome-system-monitor/ar/figures/changePriority.png +share/gnome/help/gnome-system-monitor/ar/figures/colorPanel.png +share/gnome/help/gnome-system-monitor/ar/figures/columnContextMenu.png +share/gnome/help/gnome-system-monitor/ar/figures/gnome-system-monitor_window.png +share/gnome/help/gnome-system-monitor/ar/figures/memoryMaps.png +share/gnome/help/gnome-system-monitor/ar/figures/moreInfo.png +share/gnome/help/gnome-system-monitor/ar/figures/processListing.png +share/gnome/help/gnome-system-monitor/ar/figures/sortButton.png +share/gnome/help/gnome-system-monitor/ar/figures/sortMenu.png +share/gnome/help/gnome-system-monitor/ar/figures/sortMenu2.png +share/gnome/help/gnome-system-monitor/ar/figures/systemMonitor.png +share/gnome/help/gnome-system-monitor/ar/figures/viewMenu.png +share/gnome/help/gnome-system-monitor/ar/gnome-system-monitor.xml share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png @@ -168,6 +182,7 @@ share/locale/oc/LC_MESSAGES/gnome-system-monitor.mo share/locale/or/LC_MESSAGES/gnome-system-monitor.mo share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ps/LC_MESSAGES/gnome-system-monitor.mo share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo @@ -178,7 +193,7 @@ share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo +share/locale/sr@latin/LC_MESSAGES/gnome-system-monitor.mo share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo share/locale/te/LC_MESSAGES/gnome-system-monitor.mo @@ -191,6 +206,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo 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-es.omf @@ -217,6 +233,8 @@ share/pixmaps/gnome-system-monitor/upload.svg @dirrm share/gnome/help/gnome-system-monitor/ca @dirrm share/gnome/help/gnome-system-monitor/bg/figures @dirrm share/gnome/help/gnome-system-monitor/bg +@dirrm share/gnome/help/gnome-system-monitor/ar/figures +@dirrm share/gnome/help/gnome-system-monitor/ar @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C @dirrm share/gnome/help/gnome-system-monitor @@ -227,10 +245,14 @@ share/pixmaps/gnome-system-monitor/upload.svg @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index f4e2b1010089..1a57b4cb932f 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.78 2008/03/09 18:58:47 mezz Exp $ +# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.81 2008/09/27 01:53:00 mezz Exp $ # PORTNAME= gnome-system-tools -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.22.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -24,7 +23,7 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes USE_LDCONFIG= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2 +USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes CONFIGURE_ARGS= --enable-services diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index c56c52fb6457..956fd3308355 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 6559bb97fc75bc28b559dc530571d527 -SHA256 (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 57c348458efdf34118bc46102e2389cf32172f22e3429bb959a81a773ade56b9 -SIZE (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 3441541 +MD5 (gnome2/gnome-system-tools-2.22.1.tar.bz2) = 50b2174727ac2e2b7b5621010343b040 +SHA256 (gnome2/gnome-system-tools-2.22.1.tar.bz2) = c3d02612457318b7d879d634219a5126dd37861089650554ad49736a9f5ecf57 +SIZE (gnome2/gnome-system-tools-2.22.1.tar.bz2) = 3963700 diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index 3d2ede7481a5..1efb263ca661 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -56,12 +56,18 @@ 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/de/figures/shares-tool.png +share/gnome/help/shares-admin/de/shares-admin.xml +share/gnome/help/shares-admin/el/figures/shares-tool.png +share/gnome/help/shares-admin/el/shares-admin.xml share/gnome/help/shares-admin/es/figures/shares-tool.png share/gnome/help/shares-admin/es/shares-admin.xml share/gnome/help/shares-admin/fr/figures/shares-tool.png share/gnome/help/shares-admin/fr/shares-admin.xml share/gnome/help/shares-admin/oc/figures/shares-tool.png share/gnome/help/shares-admin/oc/shares-admin.xml +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/time-admin/C/figures/time-map.png @@ -75,6 +81,11 @@ 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/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/es/figures/time-map.png share/gnome/help/time-admin/es/figures/time-servers.png share/gnome/help/time-admin/es/figures/time-tool-automatic.png @@ -110,6 +121,8 @@ share/gnome/help/users-admin/C/legal.xml share/gnome/help/users-admin/C/users-admin.xml share/gnome/help/users-admin/ca/figures/users-tool.png share/gnome/help/users-admin/ca/users-admin.xml +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/users-tool.png share/gnome/help/users-admin/el/users-admin.xml share/gnome/help/users-admin/es/figures/users-tool.png @@ -118,6 +131,8 @@ share/gnome/help/users-admin/fr/figures/users-tool.png share/gnome/help/users-admin/fr/users-admin.xml 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/users-tool.png +share/gnome/help/users-admin/pt_BR/users-admin.xml 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/users-tool.png @@ -161,9 +176,11 @@ share/locale/hi/LC_MESSAGES/gnome-system-tools.mo share/locale/hr/LC_MESSAGES/gnome-system-tools.mo share/locale/hu/LC_MESSAGES/gnome-system-tools.mo share/locale/id/LC_MESSAGES/gnome-system-tools.mo +share/locale/is/LC_MESSAGES/gnome-system-tools.mo share/locale/it/LC_MESSAGES/gnome-system-tools.mo share/locale/ja/LC_MESSAGES/gnome-system-tools.mo share/locale/ka/LC_MESSAGES/gnome-system-tools.mo +share/locale/kn/LC_MESSAGES/gnome-system-tools.mo 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 @@ -192,9 +209,10 @@ share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sl/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo share/locale/sr/LC_MESSAGES/gnome-system-tools.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-system-tools.mo +share/locale/sr@latin/LC_MESSAGES/gnome-system-tools.mo share/locale/sv/LC_MESSAGES/gnome-system-tools.mo share/locale/ta/LC_MESSAGES/gnome-system-tools.mo +share/locale/te/LC_MESSAGES/gnome-system-tools.mo share/locale/th/LC_MESSAGES/gnome-system-tools.mo share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo @@ -221,12 +239,16 @@ share/omf/services-admin/services-admin-oc.omf share/omf/services-admin/services-admin-sv.omf share/omf/shares-admin/shares-admin-C.omf share/omf/shares-admin/shares-admin-ca.omf +share/omf/shares-admin/shares-admin-de.omf +share/omf/shares-admin/shares-admin-el.omf share/omf/shares-admin/shares-admin-es.omf share/omf/shares-admin/shares-admin-fr.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/time-admin/time-admin-C.omf share/omf/time-admin/time-admin-ca.omf +share/omf/time-admin/time-admin-de.omf share/omf/time-admin/time-admin-es.omf share/omf/time-admin/time-admin-fr.omf share/omf/time-admin/time-admin-oc.omf @@ -234,10 +256,12 @@ share/omf/time-admin/time-admin-ru.omf share/omf/time-admin/time-admin-sv.omf share/omf/users-admin/users-admin-C.omf share/omf/users-admin/users-admin-ca.omf +share/omf/users-admin/users-admin-de.omf share/omf/users-admin/users-admin-el.omf share/omf/users-admin/users-admin-es.omf share/omf/users-admin/users-admin-fr.omf 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 @dirrm share/omf/users-admin @@ -250,6 +274,8 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/users-admin/sv @dirrm share/gnome/help/users-admin/ru/figures @dirrm share/gnome/help/users-admin/ru +@dirrm share/gnome/help/users-admin/pt_BR/figures +@dirrm share/gnome/help/users-admin/pt_BR @dirrm share/gnome/help/users-admin/oc/figures @dirrm share/gnome/help/users-admin/oc @dirrm share/gnome/help/users-admin/fr/figures @@ -258,6 +284,8 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/users-admin/es @dirrm share/gnome/help/users-admin/el/figures @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/ca/figures @dirrm share/gnome/help/users-admin/ca @dirrm share/gnome/help/users-admin/C/figures @@ -275,6 +303,8 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/time-admin/fr @dirrm share/gnome/help/time-admin/es/figures @dirrm share/gnome/help/time-admin/es +@dirrm share/gnome/help/time-admin/de/figures +@dirrm share/gnome/help/time-admin/de @dirrm share/gnome/help/time-admin/ca/figures @dirrm share/gnome/help/time-admin/ca @dirrm share/gnome/help/time-admin/C/figures @@ -282,12 +312,18 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/time-admin @dirrm share/gnome/help/shares-admin/sv/figures @dirrm share/gnome/help/shares-admin/sv +@dirrm share/gnome/help/shares-admin/pt_BR/figures +@dirrm share/gnome/help/shares-admin/pt_BR @dirrm share/gnome/help/shares-admin/oc/figures @dirrm share/gnome/help/shares-admin/oc @dirrm share/gnome/help/shares-admin/fr/figures @dirrm share/gnome/help/shares-admin/fr @dirrm share/gnome/help/shares-admin/es/figures @dirrm share/gnome/help/shares-admin/es +@dirrm share/gnome/help/shares-admin/el/figures +@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/ca/figures @dirrm share/gnome/help/shares-admin/ca @dirrm share/gnome/help/shares-admin/C/figures @@ -331,6 +367,10 @@ share/omf/users-admin/users-admin-sv.omf @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile index 96c63e749c9b..e685beacc2be 100644 --- a/sysutils/gnome-volume-manager/Makefile +++ b/sysutils/gnome-volume-manager/Makefile @@ -3,12 +3,11 @@ # Whom: Jean-Yves Lefort <jylefort@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.24 2008/03/15 16:48:05 marcus Exp $ +# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.26 2008/09/24 03:12:47 mezz Exp $ # PORTNAME= gnome-volume-manager -PORTVERSION= 2.22.5 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo index 4eeb3fde9776..d1a0db5edafe 100644 --- a/sysutils/gnome-volume-manager/distinfo +++ b/sysutils/gnome-volume-manager/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-volume-manager-2.22.5.tar.bz2) = e761a5bdc8867419eb278c9e1a6a79ff -SHA256 (gnome2/gnome-volume-manager-2.22.5.tar.bz2) = bb2ebc93327605611849132451304e985912a4724b238b5edabe6f0a4ed54005 -SIZE (gnome2/gnome-volume-manager-2.22.5.tar.bz2) = 405349 +MD5 (gnome2/gnome-volume-manager-2.24.0.tar.bz2) = a8ae620c2633f3ac13444736ef61122a +SHA256 (gnome2/gnome-volume-manager-2.24.0.tar.bz2) = db94ac09ab1527d4e526a9b0268925881c256657a2ab7bd6de8713fd7dab9fd3 +SIZE (gnome2/gnome-volume-manager-2.24.0.tar.bz2) = 400417 diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist index d20d4686ee6c..3d44d2a1eaa2 100644 --- a/sysutils/gnome-volume-manager/pkg-plist +++ b/sysutils/gnome-volume-manager/pkg-plist @@ -37,6 +37,7 @@ share/locale/is/LC_MESSAGES/gnome-volume-manager.mo share/locale/it/LC_MESSAGES/gnome-volume-manager.mo share/locale/ja/LC_MESSAGES/gnome-volume-manager.mo share/locale/ka/LC_MESSAGES/gnome-volume-manager.mo +share/locale/kn/LC_MESSAGES/gnome-volume-manager.mo share/locale/ko/LC_MESSAGES/gnome-volume-manager.mo share/locale/ku/LC_MESSAGES/gnome-volume-manager.mo share/locale/lt/LC_MESSAGES/gnome-volume-manager.mo @@ -65,7 +66,7 @@ share/locale/sk/LC_MESSAGES/gnome-volume-manager.mo share/locale/sl/LC_MESSAGES/gnome-volume-manager.mo share/locale/sq/LC_MESSAGES/gnome-volume-manager.mo share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-volume-manager.mo +share/locale/sr@latin/LC_MESSAGES/gnome-volume-manager.mo share/locale/sv/LC_MESSAGES/gnome-volume-manager.mo share/locale/ta/LC_MESSAGES/gnome-volume-manager.mo share/locale/te/LC_MESSAGES/gnome-volume-manager.mo @@ -87,6 +88,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index bccb417b1c3d..07168189bcca 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.43 2008/03/22 19:31:15 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.54 2008/12/21 06:20:19 marcus Exp $ # PORTNAME= hal DISTVERSION= 0.5.11 -PORTREVISION= 1 +PORTREVISION= 10 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ @@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids USE_GETTEXT= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnometarget intlhack ltverhack +USE_GNOME= gnomehack intlhack ltverhack USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes USE_PYTHON= yes @@ -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" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CK_0_3" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" @@ -94,6 +94,8 @@ post-patch: ${WRKSRC}/hald/Makefile.in @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \ ${WRKSRC}/hal.conf.in + @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + < ${FILESDIR}/README.fuse > ${WRKDIR}/README.fuse post-install: ${MKDIR} ${DATADIR}/dist @@ -101,6 +103,8 @@ post-install: ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor ${INSTALL_DATA} ${FILESDIR}/10-mouse-sysmouse.fdi \ ${PREFIX}/share/hal/fdi/policy/10osvendor + ${INSTALL_SCRIPT} ${FILESDIR}/mount-fuse \ + ${PREFIX}/share/hal/mount-fuse .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @@ -112,6 +116,8 @@ post-install: ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \ ${DOCSDIR}/README.freebsd + ${INSTALL_DATA} ${WRKDIR}/README.fuse \ + ${DOCSDIR}/README.fuse .endif .include <bsd.port.post.mk> diff --git a/sysutils/hal/files/README.fuse b/sysutils/hal/files/README.fuse new file mode 100644 index 000000000000..75adcab7d589 --- /dev/null +++ b/sysutils/hal/files/README.fuse @@ -0,0 +1,31 @@ +Mounting Fuse File Systems with HAL +----------------------------------- + +$FreeBSD$ + +Hal supports mounting Fuse device-backed file systems (e.g. NTFS). To enable +this feature, copy the included %%LOCALBASE%%/share/hal/mount-fuse script +to /sbin. Make sure this script is executable. Edit the script, and change +the FUSE_HELPER environment variable to the name of the executable which +will actually mount the Fuse volume (e.g. for NTFS, this is ``ntfs-3g''). + +Finally, the script must be renamed to ``mount_FSNAME''. FSNAME is the name +of the file system type (e.g. for NTFS, this is ``ntfs''). If there is +already an executable in /sbin or /usr/sbin with this name, the +existing executable must be renamed or deleted. + +As is stated in the examples above, overriding FreeBSD's existing NTFS +support with Fuse's ntfs-3g is the most common use case for this. The +ntfs-3g Fuse driver uses different mount options than FreeBSD's included +mount_ntfs. GNOME transparently supports switching between ntfs and +ntfs-3g. Simply edit the following GConf key in the GNOME +Configuration Editor (i.e. gconf-editor): + +/system/storage/default_options/ntfs/fstype_override + +Set the value to ``ntfs-3g'', then add your desired ntfs-3g options to the +following GConf key: + +/system/storage/default_options/ntfs-3g/mount_options + +Other desktop systems may have similar options. diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index 7f8f2c659c86..04e784e6ce6f 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/sysutils/hal/files/hald.in,v 1.14 2008/08/21 16:04:48 mezz Exp $ # # PROVIDE: hald # REQUIRE: DAEMON usbd devd dbus diff --git a/sysutils/hal/files/mount-fuse b/sysutils/hal/files/mount-fuse new file mode 100644 index 000000000000..ae906a8140d3 --- /dev/null +++ b/sysutils/hal/files/mount-fuse @@ -0,0 +1,129 @@ +#!/bin/sh +# Wrapper script for FreeBSD and PC-BSD, which takes calls from HAL +# for running mount_ntfs, and performs it with a given FUSE helper. +################################################################### + +## Modify this next variable to point to the correct FUSE helper. +FUSE_HELPER="ntfs-3g" +## DO NOT modify anything below this. + +FUSEDB="/tmp" +if [ -n "${TMPDIR}" ] +then + FUSEDB=${TMPDIR} +fi + +FUSEDB="${FUSEDB}/.fuse-mnts" +MNTSTRING="" +OPTIONS="" +FOUNDOPT="0" +FOUNDU="0" +HWDEV="" +FOUNDDEV="0" + +for i in $@ +do + if [ "$FOUNDOPT" = "1" ] + then + OPTIONS="${OPTIONS} -o ${i}" + elif [ "${FOUNDU}" = "1" ] + then + OPTIONS="${OPTIONS} -o uid=${i}" + else + + if [ "${FOUNDDEV}" = "1" ] + then + # Save the mount-point, will be used later + MNTPOINT="${i}" + FOUNDDEV="2" + fi + + echo ${i}| grep -q "/dev" 2>/dev/null + if [ "$?" = "0" -a "${FOUNDDEV}" = "0" ] + then + FOUNDDEV="1" + # Lets check if we were given a fuse[] device + # or a real device name + echo "${i}" | grep -q "fuse" 2>/dev/null + if [ "$?" = "0" ] + then + # Lets save the old fuse device name we had saved + OLDFUSE="${i}" + + # Lets get the *real* device name for FUSE helper + REALHWDEV="`cat ${FUSEDB} | grep ${i} | cut -d '=' -f 2`" + + # Now lets change the string we will be saving + i="${REALHWDEV}" + else + # We are doing a first time mount of this device + + # Set the real device name for mounting + REALHWDEV="${i}" + fi + fi + + # Add the value to our mount string + if [ "${i}" != "-o" -a "${i}" != "-u" ] + then + MNTSTRING="${MNTSTRING} ${i}" + fi + + fi + + # Check if we are on a -u flag now + if [ "${i}" = "-u" ] + then + FOUNDU="1" + else + FOUNDU="0" + fi + + # Check if we are on a -o option + if [ "${i}" = "-o" ] + then + FOUNDOPT="1" + else + FOUNDOPT="0" + fi +done + +# Save our final string which our FUSE helper will use +FINALSTRING="${MNTSTRING} ${OPTIONS}" + + +# Check that fuse.ko is loaded +kldstat | grep -q fuse 2>/dev/null +if [ "$?" != "0" ] +then + kldload /usr/local/modules/fuse.ko +fi + +# Run the FUSE helper command now, with the options in the right order +${FUSE_HELPER} ${FINALSTRING} + +# If we have an OLDFUSE variable, lets clear it from the list +if [ ! -z "${OLDFUSE}" -a -e ${FUSEDB} ] +then + cat ${FUSEDB} | grep -v "${OLDFUSE}=" > /tmp/.newfuse + mv /tmp/.newfuse ${FUSEDB} +fi + +# Now lets figure out which fuse device was used and save it to DB +NEWFUSE="`mount | tr -s ' ' | grep \" ${MNTPOINT} \" | cut -d ' ' -f 1`" + +# Make sure we don't already have this fuse device listed +if [ -e ${FUSEDB} ] +then + cat ${FUSEDB} | grep -v "${NEWFUSE}=" > /tmp/.newfuse + mv /tmp/.newfuse ${FUSEDB} +else + touch ${FUSEDB} +fi + +# Save the fuse device to our DB +echo "${NEWFUSE}=${REALHWDEV}" >> ${FUSEDB} + + +# Finished! +exit 0 diff --git a/sysutils/hal/files/patch-consolekit03 b/sysutils/hal/files/patch-consolekit03 new file mode 100644 index 000000000000..a948b189b18e --- /dev/null +++ b/sysutils/hal/files/patch-consolekit03 @@ -0,0 +1,87 @@ +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 +@@ -485,6 +485,20 @@ if test "x$enable_console_kit" != "xno"; + AM_CONDITIONAL(HAVE_CONKIT, true) + AC_DEFINE(HAVE_CONKIT, [], [Set if we use ConsoleKit]) + msg_conkit=yes ++ # yes this is ugly, but there is no other way to get the version of CK ++ AC_MSG_CHECKING([if ConsoleKit version 0.3.0 or newer]) ++ if $PKG_CONFIG --atleast-version=0.3.0 ck-connector; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE(HAVE_CK_0_3, 1, [Define to 1 if ConsoleKit is v0.3.0 or newer]) ++ else ++ if $PKG_CONFIG --max-version=0.2.10 ck-connector; then ++ AC_MSG_RESULT([no]) ++ else ++ #assume we have the latest version ++ AC_MSG_WARN([Couldn't detect ConsoleKit version, install the devel package, assume for now you use >= 0.3.0]) ++ AC_DEFINE(HAVE_CK_0_3, 1, [Define to 1 if ConsoleKit is v0.3.0 or newer]) ++ fi ++ fi + fi + + AC_PATH_PROG(GPERF, [gperf], [no]) +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-hald_freebsd_addons_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in index beb677fa943a..f554c0650f3e 100644 --- a/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in +++ b/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in @@ -1,5 +1,5 @@ ---- hald/freebsd/addons/Makefile.in.orig 2008-03-27 00:45:50.000000000 -0400 -+++ hald/freebsd/addons/Makefile.in 2008-03-27 00:48:15.000000000 -0400 +--- hald/freebsd/addons/Makefile.in.orig 2008-12-13 12:08:36.000000000 -0500 ++++ hald/freebsd/addons/Makefile.in 2008-12-20 21:16:41.000000000 -0500 @@ -33,7 +33,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @@ -39,19 +39,20 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -227,6 +239,11 @@ hald_addon_storage_SOURCES = addon-stora +@@ -229,6 +241,12 @@ hald_addon_storage_SOURCES = addon-stora hald_addon_storage_LDADD = \ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la +hald_addon_mouse_sysmouse_SOURCES = addon-mouse.c +hald_addon_mouse_sysmouse_CFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ +hald_addon_mouse_sysmouse_LDADD = @GLIB_LIBS@ \ ++ -lutil \ + $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la + all: all-am .SUFFIXES: -@@ -288,6 +305,9 @@ clean-libexecPROGRAMS: +@@ -290,6 +308,9 @@ clean-libexecPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done @@ -61,7 +62,7 @@ hald-addon-storage$(EXEEXT): $(hald_addon_storage_OBJECTS) $(hald_addon_storage_DEPENDENCIES) @rm -f hald-addon-storage$(EXEEXT) $(LINK) $(hald_addon_storage_OBJECTS) $(hald_addon_storage_LDADD) $(LIBS) -@@ -299,6 +319,7 @@ distclean-compile: +@@ -301,6 +322,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-storage.Po@am__quote@ @@ -69,7 +70,7 @@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -321,6 +342,20 @@ distclean-compile: +@@ -323,6 +345,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_addons_addon-mouse.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c index 21e413123908..70da9b2af8c6 100644 --- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c +++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c @@ -1,6 +1,6 @@ ---- hald/freebsd/addons/addon-mouse.c.orig 2008-03-31 04:53:42.000000000 -0400 -+++ hald/freebsd/addons/addon-mouse.c 2008-03-31 05:07:19.000000000 -0400 -@@ -0,0 +1,216 @@ +--- hald/freebsd/addons/addon-mouse.c.orig 2008-12-21 01:15:41.000000000 -0500 ++++ hald/freebsd/addons/addon-mouse.c 2008-12-21 01:17:03.000000000 -0500 +@@ -0,0 +1,336 @@ +/*************************************************************************** + * CVSID: $Id$ + * @@ -28,6 +28,13 @@ +# include <config.h> +#endif + ++#include <sys/param.h> ++#if __FreeBSD_version >= 800058 ++#include <sys/types.h> ++#include <sys/user.h> ++#include <sys/sysctl.h> ++#include <libutil.h> ++#endif +#include <string.h> +#include <stdlib.h> +#include <assert.h> @@ -38,7 +45,9 @@ + +#include "../libprobe/hfp.h" + ++#if __FreeBSD_version < 800058 +#define CMD "/usr/bin/fstat %s" ++#endif + +#define MOUSE_DRIVER "mouse" +#define MOUSED_DEVICE "/dev/sysmouse" @@ -47,11 +56,121 @@ + +static struct +{ -+ const struct timespec update_interval; -+ char *device_file; -+ struct timespec next_update; ++ const struct timespec update_interval; ++ char *device_file; ++ struct timespec next_update; +} addon = { { 2, 0 } }; + ++#if __FreeBSD_version >= 800058 ++static struct kinfo_proc * ++hfp_kinfo_getproc (int *cntp) ++{ ++ int mib[3]; ++ int error; ++ int cnt; ++ size_t len; ++ char *buf, *bp, *eb; ++ struct kinfo_proc *kip, *kp, *ki; ++ ++ *cntp = 0; ++ ++ len = 0; ++ mib[0] = CTL_KERN; ++ mib[1] = KERN_PROC; ++ mib[2] = KERN_PROC_PROC; ++ ++ error = sysctl(mib, 3, NULL, &len, NULL, 0); ++ if (error) ++ return NULL; ++ ++ len = len * 4 / 3; ++ buf = (char *) g_malloc(len); ++ if (buf == NULL) ++ return NULL; ++ ++ error = sysctl(mib, 3, buf, &len, NULL, 0); ++ if (error) ++ { ++ g_free(buf); ++ return NULL; ++ } ++ ++ cnt = 0; ++ bp = buf; ++ eb = buf + len; ++ while (bp < eb) ++ { ++ ki = (struct kinfo_proc *) (uintptr_t) bp; ++ bp += ki->ki_structsize; ++ cnt++; ++ } ++ ++ kip = calloc(cnt, sizeof (*kip)); ++ if (kip == NULL) ++ { ++ g_free(buf); ++ return NULL; ++ } ++ ++ bp = buf; ++ eb = buf + len; ++ kp = kip; ++ while (bp < eb) ++ { ++ ki = (struct kinfo_proc *) (uintptr_t) bp; ++ memcpy(kp, ki, ki->ki_structsize); ++ bp += ki->ki_structsize; ++ kp->ki_structsize = sizeof(*kp); ++ kp++; ++ } ++ ++ g_free(buf); ++ *cntp = cnt; ++ return kip; ++} ++ ++static gboolean ++device_opened_by_proc (const char *device, const char *proc) ++{ ++ struct kinfo_proc *kip, *pfreep; ++ int cnt, i; ++ ++ pfreep = hfp_kinfo_getproc(&cnt); ++ if (pfreep == NULL) ++ return FALSE; ++ ++ for (i = 0; i < cnt; i++) ++ { ++ kip = &pfreep[i]; ++ ++ if (! strcmp(kip->ki_comm, proc)) ++ { ++ struct kinfo_file *kif, *ffreep; ++ int fcnt, j; ++ ++ ffreep = kinfo_getfile(kip->ki_pid, &fcnt); ++ if (ffreep == NULL) ++ continue; ++ for (j = 0; j < fcnt; j++) ++ { ++ kif = &ffreep[j]; ++ ++ if (kif->kf_type == KF_TYPE_VNODE && ++ ! strcmp(kif->kf_path, device)) ++ { ++ g_free(ffreep); ++ g_free(pfreep); ++ return TRUE; ++ } ++ } ++ g_free(ffreep); ++ } ++ } ++ g_free(pfreep); ++ ++ return FALSE; ++} ++#else +static gboolean +device_opened_by_proc (const char *device, const char *proc) +{ @@ -91,16 +210,16 @@ + if (len < 2) + { + g_strfreev(fields); -+ continue; -+ } ++ continue; ++ } + for (j = 1; j < len && fields[j] && *fields[j] == '\0'; j++) + ; + if (j < len && fields[j] && ! strcmp(fields[j], proc)) + { + found = TRUE; + g_strfreev(fields); -+ break; -+ } ++ break; ++ } + g_strfreev(fields); + } + @@ -111,6 +230,7 @@ + + return found; +} ++#endif + +static const char * +get_mouse_device (const char *device) @@ -186,27 +306,27 @@ + { + /* process dbus traffic until update interval has elapsed */ + while (TRUE) -+ { -+ struct timespec now; -+ -+ hfp_clock_gettime(&now); -+ if (hfp_timespeccmp(&now, &addon.next_update, <)) -+ { -+ struct timespec timeout; -+ -+ timeout = addon.next_update; -+ hfp_timespecsub(&timeout, &now); -+ -+ if (timeout.tv_sec < 0) /* current time went backwards */ -+ timeout = addon.update_interval; -+ -+ dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000); -+ if (! dbus_connection_get_is_connected(connection)) -+ goto end; -+ } -+ else -+ break; -+ } ++ { ++ struct timespec now; ++ ++ hfp_clock_gettime(&now); ++ if (hfp_timespeccmp(&now, &addon.next_update, <)) ++ { ++ struct timespec timeout; ++ ++ timeout = addon.next_update; ++ hfp_timespecsub(&timeout, &now); ++ ++ if (timeout.tv_sec < 0) /* current time went backwards */ ++ timeout = addon.update_interval; ++ ++ dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000); ++ if (! dbus_connection_get_is_connected(connection)) ++ goto end; ++ } ++ else ++ break; ++ } + + poll_for_moused(); + diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c new file mode 100644 index 000000000000..039a1a6760f4 --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c @@ -0,0 +1,102 @@ +--- 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 +@@ -45,6 +45,7 @@ + #include "hf-util.h" + + #define PROBE_VOLUME_TIMEOUT (HAL_HELPER_TIMEOUT * 6) ++#define HF_VOLUME_FUSE_DB "/tmp/.fuse-mnts" + + static void + hf_volume_get_mounts (struct statfs **mounts, int *n_mounts) +@@ -60,6 +61,55 @@ hf_volume_get_mounts (struct statfs **mo + } + } + ++static char * ++hf_volume_resolve_fuse (const char *special) ++{ ++ gchar *contents; ++ gchar **lines; ++ gsize len; ++ int i; ++ ++ g_return_val_if_fail(special != NULL, NULL); ++ ++ if (! g_file_get_contents(HF_VOLUME_FUSE_DB, &contents, &len, NULL)) ++ return g_strdup(special); ++ ++ lines = g_strsplit(contents, "\n", 0); ++ g_free(contents); ++ ++ for (i = 0; lines && lines[i]; i++) ++ { ++ gchar **fields; ++ ++ fields = g_strsplit(lines[i], "=", 2); ++ if (fields && g_strv_length(fields) == 2) ++ { ++ if (strcmp(fields[0], special) == 0) ++ { ++ g_strfreev(fields); ++ g_strfreev(lines); ++ return g_strdup(fields[1]); ++ } ++ } ++ g_strfreev(fields); ++ } ++ ++ g_strfreev(lines); ++ ++ return g_strdup(special); ++} ++ ++static char * ++hf_volume_resolve_special (const char *special) ++{ ++ g_return_val_if_fail(special != NULL, NULL); ++ ++ if (strstr(special, "fuse")) ++ return hf_volume_resolve_fuse(special); ++ ++ return g_strdup(special); ++} ++ + 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 + g_return_val_if_fail(special != NULL, NULL); + + for (i = 0; i < n_mounts; i++) +- if (! strcmp(mounts[i].f_mntfromname, special)) +- return &mounts[i]; ++ { ++ char *resolved; ++ ++ resolved = hf_volume_resolve_special(mounts[i].f_mntfromname); ++ if (! strcmp(resolved, special)) ++ { ++ g_free(resolved); ++ return &mounts[i]; ++ } ++ ++ g_free(resolved); ++ } + + return NULL; + } +@@ -92,7 +152,13 @@ hf_volume_device_update_mount_properties + + special = hal_device_property_get_string(device, "block.device"); + if (special) +- mount = hf_volume_mounts_find(mounts, n_mounts, special); ++ { ++ mount = hf_volume_mounts_find(mounts, n_mounts, special); ++ if (mount && strcmp(special, mount->f_mntfromname)) ++ hal_device_property_set_string(device, "volume.freebsd.real_mounted_device", mount->f_mntfromname); ++ else ++ hal_device_property_remove(device, "volume.freebsd.real_mounted_device"); ++ } + } + + hal_device_property_set_bool(device, "volume.is_mounted", mount != NULL); diff --git a/sysutils/hal/files/patch-tools_hal-storage-eject.c b/sysutils/hal/files/patch-tools_hal-storage-eject.c new file mode 100644 index 000000000000..730e2a076d1c --- /dev/null +++ b/sysutils/hal/files/patch-tools_hal-storage-eject.c @@ -0,0 +1,11 @@ +--- tools/hal-storage-eject.c.orig 2008-10-27 13:23:11.000000000 -0400 ++++ tools/hal-storage-eject.c 2008-10-27 13:23:23.000000000 -0400 +@@ -190,7 +190,7 @@ main (int argc, char *argv[]) + unknown_eject_error ("Cannot obtain lock on /media/.hal-mtab"); + } + handle_unmount (hal_ctx, +- udi, volume_to_unmount, drive, ++ volume_udi, volume_to_unmount, drive, + libhal_volume_get_device_file (volume_to_unmount), + invoked_by_uid, invoked_by_syscon_name, + FALSE, FALSE); /* use neither lazy nor force */ diff --git a/sysutils/hal/files/patch-tools_hal-storage-mount.c b/sysutils/hal/files/patch-tools_hal-storage-mount.c index c270893c2b2c..390d35111481 100644 --- a/sysutils/hal/files/patch-tools_hal-storage-mount.c +++ b/sysutils/hal/files/patch-tools_hal-storage-mount.c @@ -1,11 +1,91 @@ ---- tools/hal-storage-mount.c.orig 2008-04-29 20:05:38.000000000 -0400 -+++ tools/hal-storage-mount.c 2008-04-29 20:05:44.000000000 -0400 -@@ -56,7 +56,7 @@ +--- tools/hal-storage-mount.c.orig 2008-05-07 19:24:23.000000000 -0400 ++++ tools/hal-storage-mount.c 2008-10-09 00:54:34.000000000 -0400 +@@ -56,8 +56,9 @@ #ifdef __FreeBSD__ #define MOUNT "/sbin/mount" -#define MOUNT_OPTIONS "noexec,nosuid" +#define MOUNT_OPTIONS "nosuid" #define MOUNT_TYPE_OPT "-t" ++#define FUSE_DB "/tmp/.fuse-mnts" #elif sun #define MOUNT "/sbin/mount" + #define MOUNT_OPTIONS "noexec,nosuid" +@@ -255,6 +256,51 @@ out: + return f; + } + ++#ifdef __FreeBSD__ ++static char * ++resolve_fuse (const char *special) ++{ ++ gchar *contents; ++ gchar **lines; ++ gsize len; ++ int i; ++ ++ if (! g_file_get_contents (FUSE_DB, &contents, &len, NULL)) ++ return g_strdup (special); ++ ++ lines = g_strsplit (contents, "\n", 0); ++ g_free (contents); ++ ++ for (i = 0; lines && lines[i]; i++) { ++ gchar **fields; ++ ++ fields = g_strsplit (lines[i], "=", 2); ++ if (fields && g_strv_length (fields) == 2) { ++ if (strcmp (fields[0], special) == 0) { ++ g_strfreev (fields); ++ g_strfreev (lines); ++ return g_strdup (fields[1]); ++ } ++ } ++ g_strfreev (fields); ++ } ++ ++ g_strfreev (lines); ++ ++ return g_strdup (special); ++} ++#endif ++ ++static char * ++resolve_special (const char *special) ++{ ++#ifdef __FreeBSD__ ++ if (strstr(special, "fuse")) ++ return resolve_fuse (special); ++#endif ++ return g_strdup (special); ++} ++ + static LibHalVolume * + volume_findby (LibHalContext *hal_ctx, const char *property, const char *value) + { +@@ -400,18 +446,20 @@ device_is_mounted (const char *device, c + unknown_error ("Cannot open /etc/mtab or equivalent"); + } + while (((entry = mtab_next (handle, mount_point)) != NULL) && (ret == FALSE)) { +- char *resolved; ++ char *resolved, *rspecial; + + resolved = resolve_symlink (entry); ++ rspecial = resolve_special (resolved); ++ g_free (resolved); + #ifdef DEBUG +- printf ("/proc/mounts: device %s -> %s \n", entry, resolved); ++ printf ("/proc/mounts: device %s -> %s \n", entry, rspecial); + #endif +- if (strcmp (device, resolved) == 0) { +- printf ("%s (-> %s) found in mount list. Not mounting.\n", entry, resolved); ++ if (strcmp (device, rspecial) == 0) { ++ printf ("%s (-> %s) found in mount list. Not mounting.\n", entry, rspecial); + ret = TRUE; + } + +- g_free (resolved); ++ g_free (rspecial); + } + mtab_close (handle); + return ret; diff --git a/sysutils/hal/files/patch-tools_hal-storage-shared.c b/sysutils/hal/files/patch-tools_hal-storage-shared.c new file mode 100644 index 000000000000..1ed7fe907bac --- /dev/null +++ b/sysutils/hal/files/patch-tools_hal-storage-shared.c @@ -0,0 +1,45 @@ +--- tools/hal-storage-shared.c.orig 2008-05-07 19:24:24.000000000 -0400 ++++ tools/hal-storage-shared.c 2008-10-20 14:53:35.000000000 -0400 +@@ -297,6 +297,9 @@ handle_unmount (LibHalContext *hal_ctx, + char *mount_point_to_unmount; + gboolean mounted_by_other_uid; + FILE *hal_mtab_new; ++#ifdef __FreeBSD__ ++ char *rdevice = NULL; ++#endif + + #ifdef DEBUG + printf ("device = %s\n", device); +@@ -473,7 +476,20 @@ line_found: + #endif + if (option_force) + args[na++] = "-f"; +- args[na++] = (char *) device; ++#ifdef __FreeBSD__ ++ dbus_error_init (&error); ++ if (libhal_device_property_exists (hal_ctx, udi, "volume.freebsd.real_mounted_device", NULL)) { ++ rdevice = libhal_device_get_property_string (hal_ctx, udi, "volume.freebsd.real_mounted_device", &error); ++ if (dbus_error_is_set (&error)) { ++ dbus_error_free (&error); ++ unknown_error ("Error while getting volume.freebsd.real_mounted_device"); ++ } ++ } ++ if (rdevice) ++ args[na++] = rdevice; ++ else ++#endif ++ args[na++] = (char *) device; + args[na++] = NULL; + + #ifdef DEBUG +@@ -497,6 +513,10 @@ line_found: + unknown_error ("Cannot spawn " UMOUNT); + } + ++#ifdef __FreeBSD__ ++ g_free (rdevice); ++#endif ++ + /* check if unmount was succesful */ + if (exit_status != 0) { + printf ("%s error %d, stdout='%s', stderr='%s'\n", UMOUNT, exit_status, sout, serr); diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist index 1c75cccbe755..f42809179477 100644 --- a/sysutils/hal/pkg-plist +++ b/sysutils/hal/pkg-plist @@ -72,6 +72,7 @@ libexec/hald-probe-volume libexec/hald-runner sbin/hald %%PORTDOCS%%%%DOCSDIR%%/README.freebsd +%%PORTDOCS%%%%DOCSDIR%%/README.fuse %%DATADIR%%/dist/hal.conf %%DATADIR%%/fdi/fdi.dtd %%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.fdi @@ -87,6 +88,7 @@ sbin/hald %%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi %%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi %%DATADIR%%/fdi/policy/10osvendor/30-wol.fdi +%%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.policy diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 454f6ac094c1..ae80ed4ae28b 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.141 2008/03/15 19:36:22 ahze Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.144 2008/09/24 03:36:45 mezz Exp $ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.22.1 -PORTREVISION= 2 +PORTVERSION= 2.24.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 86e267e08488..c4bc507dd271 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/nautilus-cd-burner-2.22.1.tar.bz2) = 6bf96cb55a11813a26118eabafa69143 -SHA256 (gnome2/nautilus-cd-burner-2.22.1.tar.bz2) = 33cfc61e8f1913350b4796b446010d7f9a9246783b01b93eafdc87ba06cac5ab -SIZE (gnome2/nautilus-cd-burner-2.22.1.tar.bz2) = 735353 +MD5 (gnome2/nautilus-cd-burner-2.24.0.tar.bz2) = eb211dd03d0518263fa4eadccc3caa88 +SHA256 (gnome2/nautilus-cd-burner-2.24.0.tar.bz2) = d4ff952115a2fca28c613ce6a2b46740ce1000b0c213c482bcf3f127ceab99ad +SIZE (gnome2/nautilus-cd-burner-2.24.0.tar.bz2) = 725247 diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index 635ccb6e5989..867ac3603427 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -87,7 +87,7 @@ share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sr/LC_MESSAGES/nautilus-cd-burner.mo -share/locale/sr@Latn/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/sr@latin/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo share/locale/te/LC_MESSAGES/nautilus-cd-burner.mo @@ -122,6 +122,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile index a3dcfe686a48..0f85f57d002e 100644 --- a/sysutils/pessulus/Makefile +++ b/sysutils/pessulus/Makefile @@ -3,12 +3,11 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/sysutils/pessulus/Makefile,v 1.16 2008/03/10 23:41:35 ahze Exp $ +# $MCom: ports/sysutils/pessulus/Makefile,v 1.18 2008/09/22 10:47:05 kwm Exp $ # PORTNAME= pessulus -PORTVERSION= 2.16.4 -PORTREVISION= 2 +PORTVERSION= 2.24.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo index f8179e2a9a39..790dd7e20cc7 100644 --- a/sysutils/pessulus/distinfo +++ b/sysutils/pessulus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pessulus-2.16.4.tar.gz) = 8eabdafd9dda0ea69052234d238dac41 -SHA256 (gnome2/pessulus-2.16.4.tar.gz) = f2af702e2f0699b556206a5a2c9bdb8edbd0183279e618eeef132d1e0476bc9a -SIZE (gnome2/pessulus-2.16.4.tar.gz) = 201497 +MD5 (gnome2/pessulus-2.24.0.tar.gz) = 51cb01f858a6b18faf3cb7715ef3432f +SHA256 (gnome2/pessulus-2.24.0.tar.gz) = e24152ffdc138ade07c47c698d6ee2e1717ed7ed5bd49385bc16346832069442 +SIZE (gnome2/pessulus-2.24.0.tar.gz) = 212787 diff --git a/sysutils/pessulus/files/patch-data_Makefile.in b/sysutils/pessulus/files/patch-data_Makefile.in new file mode 100644 index 000000000000..e6233c448307 --- /dev/null +++ b/sysutils/pessulus/files/patch-data_Makefile.in @@ -0,0 +1,11 @@ +--- data/Makefile.in.orig 2008-09-22 12:27:32.000000000 +0200 ++++ data/Makefile.in 2008-09-22 12:27:59.000000000 +0200 +@@ -422,7 +422,7 @@ uninstall-am: uninstall-desktopDATA unin + @INTLTOOL_DESKTOP_RULE@ + + install-icons: +- for size in 16x16 22x22 24x24 32x32 48x48 scalable; do mkdir --parents $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done ++ for size in 16x16 22x22 24x24 32x32 48x48 scalable; do mkdir -p $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done + + install -m 644 $(srcdir)/pessulus-16.png $(DESTDIR)/$(datadir)/icons/hicolor/16x16/apps/pessulus.png + install -m 644 $(srcdir)/pessulus-22.png $(DESTDIR)/$(datadir)/icons/hicolor/22x22/apps/pessulus.png diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist index 0d8d984c4cb6..2845c890ac58 100644 --- a/sysutils/pessulus/pkg-plist +++ b/sysutils/pessulus/pkg-plist @@ -39,6 +39,12 @@ bin/pessulus %%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyc %%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyo share/applications/pessulus.desktop +share/icons/hicolor/16x16/apps/pessulus.png +share/icons/hicolor/22x22/apps/pessulus.png +share/icons/hicolor/24x24/apps/pessulus.png +share/icons/hicolor/32x32/apps/pessulus.png +share/icons/hicolor/48x48/apps/pessulus.png +share/icons/hicolor/scalable/apps/pessulus.svg %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog @@ -49,6 +55,7 @@ share/applications/pessulus.desktop %%PORTDOCS%%%%DOCSDIR%%/TODO share/locale/ar/LC_MESSAGES/pessulus.mo share/locale/as/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 @@ -78,6 +85,7 @@ share/locale/it/LC_MESSAGES/pessulus.mo share/locale/ja/LC_MESSAGES/pessulus.mo share/locale/ka/LC_MESSAGES/pessulus.mo share/locale/ko/LC_MESSAGES/pessulus.mo +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 @@ -93,14 +101,16 @@ share/locale/oc/LC_MESSAGES/pessulus.mo share/locale/or/LC_MESSAGES/pessulus.mo share/locale/pa/LC_MESSAGES/pessulus.mo share/locale/pl/LC_MESSAGES/pessulus.mo +share/locale/ps/LC_MESSAGES/pessulus.mo share/locale/pt/LC_MESSAGES/pessulus.mo share/locale/pt_BR/LC_MESSAGES/pessulus.mo +share/locale/ro/LC_MESSAGES/pessulus.mo share/locale/ru/LC_MESSAGES/pessulus.mo share/locale/sk/LC_MESSAGES/pessulus.mo share/locale/sl/LC_MESSAGES/pessulus.mo share/locale/sq/LC_MESSAGES/pessulus.mo share/locale/sr/LC_MESSAGES/pessulus.mo -share/locale/sr@Latn/LC_MESSAGES/pessulus.mo +share/locale/sr@latin/LC_MESSAGES/pessulus.mo share/locale/sv/LC_MESSAGES/pessulus.mo share/locale/ta/LC_MESSAGES/pessulus.mo share/locale/te/LC_MESSAGES/pessulus.mo @@ -121,6 +131,10 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/locale/zh_HK @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/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -133,5 +147,7 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @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/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile index aa966f88f1f3..d72b1887b572 100644 --- a/sysutils/policykit-gnome/Makefile +++ b/sysutils/policykit-gnome/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/policykit-gnome/Makefile,v 1.4 2008/02/15 16:48:08 mezz Exp $ +# $MCom: ports/sysutils/policykit-gnome/Makefile,v 1.6 2008/10/03 17:19:43 marcus Exp $ # PORTNAME= policykit-gnome -PORTVERSION= 0.9 +PORTVERSION= 0.9.2 CATEGORIES= sysutils gnome MASTER_SITES= http://hal.freedesktop.org/releases/ DISTNAME= PolicyKit-gnome-${PORTVERSION} @@ -15,13 +15,12 @@ DISTNAME= PolicyKit-gnome-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME frontend to the PolicKit framework -LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \ - sexy.2:${PORTSDIR}/x11-toolkits/libsexy +LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= gnomehack gnometarget gnomevfs2 intlhack gnomedocutils gconf2 +USE_GNOME= gnomehack gnometarget intlhack gnomedocutils gconf2 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ diff --git a/sysutils/policykit-gnome/distinfo b/sysutils/policykit-gnome/distinfo index 1da9b6e37114..7acce486d4c9 100644 --- a/sysutils/policykit-gnome/distinfo +++ b/sysutils/policykit-gnome/distinfo @@ -1,3 +1,3 @@ -MD5 (PolicyKit-gnome-0.9.tar.bz2) = 68374b04289ce99d95a9df19d6217344 -SHA256 (PolicyKit-gnome-0.9.tar.bz2) = 272cedf7f29b97cfe0f1b73b3aae8a164e163bd51b10c6b4724d761c8e8f1fe1 -SIZE (PolicyKit-gnome-0.9.tar.bz2) = 1132238 +MD5 (PolicyKit-gnome-0.9.2.tar.bz2) = fc478b168d0c926a9766b0b415ff4bbf +SHA256 (PolicyKit-gnome-0.9.2.tar.bz2) = ecf4ce303a90a4580c54ee7b932ffaf01b7f115f40b17d75634c5bbfba085c8a +SIZE (PolicyKit-gnome-0.9.2.tar.bz2) = 1223691 diff --git a/sysutils/policykit-gnome/pkg-plist b/sysutils/policykit-gnome/pkg-plist index 5108b9fa224a..74cf093fbb0f 100644 --- a/sysutils/policykit-gnome/pkg-plist +++ b/sysutils/policykit-gnome/pkg-plist @@ -16,6 +16,7 @@ share/applications/polkit-gnome-authorization.desktop share/dbus-1/services/gnome-org.freedesktop.PolicyKit.AuthenticationAgent.service share/dbus-1/services/org.gnome.PolicyKit.AuthorizationManager.service share/dbus-1/services/org.gnome.PolicyKit.service +share/locale/ar/LC_MESSAGES/PolicyKit-gnome.mo share/locale/ca/LC_MESSAGES/PolicyKit-gnome.mo share/locale/cs/LC_MESSAGES/PolicyKit-gnome.mo share/locale/da/LC_MESSAGES/PolicyKit-gnome.mo diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile index 240ac00f5581..bcf4f126560b 100644 --- a/sysutils/policykit/Makefile +++ b/sysutils/policykit/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/policykit/Makefile,v 1.19 2008/01/20 04:41:31 marcus Exp $ +# $MCom: ports/sysutils/policykit/Makefile,v 1.22 2008/08/21 21:53:00 mezz Exp $ # PORTNAME= policykit PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= http://hal.freedesktop.org/releases/ DISTNAME= PolicyKit-${PORTVERSION} @@ -22,7 +22,7 @@ BUILD_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ expat.6:${PORTSDIR}/textproc/expat2 -USE_GNOME= gnomehack gnometarget glib20 intlhack +USE_GNOME= gnomehack glib20 intlhack USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/sysutils/policykit/files/patch-consolekit03 b/sysutils/policykit/files/patch-consolekit03 new file mode 100644 index 000000000000..21ce5e7b8bbd --- /dev/null +++ b/sysutils/policykit/files/patch-consolekit03 @@ -0,0 +1,83 @@ +diff --git a/src/polkit-dbus/polkit-dbus.c b/src/polkit-dbus/polkit-dbus.c +index f7be03f..cad4a76 100644 +--- a/src/polkit-dbus/polkit-dbus.c ++++ src/polkit-dbus/polkit-dbus.c +@@ -214,11 +214,17 @@ polkit_session_new_from_objpath (DBusConnection *con, const char *objpath, uid_t + dbus_message_unref (reply); + goto out; + } ++ /* GetUnixUser API Changed in CK 0.3.0 */ + if (!dbus_message_get_args (reply, NULL, +- DBUS_TYPE_INT32, &uid, ++ DBUS_TYPE_UINT32, &uid, + DBUS_TYPE_INVALID)) { +- kit_warning ("Invalid GetUnixUser reply from CK"); +- goto out; ++ /* try the older API */ ++ if (!dbus_message_get_args (reply, NULL, ++ DBUS_TYPE_INT32, &uid, ++ DBUS_TYPE_INVALID)) { ++ kit_warning ("Invalid GetUnixUser reply from CK"); ++ goto out; ++ } + } + dbus_message_unref (message); + dbus_message_unref (reply); +@@ -1326,16 +1332,21 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message) + + dbus_error_init (&error); + seat_objpath = dbus_message_get_path (message); +- if (!dbus_message_get_args (message, &error, +- DBUS_TYPE_STRING, &session_objpath, ++ /* API fixed in CK 0.3 to match spec */ ++ if (!dbus_message_get_args (message, &error, ++ DBUS_TYPE_OBJECT_PATH, &session_objpath, + DBUS_TYPE_INVALID)) { ++ if (!dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &session_objpath, ++ DBUS_TYPE_INVALID)) { + +- /* TODO: should be _pk_critical */ +- kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat " +- "interface for object %s has the wrong signature! " +- "Your system is misconfigured.", seat_objpath); ++ /* TODO: should be _pk_critical */ ++ kit_warning ("The SessionAdded signal on the org.freedesktop.ConsoleKit.Seat " ++ "interface for object %s has the wrong signature! " ++ "Your system is misconfigured.", seat_objpath); + +- goto out; ++ goto out; ++ } + } + + /* TODO: add to sessions - see polkit_tracker_is_authorization_relevant() */ +@@ -1353,16 +1364,21 @@ polkit_tracker_dbus_func (PolKitTracker *pk_tracker, DBusMessage *message) + + dbus_error_init (&error); + seat_objpath = dbus_message_get_path (message); +- if (!dbus_message_get_args (message, &error, +- DBUS_TYPE_STRING, &session_objpath, ++ /* API fixed in CK 0.3 to match spec */ ++ if (!dbus_message_get_args (message, &error, ++ DBUS_TYPE_OBJECT_PATH, &session_objpath, + DBUS_TYPE_INVALID)) { ++ if (!dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &session_objpath, ++ DBUS_TYPE_INVALID)) { + +- /* TODO: should be _pk_critical */ +- kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat " +- "interface for object %s has the wrong signature! " +- "Your system is misconfigured.", seat_objpath); ++ /* TODO: should be _pk_critical */ ++ kit_warning ("The SessionRemoved signal on the org.freedesktop.ConsoleKit.Seat " ++ "interface for object %s has the wrong signature! " ++ "Your system is misconfigured.", seat_objpath); + +- goto out; ++ goto out; ++ } + } + + _remove_caller_by_session (pk_tracker, session_objpath); diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 15c7e5040cd1..47cfe417c232 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.55 2007/09/18 16:49:47 mezz Exp $ +# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.61 2009/01/09 21:33:07 kwm Exp $ # PORTNAME= gnome-doc-utils -PORTVERSION= 0.12.2 -PORTREVISION= 1 +PORTVERSION= 0.14.2 CATEGORIES= textproc gnome MASTER_SITES= GNOME @@ -25,7 +24,7 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_GNOME= gnomehier gnometarget gnomehack libxslt intlhack +USE_GNOME= gnomehier gnomehack libxslt intlhack USE_PYTHON= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo index 6510966879bf..b4c4638c8b75 100644 --- a/textproc/gnome-doc-utils/distinfo +++ b/textproc/gnome-doc-utils/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-doc-utils-0.12.2.tar.bz2) = e1a9e9ba923b8950f8803c90ebeaadb8 -SHA256 (gnome-doc-utils-0.12.2.tar.bz2) = 8abda2b30ecccb3aedc9f465b667787b4fca9ae80b18e3292901c57ffc484747 -SIZE (gnome-doc-utils-0.12.2.tar.bz2) = 595150 +MD5 (gnome-doc-utils-0.14.2.tar.bz2) = d7a7d8646f34571704e4be62e5c7107f +SHA256 (gnome-doc-utils-0.14.2.tar.bz2) = 0a1ebce8b5cdee44addde6f95625aa6bd5bfe6c8014485e8ec505c686fab1f7f +SIZE (gnome-doc-utils-0.14.2.tar.bz2) = 619515 diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist index 43bb0d5bcf37..7373c22c10ef 100644 --- a/textproc/gnome-doc-utils/pkg-plist +++ b/textproc/gnome-doc-utils/pkg-plist @@ -86,6 +86,7 @@ share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo share/locale/es/LC_MESSAGES/gnome-doc-utils.mo share/locale/et/LC_MESSAGES/gnome-doc-utils.mo share/locale/eu/LC_MESSAGES/gnome-doc-utils.mo +share/locale/fa/LC_MESSAGES/gnome-doc-utils.mo share/locale/fi/LC_MESSAGES/gnome-doc-utils.mo share/locale/fr/LC_MESSAGES/gnome-doc-utils.mo share/locale/gl/LC_MESSAGES/gnome-doc-utils.mo @@ -97,6 +98,7 @@ share/locale/id/LC_MESSAGES/gnome-doc-utils.mo share/locale/it/LC_MESSAGES/gnome-doc-utils.mo share/locale/ja/LC_MESSAGES/gnome-doc-utils.mo share/locale/ka/LC_MESSAGES/gnome-doc-utils.mo +share/locale/kn/LC_MESSAGES/gnome-doc-utils.mo share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo share/locale/lv/LC_MESSAGES/gnome-doc-utils.mo @@ -122,9 +124,10 @@ share/locale/sk/LC_MESSAGES/gnome-doc-utils.mo share/locale/sl/LC_MESSAGES/gnome-doc-utils.mo share/locale/sq/LC_MESSAGES/gnome-doc-utils.mo share/locale/sr/LC_MESSAGES/gnome-doc-utils.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-doc-utils.mo +share/locale/sr@latin/LC_MESSAGES/gnome-doc-utils.mo share/locale/sv/LC_MESSAGES/gnome-doc-utils.mo share/locale/ta/LC_MESSAGES/gnome-doc-utils.mo +share/locale/te/LC_MESSAGES/gnome-doc-utils.mo share/locale/th/LC_MESSAGES/gnome-doc-utils.mo share/locale/tr/LC_MESSAGES/gnome-doc-utils.mo share/locale/ug/LC_MESSAGES/gnome-doc-utils.mo @@ -213,6 +216,10 @@ share/xml2po/xhtml.pyc @dirrmtry share/locale/zh_HK @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@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/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index 08aab60d1035..6c7a1d1c13c1 100644 --- a/textproc/intltool/Makefile +++ b/textproc/intltool/Makefile @@ -3,10 +3,10 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/textproc/intltool/Makefile,v 1.4 2008/02/25 10:42:46 kwm Exp $ +# $MCom: ports/textproc/intltool/Makefile,v 1.11 2008/10/08 21:37:49 marcus Exp $ PORTNAME= intltool -PORTVERSION= 0.37.1 +PORTVERSION= 0.40.5 CATEGORIES= textproc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -21,7 +21,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_ICONV= yes USE_PERL5= yes -USE_GNOME= gnometarget GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir="${PREFIX}/libdata" diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo index a7fc9a8f6690..65c0cf4d6d9b 100644 --- a/textproc/intltool/distinfo +++ b/textproc/intltool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/intltool-0.37.1.tar.bz2) = 860d392f04299c2740d0752501639c3b -SHA256 (gnome/intltool-0.37.1.tar.bz2) = 76cceaaaf188dfac032b21eb5dc4c7d231efe7ff180dee85dbf5e18bc5d27fe7 -SIZE (gnome/intltool-0.37.1.tar.bz2) = 139016 +MD5 (gnome/intltool-0.40.5.tar.bz2) = 3e7ded6f50d88cf8b8bb505eaf591775 +SHA256 (gnome/intltool-0.40.5.tar.bz2) = 29eb68e8042e5ebe7e239fd3e0920bfb1a784de524c2a8fd126d9e41347a3404 +SIZE (gnome/intltool-0.40.5.tar.bz2) = 141110 diff --git a/textproc/intltool/pkg-plist b/textproc/intltool/pkg-plist index 4b957069c95a..a56ce96a60e8 100644 --- a/textproc/intltool/pkg-plist +++ b/textproc/intltool/pkg-plist @@ -6,9 +6,6 @@ bin/intltoolize share/aclocal/intltool.m4 %%DATADIR%%/Makefile.in.in %%DATADIR%%/XML/Parser/Style/OrigTree.pm -%%DATADIR%%/intltool-extract.in -%%DATADIR%%/intltool-merge.in -%%DATADIR%%/intltool-update.in @dirrm %%DATADIR%%/XML/Parser/Style @dirrm %%DATADIR%%/XML/Parser @dirrm %%DATADIR%%/XML diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile index b45c7e367751..a551ca68bd18 100644 --- a/textproc/libxml++26/Makefile +++ b/textproc/libxml++26/Makefile @@ -4,15 +4,13 @@ # Whom: Ying-Chieh Liao <ijliao@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/textproc/libxml++26/Makefile,v 1.25 2008/03/11 04:21:47 mezz Exp $ +# $MCom: ports/textproc/libxml++26/Makefile,v 1.33 2009/01/09 21:44:43 kwm Exp $ # PORTNAME= libxml++ -PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME MAINTAINER= bland@FreeBSD.org COMMENT= XML API for C++ @@ -23,7 +21,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LATEST_LINK= libxml++26 USE_GMAKE= yes -USE_GNOME= gnomehack gnometarget libxml2 pkgconfig +USE_GNOME= gnomehack libxml2 pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -42,9 +40,4 @@ post-patch: @${REINPLACE_CMD} -E '/^SUBDIRS = /s/(docs|examples)//g' ${WRKSRC}/Makefile.in .endif -.if !defined(NOPORTDOCS) -post-configure: - @${TOUCH} ${WRKSRC}/docs/reference/${PORTVERSION:R}/html/index.html -.endif - .include <bsd.port.mk> diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo index 53634aaaf134..48861d79c0c3 100644 --- a/textproc/libxml++26/distinfo +++ b/textproc/libxml++26/distinfo @@ -1,3 +1,3 @@ -MD5 (libxml++-2.22.0.tar.gz) = 0ed7e73ba783839af8ddc0fb81a22526 -SHA256 (libxml++-2.22.0.tar.gz) = 4a874ae2b6608a989523cec96b08034f03e02ac6ec8a1aa271fc1eca141016ab -SIZE (libxml++-2.22.0.tar.gz) = 2067450 +MD5 (libxml++-2.24.2.tar.gz) = 9b2eeb4c4b3bf7aaef2514d0acaa2878 +SHA256 (libxml++-2.24.2.tar.gz) = 84305aa1dab475c7f4c86eefaa27737f57256fb4291609bd1ac936416d307346 +SIZE (libxml++-2.24.2.tar.gz) = 852454 diff --git a/textproc/libxml++26/pkg-plist b/textproc/libxml++26/pkg-plist index 2124a9f6e57e..410e20efe4ef 100644 --- a/textproc/libxml++26/pkg-plist +++ b/textproc/libxml++26/pkg-plist @@ -25,7 +25,9 @@ include/libxml++-%%API_VERSION%%/libxml++/parsers/domparser.h include/libxml++-%%API_VERSION%%/libxml++/parsers/parser.h include/libxml++-%%API_VERSION%%/libxml++/parsers/saxparser.h include/libxml++-%%API_VERSION%%/libxml++/parsers/textreader.h +include/libxml++-%%API_VERSION%%/libxml++/schema.h include/libxml++-%%API_VERSION%%/libxml++/validators/dtdvalidator.h +include/libxml++-%%API_VERSION%%/libxml++/validators/schemavalidator.h include/libxml++-%%API_VERSION%%/libxml++/validators/validator.h lib/libxml++-%%VERSION%%.a lib/libxml++-%%VERSION%%.la @@ -34,281 +36,309 @@ lib/libxml++-%%VERSION%%.so.2 libdata/pkgconfig/libxml++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/manual/html/ar01s02.html %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/manual/html/index.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/annotated.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/attribute_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/cdatanode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classbool.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classes.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Attribute__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CdataNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1CommentNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ContentNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Document__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DomParser__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Dtd-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Dtd.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1DtdValidator__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Element__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1EntityReference__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1KeepBlanks-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1KeepBlanks.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Node__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1NonCopyable__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1OutputBuffer__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextNode__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1TextReader__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Validator__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1exception__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1internal__error__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1parse__error__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error__inherit__graph.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error__inherit__graph.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error__inherit__graph.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/commentnode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/contentnode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_32008f4d917c53e6cfd05a5ea51dedc7.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_32008f4d917c53e6cfd05a5ea51dedc7_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_32008f4d917c53e6cfd05a5ea51dedc7_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980_dep.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980_dep.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dirs.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/document_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/domparser_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/doxygen.css -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/doxygen.png -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dtd_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dtdvalidator_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/element_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/entityreference_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/exception_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/files.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x63.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x64.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x65.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x66.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x67.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x68.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x69.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6b.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6c.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6d.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6e.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x6f.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x70.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x72.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x73.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x74.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x76.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x77.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x78.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x7e.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_enum.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_eval.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x63.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x64.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x65.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x66.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x67.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x68.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x69.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6b.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6c.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6d.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6e.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6f.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x70.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x72.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x73.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x74.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x76.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x77.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x7e.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_rela.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_type.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_vars.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_defs.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_enum.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_eval.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_type.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/graph_legend.dot -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/graph_legend.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/graph_legend.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/hierarchy.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/index.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__0.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__0.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__0.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__1.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__1.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__1.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__2.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__2.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__2.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__3.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__3.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__3.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__4.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__4.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__4.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__5.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__5.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__5.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__6.jpg -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__6.map -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherit__graph__6.md5 -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/inherits.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/internal__error_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/istreamparserinputbuffer_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/keepblanks_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/libxml++_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/libxml++config_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_enum.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_eval.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_type.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespaces.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacesigc.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacestatic_01const_01std.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacexmlpp.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/newin2p20s.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/node_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/noncopyable_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/ostreamoutputbuffer_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/outputbuffer_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/pages.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parse__error_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parser_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parserinputbuffer_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/processinginstructionnode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/saxparser_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1Attribute.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/tabs.css -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/textnode_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/textreader_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/validator_8h.html -%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/validity__error_8h.html -%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html -%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%% +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/annotated.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/attribute_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/cdatanode_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/class__Ios__Openmode.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/class____basic__file_3_01char_01_4.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/class____gthread__mutex__t.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classbool.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classes.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classptrdiff__t.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Attribute__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CdataNode__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1CommentNode__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ContentNode__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Document__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DomParser__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Dtd-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Dtd.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1DtdValidator__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Element__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1EntityReference__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1IStreamParserInputBuffer__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1KeepBlanks-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1KeepBlanks.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Node__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1NonCopyable__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OStreamOutputBuffer__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1OutputBuffer__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ParserInputBuffer__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Parser__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SaxParser__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1SchemaValidator__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Schema__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextNode__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1TextReader__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1Validator__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1exception__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1internal__error__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1parse__error__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/classxmlpp_1_1validity__error__inherit__graph.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/commentnode_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/contentnode_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_09175cceffbf8f82a4b8bcfb55735ae0.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_09175cceffbf8f82a4b8bcfb55735ae0_dep.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_09175cceffbf8f82a4b8bcfb55735ae0_dep.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_115a96c3ede874068b194b914ec45c5e.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_115a96c3ede874068b194b914ec45c5e_dep.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_115a96c3ede874068b194b914ec45c5e_dep.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_2e70e6ebf5a2a9d0ff304933c4e7de93.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_2e70e6ebf5a2a9d0ff304933c4e7de93_dep.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_2e70e6ebf5a2a9d0ff304933c4e7de93_dep.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_6dfcea9398f8561a02a06b98c3a994a4.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_6dfcea9398f8561a02a06b98c3a994a4_dep.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_6dfcea9398f8561a02a06b98c3a994a4_dep.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_d0d921f942df7100872be0f0c0023162.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_d0d921f942df7100872be0f0c0023162_dep.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_d0d921f942df7100872be0f0c0023162_dep.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_f2f24ec5780f043b4b2b5292a9185f09.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_f2f24ec5780f043b4b2b5292a9185f09_dep.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dir_f2f24ec5780f043b4b2b5292a9185f09_dep.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dirs.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/document_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/domparser_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/doxygen.css +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/doxygen.png +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dtd_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/dtdvalidator_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/element_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/entityreference_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/exception_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/files.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x63.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x64.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x65.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x66.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x67.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x68.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x69.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6b.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6c.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6d.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6e.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x6f.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x70.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x72.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x73.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x74.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x76.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x77.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x78.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_0x7e.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_enum.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_eval.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x63.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x64.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x65.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x66.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x67.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x68.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x69.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6b.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6c.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6d.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6e.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x6f.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x70.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x72.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x73.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x74.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x76.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x77.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_func_0x7e.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_rela.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_type.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/functions_vars.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/globals.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/globals_defs.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/graph_legend.dot +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/graph_legend.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/graph_legend.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/hierarchy.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/index.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__0.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__0.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__0.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__1.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__1.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__1.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__10.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__10.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__10.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__2.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__2.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__2.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__3.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__3.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__3.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__4.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__4.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__4.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__5.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__5.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__5.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__6.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__6.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__6.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__7.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__7.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__7.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__8.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__8.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__8.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__9.jpg +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__9.map +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherit__graph__9.md5 +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/inherits.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/internal__error_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/istreamparserinputbuffer_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/keepblanks_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/libxml_09_09_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/libxml_09_09config_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacemembers.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacemembers_enum.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacemembers_eval.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacemembers_type.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespaces.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacesigc.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacestatic_01const_01std.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/namespacexmlpp.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/newin2p20s.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/newin2p24s.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/node_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/noncopyable_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/ostreamoutputbuffer_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/outputbuffer_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/pages.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/parse__error_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/parser_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/parserinputbuffer_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/processinginstructionnode_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/saxparser_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/schema_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/schemavalidator_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/structxmlpp_1_1SaxParser_1_1Attribute.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/tabs.css +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/textnode_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/textreader_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/validator_8h.html +%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/html/validity__error_8h.html +%%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference/html %%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/reference %%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/manual/html %%PORTDOCS%%@dirrm share/doc/libxml++-%%API_VERSION%%/docs/manual diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 5f0733fa8f61..55d2ead37bd0 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -12,8 +12,8 @@ # PORTNAME= libxml2 -PORTVERSION= 2.6.32 -PORTREVISION?= 2 +PORTVERSION= 2.7.2 +PORTREVISION?= 1 CATEGORIES?= textproc gnome MASTER_SITES= ftp://fr.rpmfind.net/pub/libxml/ \ ftp://gd.tuwien.ac.at/pub/libxml/ \ diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index 28394f2f72c7..dee3d93170bb 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libxml2-2.6.32.tar.gz) = 2621d322c16f0257e30f0ff2b13384de -SHA256 (gnome2/libxml2-2.6.32.tar.gz) = 1b4428b879afcaae3c2013b21283baad040661fbd502e893e83adc3d15c85d53 -SIZE (gnome2/libxml2-2.6.32.tar.gz) = 4722227 +MD5 (gnome2/libxml2-2.7.2.tar.gz) = dc43ff7ae6aded45f578c87b7b0c8766 +SHA256 (gnome2/libxml2-2.7.2.tar.gz) = c01bd621f771cdee349877f55cc841a1bdfb206b2cf5c9aa62aa6a9680e61980 +SIZE (gnome2/libxml2-2.7.2.tar.gz) = 4790639 diff --git a/textproc/libxml2/files/patch-CVE-2008-3281 b/textproc/libxml2/files/patch-CVE-2008-3281 deleted file mode 100644 index b8fa9047e4bb..000000000000 --- a/textproc/libxml2/files/patch-CVE-2008-3281 +++ /dev/null @@ -1,412 +0,0 @@ -diff -pruN libxml2-2.6.31.cve-2008-3281/entities.c libxml2-2.6.31/entities.c ---- libxml2-2.6.31.cve-2008-3281/entities.c 2007-01-03 08:07:52.000000000 -0500 -+++ entities.c 2008-09-11 16:08:42.000000000 -0400 -@@ -102,7 +102,7 @@ xmlFreeEntity(xmlEntityPtr entity) - dict = entity->doc->dict; - - -- if ((entity->children) && (entity->owner == 1) && -+ if ((entity->children) && (entity->owner != 0) && - (entity == (xmlEntityPtr) entity->children->parent)) - xmlFreeNodeList(entity->children); - if (dict != NULL) { -diff -pruN libxml2-2.6.31.cve-2008-3281/include/libxml/parser.h libxml2-2.6.31/include/libxml/parser.h ---- libxml2-2.6.31.cve-2008-3281/include/libxml/parser.h 2007-01-03 08:07:30.000000000 -0500 -+++ include/libxml/parser.h 2008-09-11 16:08:42.000000000 -0400 -@@ -297,6 +297,8 @@ struct _xmlParserCtxt { - */ - xmlError lastError; - xmlParserMode parseMode; /* the parser mode */ -+ unsigned long nbentities; /* number of entities references */ -+ unsigned long sizeentities; /* size of parsed entities */ - }; - - /** -diff -pruN libxml2-2.6.31.cve-2008-3281/parser.c libxml2-2.6.31/parser.c ---- libxml2-2.6.31.cve-2008-3281/parser.c 2008-01-11 01:36:20.000000000 -0500 -+++ parser.c 2008-09-11 16:10:45.000000000 -0400 -@@ -80,6 +80,95 @@ - #include <zlib.h> - #endif - -+static void -+xmlFatalErr(xmlParserCtxtPtr ctxt, xmlParserErrors error, const char *info); -+ -+/************************************************************************ -+ * * -+ * Arbitrary limits set in the parser. * -+ * * -+ ************************************************************************/ -+ -+#define XML_PARSER_BIG_ENTITY 1000 -+#define XML_PARSER_LOT_ENTITY 5000 -+ -+/* -+ * XML_PARSER_NON_LINEAR is the threshold where the ratio of parsed entity -+ * replacement over the size in byte of the input indicates that you have -+ * and eponential behaviour. A value of 10 correspond to at least 3 entity -+ * replacement per byte of input. -+ */ -+#define XML_PARSER_NON_LINEAR 10 -+ -+/* -+ * xmlParserEntityCheck -+ * -+ * Function to check non-linear entity expansion behaviour -+ * This is here to detect and stop exponential linear entity expansion -+ * This is not a limitation of the parser but a safety -+ * boundary feature. -+ */ -+static int -+xmlParserEntityCheck(xmlParserCtxtPtr ctxt, unsigned long size, -+ xmlEntityPtr ent) -+{ -+ unsigned long consumed = 0; -+ -+ if (ctxt == NULL) -+ return (0); -+ if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP) -+ return (1); -+ if (size != 0) { -+ /* -+ * Do the check based on the replacement size of the entity -+ */ -+ if (size < XML_PARSER_BIG_ENTITY) -+ return(0); -+ -+ /* -+ * A limit on the amount of text data reasonably used -+ */ -+ if (ctxt->input != NULL) { -+ consumed = ctxt->input->consumed + -+ (ctxt->input->cur - ctxt->input->base); -+ } -+ consumed += ctxt->sizeentities; -+ -+ if ((size < XML_PARSER_NON_LINEAR * consumed) && -+ (ctxt->nbentities * 3 < XML_PARSER_NON_LINEAR * consumed)) -+ return (0); -+ } else if (ent != NULL) { -+ /* -+ * use the number of parsed entities in the replacement -+ */ -+ size = ent->owner; -+ -+ /* -+ * The amount of data parsed counting entities size only once -+ */ -+ if (ctxt->input != NULL) { -+ consumed = ctxt->input->consumed + -+ (ctxt->input->cur - ctxt->input->base); -+ } -+ consumed += ctxt->sizeentities; -+ -+ /* -+ * Check the density of entities for the amount of data -+ * knowing an entity reference will take at least 3 bytes -+ */ -+ if (size * 3 < consumed * XML_PARSER_NON_LINEAR) -+ return (0); -+ } else { -+ /* -+ * strange we got no data for checking just return -+ */ -+ return (0); -+ } -+ -+ xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL); -+ return (1); -+} -+ - /** - * xmlParserMaxDepth: - * -@@ -2260,6 +2349,10 @@ xmlStringLenDecodeEntities(xmlParserCtxt - "String decoding Entity Reference: %.30s\n", - str); - ent = xmlParseStringEntityRef(ctxt, &str); -+ if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP) -+ goto int_error; -+ if (ent != NULL) -+ ctxt->nbentities += ent->owner; - if ((ent != NULL) && - (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) { - if (ent->content != NULL) { -@@ -2284,6 +2377,10 @@ xmlStringLenDecodeEntities(xmlParserCtxt - buffer[nbchars++] = *current++; - if (nbchars > - buffer_size - XML_PARSER_BUFFER_SIZE) { -+ if (xmlParserEntityCheck(ctxt, nbchars, ent)) { -+ xmlFree(rep); -+ goto int_error; -+ } - growBuffer(buffer); - } - } -@@ -2306,6 +2403,10 @@ xmlStringLenDecodeEntities(xmlParserCtxt - xmlGenericError(xmlGenericErrorContext, - "String decoding PE Reference: %.30s\n", str); - ent = xmlParseStringPEReference(ctxt, &str); -+ if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP) -+ goto int_error; -+ if (ent != NULL) -+ ctxt->nbentities += ent->owner; - if (ent != NULL) { - xmlChar *rep; - -@@ -2319,6 +2420,10 @@ xmlStringLenDecodeEntities(xmlParserCtxt - buffer[nbchars++] = *current++; - if (nbchars > - buffer_size - XML_PARSER_BUFFER_SIZE) { -+ if (xmlParserEntityCheck(ctxt, nbchars, ent)) { -+ xmlFree(rep); -+ goto int_error; -+ } - growBuffer(buffer); - } - } -@@ -2466,6 +2571,7 @@ xmlStringLenDecodeEntities(xmlParserCtxt - - mem_error: - xmlErrMemory(ctxt, NULL); -+int_error: - if (rep != NULL) - xmlFree(rep); - if (buffer != NULL) -@@ -3151,6 +3259,9 @@ xmlParseAttValueComplex(xmlParserCtxtPtr - } - } else { - ent = xmlParseEntityRef(ctxt); -+ ctxt->nbentities++; -+ if (ent != NULL) -+ ctxt->nbentities += ent->owner; - if ((ent != NULL) && - (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) { - if (len > buf_size - 10) { -@@ -4433,6 +4544,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt - int isParameter = 0; - xmlChar *orig = NULL; - int skipped; -+ unsigned long oldnbent = ctxt->nbentities; - - /* GROW; done in the caller */ - if (CMP8(CUR_PTR, '<', '!', 'E', 'N', 'T', 'I', 'T', 'Y')) { -@@ -4642,6 +4754,11 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt - } - } - if (cur != NULL) { -+ if ((cur->owner != 0) || (cur->children == NULL)) { -+ cur->owner = ctxt->nbentities - oldnbent; -+ if (cur->owner == 0) -+ cur->owner = 1; -+ } - if (cur->orig != NULL) - xmlFree(orig); - else -@@ -6071,7 +6188,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) - (ent->children == NULL)) { - ent->children = list; - ent->last = list; -- ent->owner = 1; -+ if (ent->owner == 0) -+ ent->owner = 1; - list->parent = (xmlNodePtr) ent; - } else { - xmlFreeNodeList(list); -@@ -6080,6 +6198,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) - xmlFreeNodeList(list); - } - } else { -+ unsigned long oldnbent = ctxt->nbentities; - /* - * 4.3.2: An internal general parsed entity is well-formed - * if its replacement text matches the production labeled -@@ -6102,6 +6221,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) - ret = xmlParseBalancedChunkMemoryInternal(ctxt, - value, user_data, &list); - ctxt->depth--; -+ - } else if (ent->etype == - XML_EXTERNAL_GENERAL_PARSED_ENTITY) { - ctxt->depth++; -@@ -6114,6 +6234,24 @@ xmlParseReference(xmlParserCtxtPtr ctxt) - xmlErrMsgStr(ctxt, XML_ERR_INTERNAL_ERROR, - "invalid entity type found\n", NULL); - } -+ /* -+ * Store the number of entities needing parsing for entity -+ * content and do checkings -+ */ -+ if ((ent->owner != 0) || (ent->children == NULL)) { -+ ent->owner = ctxt->nbentities - oldnbent; -+ if (ent->owner == 0) -+ ent->owner = 1; -+ } -+ if (ret == XML_ERR_ENTITY_LOOP) { -+ xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL); -+ xmlFreeNodeList(list); -+ return; -+ } -+ if (xmlParserEntityCheck(ctxt, 0, ent)) { -+ xmlFreeNodeList(list); -+ return; -+ } - if (ret == XML_ERR_ENTITY_LOOP) { - xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL); - return; -@@ -6132,7 +6270,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) - (ctxt->parseMode == XML_PARSE_READER)) { - list->parent = (xmlNodePtr) ent; - list = NULL; -- ent->owner = 1; -+ if (ent->owner == 0) -+ ent->owner = 1; - } else { - ent->owner = 0; - while (list != NULL) { -@@ -6149,7 +6288,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) - #endif /* LIBXML_LEGACY_ENABLED */ - } - } else { -- ent->owner = 1; -+ if (ent->owner == 0) -+ ent->owner = 1; - while (list != NULL) { - list->parent = (xmlNodePtr) ent; - if (list->next == NULL) -@@ -6326,7 +6466,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) - break; - cur = next; - } -- ent->owner = 1; -+ if (ent->owner == 0) -+ ent->owner = 1; - #ifdef LIBXML_LEGACY_ENABLED - if (ent->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY) - xmlAddEntityReference(ent, firstChild, nw); -@@ -6357,6 +6498,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) - ctxt->nodelen = 0; - return; - } -+ } else if (ent->owner != 1) { -+ ctxt->nbentities += ent->owner; - } - } else { - val = ent->content; -@@ -6416,6 +6559,11 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) - if (RAW == ';') { - NEXT; - /* -+ * Increase the number of entity references parsed -+ */ -+ ctxt->nbentities++; -+ -+ /* - * Ask first SAX for entity resolution, otherwise try the - * predefined set. - */ -@@ -6587,6 +6735,10 @@ xmlParseStringEntityRef(xmlParserCtxtPtr - if (*ptr == ';') { - ptr++; - /* -+ * Increase the number of entity references parsed -+ */ -+ ctxt->nbentities++; -+ /* - * Ask first SAX for entity resolution, otherwise try the - * predefined set. - */ -@@ -6748,6 +6900,11 @@ xmlParsePEReference(xmlParserCtxtPtr ctx - } else { - if (RAW == ';') { - NEXT; -+ /* -+ * Increase the number of entity references parsed -+ */ -+ ctxt->nbentities++; -+ - if ((ctxt->sax != NULL) && - (ctxt->sax->getParameterEntity != NULL)) - entity = ctxt->sax->getParameterEntity(ctxt->userData, -@@ -6878,6 +7035,11 @@ xmlParseStringPEReference(xmlParserCtxtP - if (cur == ';') { - ptr++; - cur = *ptr; -+ /* -+ * Increase the number of entity references parsed -+ */ -+ ctxt->nbentities++; -+ - if ((ctxt->sax != NULL) && - (ctxt->sax->getParameterEntity != NULL)) - entity = ctxt->sax->getParameterEntity(ctxt->userData, -@@ -11537,11 +11699,31 @@ xmlParseExternalEntityPrivate(xmlDocPtr - } - ret = XML_ERR_OK; - } -+ -+ /* -+ * Record in the parent context the number of entities replacement -+ * done when parsing that reference. -+ */ -+ oldctxt->nbentities += ctxt->nbentities; -+ /* -+ * Also record the size of the entity parsed -+ */ -+ if (ctxt->input != NULL) { -+ oldctxt->sizeentities += ctxt->input->consumed; -+ oldctxt->sizeentities += (ctxt->input->cur - ctxt->input->base); -+ } -+ /* -+ * And record the last error if any -+ */ -+ if (ctxt->lastError.code != XML_ERR_OK) -+ xmlCopyError(&ctxt->lastError, &oldctxt->lastError); -+ - if (sax != NULL) - ctxt->sax = oldsax; - oldctxt->node_seq.maximum = ctxt->node_seq.maximum; - oldctxt->node_seq.length = ctxt->node_seq.length; - oldctxt->node_seq.buffer = ctxt->node_seq.buffer; -+ oldctxt->nbentities += ctxt->nbentities; - ctxt->node_seq.maximum = 0; - ctxt->node_seq.length = 0; - ctxt->node_seq.buffer = NULL; -@@ -11766,6 +11948,17 @@ xmlParseBalancedChunkMemoryInternal(xmlP - ctxt->myDoc->last = last; - } - -+ /* -+ * Record in the parent context the number of entities replacement -+ * done when parsing that reference. -+ */ -+ oldctxt->nbentities += ctxt->nbentities; -+ /* -+ * Also record the last error if any -+ */ -+ if (ctxt->lastError.code != XML_ERR_OK) -+ xmlCopyError(&ctxt->lastError, &oldctxt->lastError); -+ - ctxt->sax = oldsax; - ctxt->dict = NULL; - ctxt->attsDefault = NULL; -@@ -13077,6 +13270,8 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt) - ctxt->depth = 0; - ctxt->charset = XML_CHAR_ENCODING_UTF8; - ctxt->catalogs = NULL; -+ ctxt->nbentities = 0; -+ ctxt->sizeentities = 0; - xmlInitNodeInfoSeq(&ctxt->node_seq); - - if (ctxt->attsDefault != NULL) { -diff -pruN libxml2-2.6.31.cve-2008-3281/parserInternals.c libxml2-2.6.31/parserInternals.c ---- libxml2-2.6.31.cve-2008-3281/parserInternals.c 2007-12-14 06:17:14.000000000 -0500 -+++ parserInternals.c 2008-09-11 16:08:42.000000000 -0400 -@@ -1669,6 +1669,7 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt) - ctxt->depth = 0; - ctxt->charset = XML_CHAR_ENCODING_UTF8; - ctxt->catalogs = NULL; -+ ctxt->nbentities = 0; - xmlInitNodeInfoSeq(&ctxt->node_seq); - return(0); - } diff --git a/textproc/libxml2/files/patch-CVE-2008-3529 b/textproc/libxml2/files/patch-CVE-2008-3529 deleted file mode 100644 index 943fa2b8005b..000000000000 --- a/textproc/libxml2/files/patch-CVE-2008-3529 +++ /dev/null @@ -1,19 +0,0 @@ ---- parser.c.orig 2008-09-03 15:55:59.000000000 +0200 -+++ parser.c 2008-09-03 16:30:22.000000000 +0200 -@@ -2301,6 +2301,7 @@ xmlParserHandlePEReference(xmlParserCtxt - */ - #define growBuffer(buffer) { \ - xmlChar *tmp; \ -+ buffer##_size += XML_PARSER_BUFFER_SIZE ; \ - buffer##_size *= 2; \ - tmp = (xmlChar *) \ - xmlRealloc(buffer, buffer##_size * sizeof(xmlChar)); \ -@@ -3341,7 +3342,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr - * Just output the reference - */ - buf[len++] = '&'; -- if (len > buf_size - i - 10) { -+ while (len > buf_size - i - 10) { - growBuffer(buf); - } - for (;i > 0;i--) diff --git a/textproc/libxml2/files/patch-CVE-2008-4225 b/textproc/libxml2/files/patch-CVE-2008-4225 index 6d1155794f62..0666795c6abc 100644 --- a/textproc/libxml2/files/patch-CVE-2008-4225 +++ b/textproc/libxml2/files/patch-CVE-2008-4225 @@ -1,5 +1,5 @@ ---- tree.c.orig 2008-11-19 13:14:41.000000000 -0600 -+++ tree.c 2008-11-19 13:17:07.000000000 -0600 +--- tree.c.orig 2008-10-31 18:14:00.000000000 -0700 ++++ tree.c 2008-10-31 18:14:35.000000000 -0700 @@ -14,7 +14,7 @@ #include "libxml.h" @@ -9,18 +9,18 @@ #ifdef HAVE_CTYPE_H #include <ctype.h> #endif -@@ -6916,7 +6916,13 @@ - case XML_BUFFER_ALLOC_DOUBLEIT: - /*take care of empty case*/ - newSize = (buf->size ? buf->size*2 : size + 10); -- while (size > newSize) newSize *= 2; -+ while (size > newSize) { -+ if (newSize > UINT_MAX / 2) { -+ xmlTreeErrMemory("growing buffer"); -+ return 0; -+ } -+ newSize *= 2; -+ } - break; - case XML_BUFFER_ALLOC_EXACT: - newSize = size+10; +@@ -6996,7 +6996,13 @@ + case XML_BUFFER_ALLOC_DOUBLEIT: + /*take care of empty case*/ + newSize = (buf->size ? buf->size*2 : size + 10); +- while (size > newSize) newSize *= 2; ++ while (size > newSize) { ++ if (newSize > UINT_MAX / 2) { ++ xmlTreeErrMemory("growing buffer"); ++ return 0; ++ } ++ newSize *= 2; ++ } + break; + case XML_BUFFER_ALLOC_EXACT: + newSize = size+10; diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa index d7c7e50a9d88..c8b294955bf6 100644 --- a/textproc/libxml2/files/patch-aa +++ b/textproc/libxml2/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2008-01-22 15:47:56.000000000 -0500 -+++ Makefile.in 2008-01-22 15:49:21.000000000 -0500 -@@ -486,13 +486,13 @@ sysconfdir = @sysconfdir@ +--- Makefile.in.orig 2008-10-05 07:36:15.299141562 -0400 ++++ Makefile.in 2008-10-05 07:41:11.883687363 -0400 +@@ -513,13 +513,13 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -16,16 +16,16 @@ @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ @WITH_TRIO_SOURCES_FALSE@ parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \ @WITH_TRIO_SOURCES_FALSE@ valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c \ -@@ -590,7 +590,7 @@ testapi_LDFLAGS = - testapi_DEPENDENCIES = $(DEPS) - testapi_LDADD = $(LDADDS) - CLEANFILES = xml2Conf.sh +@@ -633,7 +633,7 @@ + runxmlconf_DEPENDENCIES = $(DEPS) + runxmlconf_LDADD = $(LDADDS) + CLEANFILES = xml2Conf.sh *.gcda *.gcno -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = xml2Conf.sh CVS_EXTRA_DIST = EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ -@@ -613,8 +613,8 @@ pkgconfig_DATA = libxml-2.0.pc +@@ -656,8 +656,8 @@ # Install the tests program sources as examples # BASE_DIR = $(datadir)/doc @@ -33,12 +33,12 @@ -EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples +DOC_MODULE = libxml2 +EXAMPLES_DIR = $(datadir)/examples/libxml2 - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -1344,7 +1344,7 @@ distcleancheck: distclean + # + # Coverage support, largely borrowed from libvirt +@@ -1414,7 +1414,7 @@ + exit 1; } >&2 check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \ diff --git a/textproc/py-libxml2/pkg-plist b/textproc/py-libxml2/pkg-plist index 230898a27a30..bfa1da59c6a8 100644 --- a/textproc/py-libxml2/pkg-plist +++ b/textproc/py-libxml2/pkg-plist @@ -55,6 +55,7 @@ %%EXAMPLESDIR%%/walker.py %%EXAMPLESDIR%%/xpath.py %%EXAMPLESDIR%%/xpathext.py +%%EXAMPLESDIR%%/xpathleak.py %%EXAMPLESDIR%%/xpathns.py %%EXAMPLESDIR%%/xpathret.py @dirrm %%EXAMPLESDIR%% diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index c2633f3571e8..64e51f1a2c01 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.105 2008/03/11 17:19:08 mezz Exp $ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.110 2008/10/21 01:27:34 kwm Exp $ # PORTNAME= epiphany-extensions -PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTVERSION= 2.24.1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +22,7 @@ RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany USE_GETTEXT= yes USE_BZIP2= yes USE_GECKO= firefox xulrunner -USE_GNOME= gnomeprefix gnomehack intlhack gnometarget +USE_GNOME= gnomeprefix gnomehack intlhack INSTALLS_OMF= yes GNU_CONFIGURE= yes USE_GMAKE= yes @@ -34,9 +33,9 @@ CONFIGURE_ARGS= --with-mozilla=${GECKO} GCONF_SCHEMAS= smart-bookmarks.schemas EPHY_EXTENSIONS=all,rss -EPHY_VERSION= 2.22 +EPHY_VERSION= ${PORTVERSION:R} -PLIST_SUB= VERSION="2.22" EPHY_VERSION=${EPHY_VERSION} +PLIST_SUB= VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION} OPTIONS= OPENSP "Enable OpenSP SGML support" off diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index 38e3ada433f0..ecded60f346c 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-extensions-2.22.2.tar.bz2) = 9728577d63117275d8f12d529ecc866d -SHA256 (gnome2/epiphany-extensions-2.22.2.tar.bz2) = de649d99d19c20d41d6c466ecbaa82a244679fcb0d2bf30ced8b340c4e2481d4 -SIZE (gnome2/epiphany-extensions-2.22.2.tar.bz2) = 947322 +MD5 (gnome2/epiphany-extensions-2.24.1.tar.bz2) = 2552ef6c4f059c0dd76a3a57b59aaa9a +SHA256 (gnome2/epiphany-extensions-2.24.1.tar.bz2) = d7c8570c73fc9539c038d927be16b9310e4d2657f9ebe3751b36c01d412f6b74 +SIZE (gnome2/epiphany-extensions-2.24.1.tar.bz2) = 1023406 diff --git a/www/epiphany-webkit/Makefile b/www/epiphany-webkit/Makefile index 3bdfbbb3e795..2be23b9e134c 100644 --- a/www/epiphany-webkit/Makefile +++ b/www/epiphany-webkit/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany-webkit/Makefile,v 1.2 2008/02/24 22:10:56 ahze Exp $ +# $MCom: ports/www/epiphany-webkit/Makefile,v 1.8 2008/06/18 18:40:49 marcus Exp $ PORTVERSION= 0 PKGNAMESUFFIX= -webkit diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 7383a988d046..b758202eaa53 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/epiphany/Makefile,v 1.11 2008/08/06 04:20:12 mezz Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.188 2008/11/27 01:59:20 marcus Exp $ # PORTNAME= epiphany -PORTVERSION= 2.22.3 -PORTREVISION?= 1 +PORTVERSION= 2.24.2.1 +PORTREVISION?= 0 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -53,7 +53,7 @@ WITH_GNOME= yes .include <bsd.port.pre.mk> .if defined(EPHY_SLAVE) && ${EPHY_SLAVE}=="webkit" -LIB_DEPENDS+= WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2 CONFIGURE_ARGS+= --with-engine=webkit EXTRA_CFLAGS+= `pkg-config --cflags WebKitGtk` -I${LOCALBASE}/include/WebKit/webkit EXTRA_LIBS+= `pkg-config --libs WebKitGtk` diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index 776cfec5a29d..99e34c00e91b 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-2.22.3.tar.bz2) = 7d058b57cb3e992889e456848fcc89a9 -SHA256 (gnome2/epiphany-2.22.3.tar.bz2) = d61c4fe6cc351bab526d0973491f704db592a9e65d9fbf86c7a9607decb94215 -SIZE (gnome2/epiphany-2.22.3.tar.bz2) = 5718239 +MD5 (gnome2/epiphany-2.24.2.1.tar.bz2) = c4993233792e83b00df11feae950e201 +SHA256 (gnome2/epiphany-2.24.2.1.tar.bz2) = f2fd6df89671262043362b96cc30a90b678679dbfad9ed9724d528289e2a505a +SIZE (gnome2/epiphany-2.24.2.1.tar.bz2) = 5724989 diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index 10c5e6f52a2d..51bc2d1fdb07 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -142,6 +142,11 @@ share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.pn share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/ca/figures/ephy-screenshot.png +share/gnome/help/epiphany/cs/epiphany.xml +share/gnome/help/epiphany/cs/figures/ephy-addressbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/cs/figures/ephy-bookmarkbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/cs/figures/ephy-history-window-screenshot.png +share/gnome/help/epiphany/cs/figures/ephy-screenshot.png share/gnome/help/epiphany/de/epiphany.xml share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png @@ -224,6 +229,7 @@ share/icons/hicolor/scalable/apps/gnome-web-browser.svg share/locale/am/LC_MESSAGES/epiphany.mo share/locale/ar/LC_MESSAGES/epiphany.mo share/locale/as/LC_MESSAGES/epiphany.mo +share/locale/ast/LC_MESSAGES/epiphany.mo share/locale/az/LC_MESSAGES/epiphany.mo share/locale/be/LC_MESSAGES/epiphany.mo share/locale/be@latin/LC_MESSAGES/epiphany.mo @@ -289,7 +295,7 @@ share/locale/sk/LC_MESSAGES/epiphany.mo share/locale/sl/LC_MESSAGES/epiphany.mo share/locale/sq/LC_MESSAGES/epiphany.mo share/locale/sr/LC_MESSAGES/epiphany.mo -share/locale/sr@Latn/LC_MESSAGES/epiphany.mo +share/locale/sr@latin/LC_MESSAGES/epiphany.mo share/locale/sv/LC_MESSAGES/epiphany.mo share/locale/ta/LC_MESSAGES/epiphany.mo share/locale/te/LC_MESSAGES/epiphany.mo @@ -305,6 +311,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo share/omf/epiphany/epiphany-C.omf share/omf/epiphany/epiphany-bg.omf share/omf/epiphany/epiphany-ca.omf +share/omf/epiphany/epiphany-cs.omf share/omf/epiphany/epiphany-de.omf share/omf/epiphany/epiphany-el.omf share/omf/epiphany/epiphany-en_GB.omf @@ -352,6 +359,8 @@ share/pygtk/2.0/defs/epiphany.defs @dirrm share/gnome/help/epiphany/el @dirrm share/gnome/help/epiphany/de/figures @dirrm share/gnome/help/epiphany/de +@dirrm share/gnome/help/epiphany/cs/figures +@dirrm share/gnome/help/epiphany/cs @dirrm share/gnome/help/epiphany/ca/figures @dirrm share/gnome/help/epiphany/ca @dirrm share/gnome/help/epiphany/bg/figures @@ -401,6 +410,8 @@ share/pygtk/2.0/defs/epiphany.defs @dirrmtry share/locale/zh_HK @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -421,5 +432,7 @@ share/pygtk/2.0/defs/epiphany.defs @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index 98c2e9cd46bb..55c46799ec61 100644 --- a/www/evolution-webcal/Makefile +++ b/www/evolution-webcal/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@rainbow-runner.nl> # # $FreeBSD$ -# $MCom: ports/www/evolution-webcal/Makefile,v 1.54 2008/02/25 10:46:40 kwm Exp $ +# $MCom: ports/www/evolution-webcal/Makefile,v 1.58 2008/09/23 15:37:03 kwm Exp $ # PORTNAME= evolution-webcal -PORTVERSION= 2.21.92 -PORTREVISION= 3 +PORTVERSION= 2.24.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo index d5c1ae16d141..cd6b33201b3e 100644 --- a/www/evolution-webcal/distinfo +++ b/www/evolution-webcal/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-webcal-2.21.92.tar.bz2) = 049ea414f6d82a1e4b1e88f71a4f19cb -SHA256 (evolution-webcal-2.21.92.tar.bz2) = c583707d338edf7957a2f92804901569c9f6c1b2d16ba3682b92ba96fa300dca -SIZE (evolution-webcal-2.21.92.tar.bz2) = 199394 +MD5 (evolution-webcal-2.24.0.tar.bz2) = 8030ebaefb18050c079a71dc23701d82 +SHA256 (evolution-webcal-2.24.0.tar.bz2) = 370278680634f65717df9cef98f9a731eb93d58d303f322be51d7b38b1ff29a9 +SIZE (evolution-webcal-2.24.0.tar.bz2) = 153766 diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index a7beaebff5b2..f8b5a4ad950e 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -2,6 +2,7 @@ libexec/evolution-webcal share/locale/ar/LC_MESSAGES/evolution-webcal.mo share/locale/as/LC_MESSAGES/evolution-webcal.mo share/locale/az/LC_MESSAGES/evolution-webcal.mo +share/locale/be@latin/LC_MESSAGES/evolution-webcal.mo share/locale/bg/LC_MESSAGES/evolution-webcal.mo share/locale/bn/LC_MESSAGES/evolution-webcal.mo share/locale/bn_IN/LC_MESSAGES/evolution-webcal.mo @@ -23,12 +24,15 @@ share/locale/fi/LC_MESSAGES/evolution-webcal.mo share/locale/fr/LC_MESSAGES/evolution-webcal.mo share/locale/gl/LC_MESSAGES/evolution-webcal.mo share/locale/gu/LC_MESSAGES/evolution-webcal.mo +share/locale/he/LC_MESSAGES/evolution-webcal.mo share/locale/hi/LC_MESSAGES/evolution-webcal.mo +share/locale/hr/LC_MESSAGES/evolution-webcal.mo share/locale/hu/LC_MESSAGES/evolution-webcal.mo share/locale/id/LC_MESSAGES/evolution-webcal.mo share/locale/it/LC_MESSAGES/evolution-webcal.mo share/locale/ja/LC_MESSAGES/evolution-webcal.mo share/locale/ka/LC_MESSAGES/evolution-webcal.mo +share/locale/kn/LC_MESSAGES/evolution-webcal.mo share/locale/ko/LC_MESSAGES/evolution-webcal.mo share/locale/ku/LC_MESSAGES/evolution-webcal.mo share/locale/ky/LC_MESSAGES/evolution-webcal.mo @@ -46,6 +50,7 @@ share/locale/oc/LC_MESSAGES/evolution-webcal.mo share/locale/or/LC_MESSAGES/evolution-webcal.mo share/locale/pa/LC_MESSAGES/evolution-webcal.mo share/locale/pl/LC_MESSAGES/evolution-webcal.mo +share/locale/ps/LC_MESSAGES/evolution-webcal.mo share/locale/pt/LC_MESSAGES/evolution-webcal.mo share/locale/pt_BR/LC_MESSAGES/evolution-webcal.mo share/locale/ro/LC_MESSAGES/evolution-webcal.mo @@ -56,7 +61,7 @@ share/locale/sk/LC_MESSAGES/evolution-webcal.mo share/locale/sl/LC_MESSAGES/evolution-webcal.mo share/locale/sq/LC_MESSAGES/evolution-webcal.mo share/locale/sr/LC_MESSAGES/evolution-webcal.mo -share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo +share/locale/sr@latin/LC_MESSAGES/evolution-webcal.mo share/locale/sv/LC_MESSAGES/evolution-webcal.mo share/locale/ta/LC_MESSAGES/evolution-webcal.mo share/locale/te/LC_MESSAGES/evolution-webcal.mo @@ -77,10 +82,14 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -93,5 +102,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo @dirrmtry share/locale/dz @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/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index edbd9a572ffe..e5317039d254 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml3/Makefile,v 1.124 2008/03/10 20:10:34 mezz Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.142 2008/11/25 01:16:48 marcus Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.18.3 +PORTVERSION= 3.24.2 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,13 +17,16 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ + enchant.1:${PORTSDIR}/textproc/enchant +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes USE_GETTEXT= yes USE_BZIP2= yes USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index 0abb76ac7b0f..043beb3f494f 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.18.3.tar.bz2) = 4dae02a10f05fbca1cfd3bb5336f9273 -SHA256 (gnome2/gtkhtml-3.18.3.tar.bz2) = f4a07f292ed722da7c1b58daafcfd7f668ccb7293eca42e4c364a26cca50a02c -SIZE (gnome2/gtkhtml-3.18.3.tar.bz2) = 1313556 +MD5 (gnome2/gtkhtml-3.24.2.tar.bz2) = d6b7471d2806d28d76b09b20f6ea86b0 +SHA256 (gnome2/gtkhtml-3.24.2.tar.bz2) = 62f5a5620aac9c2241e8e7cd18d81675827e776319dac33eb11bb85575c8eed8 +SIZE (gnome2/gtkhtml-3.24.2.tar.bz2) = 1438665 diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index a084714f5c45..84f8e7ab0131 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -1,3 +1,10 @@ +bin/gtkhtml-editor-test +include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-actions.h +include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-common.h +include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor-widgets.h +include/libgtkhtml-%%VERSION%%/editor/gtkhtml-editor.h +include/libgtkhtml-%%VERSION%%/editor/gtkhtml-spell-checker.h +include/libgtkhtml-%%VERSION%%/editor/gtkhtml-spell-language.h include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h @@ -8,19 +15,18 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.a -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.la -lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so lib/libgtkhtml-%%VERSION%%.a lib/libgtkhtml-%%VERSION%%.la lib/libgtkhtml-%%VERSION%%.so lib/libgtkhtml-%%VERSION%%.so.19 -libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server +lib/libgtkhtml-editor.a +lib/libgtkhtml-editor.la +lib/libgtkhtml-editor.so +lib/libgtkhtml-editor.so.0 +libdata/pkgconfig/gtkhtml-editor.pc libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc -share/gtkhtml-%%VERSION%%/Editor.idl -share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor-emacs.xml -share/gtkhtml-%%VERSION%%/GNOME_GtkHTML_Editor.xml -share/gtkhtml-%%VERSION%%/gtkhtml-editor-properties.glade +share/gtkhtml-%%VERSION%%/gtkhtml-editor.glade +share/gtkhtml-%%VERSION%%/gtkhtml-editor.ui share/gtkhtml-%%VERSION%%/icons/bulb.png share/gtkhtml-%%VERSION%%/icons/confidential-stamp.jpg share/gtkhtml-%%VERSION%%/icons/draft-paper.png @@ -76,6 +82,7 @@ share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ka/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/kn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -104,9 +111,10 @@ share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/sl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/sr@latin/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ta/LC_MESSAGES/gtkhtml-%%VERSION%%.mo +share/locale/te/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/th/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/tr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @@ -117,13 +125,17 @@ share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo @dirrm share/gtkhtml-%%VERSION%%/icons @dirrm share/gtkhtml-%%VERSION%% -@dirrmtry lib/gtkhtml @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml +@dirrm include/libgtkhtml-%%VERSION%%/editor @dirrm include/libgtkhtml-%%VERSION%% @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 96f275485d97..d88e904d4278 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml38/Makefile,v 1.106 2008/01/29 01:43:06 marcus Exp $ +# $MCom: ports/www/gtkhtml38/Makefile,v 1.108 2008/08/23 18:23:00 mezz Exp $ # PORTNAME= gtkhtml3 @@ -26,7 +26,7 @@ DEPRECATED= Older API; newer applications should use www/gtkhtml3 USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack \ +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack \ libgnomeprintui USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index fad5be442a55..546a1f3ad8dc 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -3,12 +3,12 @@ # Whom: michael johnson <ahze@ahze.net> # # $FreeBSD$ -# $MCom: ports/www/kazehakase/Makefile,v 1.9 2007/10/24 16:17:14 ahze Exp $ +# $MCom: ports/www/kazehakase/Makefile,v 1.15 2008/08/06 04:22:50 mezz Exp $ # PORTNAME= kazehakase PORTVERSION= 0.5.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= ${PORTNAME}/30219 @@ -21,7 +21,7 @@ LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls USE_GNOME= gnomehack intlhack gnomeprefix gtk20 USE_GMAKE= yes USE_GETTEXT= yes -USE_GECKO= firefox mozilla seamonkey xulrunner seamonkey +USE_GECKO= firefox mozilla seamonkey xulrunner USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gecko_engine=${GECKO} @@ -40,7 +40,7 @@ RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" .if defined(WITH_WEBKIT) -LIB_DEPENDS+= WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2 PLIST_SUB+= WEBKIT="" .else PLIST_SUB+= WEBKIT="@comment " diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 3fb7fbe08777..8eafcfbeaad7 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/libgtkhtml/Makefile,v 1.39 2006/09/10 00:51:14 mezz Exp $ +# $MCom: ports/www/libgtkhtml/Makefile,v 1.41 2008/08/23 18:23:00 mezz Exp $ # PORTNAME= libgtkhtml @@ -19,7 +19,7 @@ COMMENT= Lightweight HTML rendering/printing/editing engine USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 gail ltverhack +USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 ltverhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/midori/Makefile b/www/midori/Makefile index a4a52945dd7d..ce9444e4ea0d 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -3,17 +3,19 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/midori/Makefile,v 1.3 2008/03/21 18:31:39 ahze Exp $ +# $MCom: ports/www/midori/Makefile,v 1.10 2008/12/31 03:30:21 mezz Exp $ +# PORTNAME= midori PORTVERSION= 0.1.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/ MAINTAINER= ahze@FreeBSD.org COMMENT= Lightweight web browser using WebKit browser engine -LIB_DEPENDS= WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2 BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ rsvg-convert:${PORTSDIR}/graphics/librsvg2 diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile index af9a85317e91..083b5408376b 100644 --- a/www/swfdec-plugin/Makefile +++ b/www/swfdec-plugin/Makefile @@ -6,18 +6,19 @@ # PORTNAME= swfdec-plugin -PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTVERSION= 0.8.2 CATEGORIES= www -MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.6/ +MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/ DISTNAME= swfdec-mozilla-${PORTVERSION} MAINTAINER= kwm@FreeBSD.org COMMENT= Flash rendering plugin -LIB_DEPENDS= swfdec-0.6:${PORTSDIR}/graphics/swfdec +LIB_DEPENDS= swfdec-0.8:${PORTSDIR}/graphics/swfdec USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes +USE_GNOME= gtk20 CONFIGURE_ARGS= --with-plugin-dir="${WEBPLUGINS_DIR}" USE_LDCONFIG= yes diff --git a/www/swfdec-plugin/distinfo b/www/swfdec-plugin/distinfo index 41b0a0096e9a..a2e080ce8c78 100644 --- a/www/swfdec-plugin/distinfo +++ b/www/swfdec-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (swfdec-mozilla-0.6.0.tar.gz) = dc0fb84b5e5c7540ae1231eb04109f0e -SHA256 (swfdec-mozilla-0.6.0.tar.gz) = 05e93b4343998afd24b0ba879e25ef4f08c87af6afb51fb0cc5a0362c3feff34 -SIZE (swfdec-mozilla-0.6.0.tar.gz) = 399937 +MD5 (swfdec-mozilla-0.8.2.tar.gz) = 716632e0d35b3c1582c180569ba30346 +SHA256 (swfdec-mozilla-0.8.2.tar.gz) = 49fd905f41b67832e7b2cfa2cf664657ab08f8fef4a2324e74202fc951396cd5 +SIZE (swfdec-mozilla-0.8.2.tar.gz) = 381148 diff --git a/www/swfdec-plugin/pkg-plist b/www/swfdec-plugin/pkg-plist index ffed0eed5a40..02ca9225c4cb 100644 --- a/www/swfdec-plugin/pkg-plist +++ b/www/swfdec-plugin/pkg-plist @@ -1,4 +1,10 @@ %%WEBPLUGINS_DIR%%/libswfdecmozilla.a %%WEBPLUGINS_DIR%%/libswfdecmozilla.la %%WEBPLUGINS_DIR%%/libswfdecmozilla.so +share/icons/hicolor/16x16/apps/swfdec-mozilla.png +share/icons/hicolor/22x22/apps/swfdec-mozilla.png +share/icons/hicolor/24x24/apps/swfdec-mozilla.png +share/icons/hicolor/32x32/apps/swfdec-mozilla.png +share/icons/hicolor/48x48/apps/swfdec-mozilla.png +share/icons/hicolor/scalable/apps/swfdec-mozilla.svg @dirrmtry %%WEBPLUGINS_DIR%% diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index f57de73b67aa..e703e03cbde4 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -3,16 +3,15 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/webkit-gtk2/Makefile,v 1.5 2008/03/24 01:51:52 mezz Exp $ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.23 2008/10/23 02:41:54 mezz Exp $ # PORTNAME= webkit -PORTVERSION= 0.0.30549 -PORTREVISION= 1 +PORTVERSION= 1.0.1 +PORTREVISION= 4 CATEGORIES= www -MASTER_SITES= http://nightly.webkit.org/files/trunk/src/ +MASTER_SITES= http://people.freedesktop.org/~alp/webkit/gtk/ PKGNAMESUFFIX= -gtk2 -DISTNAME= WebKit-r${PORTVERSION:S/0.0.//} MAINTAINER= gnome@FreeBSD.org COMMENT= An opensource browser engine @@ -21,29 +20,38 @@ LIB_DEPENDS= icutu.38:${PORTSDIR}/devel/icu \ curl.4:${PORTSDIR}/ftp/curl \ sqlite3.8:${PORTSDIR}/databases/sqlite3 +WANT_GSTREAMER= yes +USE_XORG= xt USE_BISON= build -USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnometarget gtk20 libxslt +USE_GNOME= gtk20 libxslt USE_PERL5= yes USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf:262 automake:110 libtool:15 -USE_GSTREAMER= gnomevfs CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-webkit-target=x11 \ --enable-icon-database \ --enable-svg \ - --enable-video + --enable-svg-fonts \ + --enable-svg-experimental MAKEFILE= GNUmakefile +BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2 +#_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", + +OPTIONS= VIDEO "Enable video support" on + .include <bsd.port.pre.mk> -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 +.if defined(WITH_VIDEO) +USE_GSTREAMER+= gnomevfs +CONFIGURE_ARGS+=--enable-video .endif post-patch: + @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ + ${WRKSRC}/WebCore/plugins/PluginDatabase.cpp @${REINPLACE_CMD} -e 's|autoconf|${AUTOCONF}|g ; \ s|automake|${AUTOMAKE}|g ; s|aclocal|${ACLOCAL}|g ; \ s|autoheader|${AUTOHEADER}|g ; \ diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo index b91ff2311761..b36c0f022f15 100644 --- a/www/webkit-gtk2/distinfo +++ b/www/webkit-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (WebKit-r30549.tar.bz2) = 081ce2cb23cf564454bfc5a3d627a4bb -SHA256 (WebKit-r30549.tar.bz2) = 7c9b9607fcb0909298c5d4c3ec47040082db139a28aca2547b2f657afe98b6cd -SIZE (WebKit-r30549.tar.bz2) = 8573000 +MD5 (webkit-1.0.1.tar.gz) = 4de68a5773998bea14e8939aa341c466 +SHA256 (webkit-1.0.1.tar.gz) = 9601ed57978e7f1221f770c24933d2037fdb93e4b412716d842b993507f0b856 +SIZE (webkit-1.0.1.tar.gz) = 13418752 diff --git a/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in new file mode 100644 index 000000000000..006b49709b38 --- /dev/null +++ b/www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in @@ -0,0 +1,8 @@ +--- WebKit/gtk/webkit.pc.in.orig 2008-04-01 14:46:09.251210738 -0400 ++++ WebKit/gtk/webkit.pc.in 2008-04-01 14:46:21.218068816 -0400 +@@ -8,4 +8,4 @@ + Version: @VERSION@ + Requires: gtk+-2.0 + Libs: -L${libdir} -lwebkit-1.0 +-Cflags: -I${includedir}/webkit-1.0 ++Cflags: -I${includedir}/webkit-1.0 -I${includedir}/webkit-1.0/webkit diff --git a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp new file mode 100644 index 000000000000..ed0a5895fca9 --- /dev/null +++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp @@ -0,0 +1,10 @@ +--- WebCore/plugins/PluginDatabase.cpp.orig 2008-05-26 01:03:07.236973838 -0700 ++++ WebCore/plugins/PluginDatabase.cpp 2008-05-26 01:03:52.356436787 -0700 +@@ -281,6 +281,7 @@ + userPluginPath.append(String("/.netscape/plugins")); + paths.append(userPluginPath); + ++ paths.append("%%BROWSER_PLUGINS%%"); + paths.append("/usr/lib/browser/plugins"); + paths.append("/usr/local/lib/mozilla/plugins"); + paths.append("/usr/lib/firefox/plugins"); diff --git a/www/webkit-gtk2/files/patch-cairo b/www/webkit-gtk2/files/patch-cairo new file mode 100644 index 000000000000..4bba0cc2a860 --- /dev/null +++ b/www/webkit-gtk2/files/patch-cairo @@ -0,0 +1,31 @@ +--- WebCore/platform/graphics/BitmapImage.cpp ++++ WebCore/platform/graphics/BitmapImage.cpp +@@ -203,7 +203,7 @@ float BitmapImage::frameDurationAtIndex(size_t index) + bool BitmapImage::frameHasAlphaAtIndex(size_t index) + { + if (index >= frameCount()) +- return 0; ++ return true; + + if (index >= m_frames.size() || !m_frames[index].m_frame) + cacheFrame(index); +--- WebCore/platform/graphics/cairo/ImageCairo.cpp ++++ WebCore/platform/graphics/cairo/ImageCairo.cpp +@@ -76,6 +76,7 @@ BitmapImage::BitmapImage(cairo_surface_t* surface, ImageObserver* observer) + + m_frames.grow(1); + m_frames[0].m_frame = surface; ++ m_frames[0].m_hasAlpha = cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR; + checkForSolidColor(); + } + +--- WebCore/platform/graphics/cg/ImageCG.cpp ++++ WebCore/platform/graphics/cg/ImageCG.cpp +@@ -87,6 +87,7 @@ BitmapImage::BitmapImage(CGImageRef cgImage, ImageObserver* observer) + + m_frames.grow(1); + m_frames[0].m_frame = cgImage; ++ m_frames[0].m_hasAlpha = true; + checkForSolidColor(); + } + diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist index 71b65eff0f6a..85d72c47fc5b 100644 --- a/www/webkit-gtk2/pkg-plist +++ b/www/webkit-gtk2/pkg-plist @@ -1,26 +1,28 @@ -include/WebKit/JavaScriptCore/JSBase.h -include/WebKit/JavaScriptCore/JSContextRef.h -include/WebKit/JavaScriptCore/JSObjectRef.h -include/WebKit/JavaScriptCore/JSStringRef.h -include/WebKit/JavaScriptCore/JSStringRefBSTR.h -include/WebKit/JavaScriptCore/JSStringRefCF.h -include/WebKit/JavaScriptCore/JSValueRef.h -include/WebKit/JavaScriptCore/JavaScript.h -include/WebKit/JavaScriptCore/JavaScriptCore.h -include/WebKit/webkit/webkit.h -include/WebKit/webkit/webkitdefines.h -include/WebKit/webkit/webkitnetworkrequest.h -include/WebKit/webkit/webkitwebbackforwardlist.h -include/WebKit/webkit/webkitwebframe.h -include/WebKit/webkit/webkitwebhistoryitem.h -include/WebKit/webkit/webkitwebsettings.h -include/WebKit/webkit/webkitwebview.h -lib/libWebKitGtk.a -lib/libWebKitGtk.la -lib/libWebKitGtk.so -lib/libWebKitGtk.so.1 +bin/jsc +include/webkit-1.0/JavaScriptCore/JSBase.h +include/webkit-1.0/JavaScriptCore/JSContextRef.h +include/webkit-1.0/JavaScriptCore/JSObjectRef.h +include/webkit-1.0/JavaScriptCore/JSStringRef.h +include/webkit-1.0/JavaScriptCore/JSStringRefBSTR.h +include/webkit-1.0/JavaScriptCore/JSStringRefCF.h +include/webkit-1.0/JavaScriptCore/JSValueRef.h +include/webkit-1.0/JavaScriptCore/JavaScript.h +include/webkit-1.0/JavaScriptCore/JavaScriptCore.h +include/webkit-1.0/webkit/webkit.h +include/webkit-1.0/webkit/webkitdefines.h +include/webkit-1.0/webkit/webkitnetworkrequest.h +include/webkit-1.0/webkit/webkitversion.h +include/webkit-1.0/webkit/webkitwebbackforwardlist.h +include/webkit-1.0/webkit/webkitwebframe.h +include/webkit-1.0/webkit/webkitwebhistoryitem.h +include/webkit-1.0/webkit/webkitwebsettings.h +include/webkit-1.0/webkit/webkitwebview.h +lib/libwebkit-1.0.a +lib/libwebkit-1.0.la +lib/libwebkit-1.0.so +lib/libwebkit-1.0.so.1 libdata/pkgconfig/WebKitGtk.pc libdata/pkgconfig/webkit-1.0.pc -@dirrm include/WebKit/webkit -@dirrm include/WebKit/JavaScriptCore -@dirrm include/WebKit +@dirrm include/webkit-1.0/webkit +@dirrm include/webkit-1.0/JavaScriptCore +@dirrm include/webkit-1.0 diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index e6dd409db450..5f501e1755a8 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -3,18 +3,17 @@ # Whom: ade, archie # # $FreeBSD$ -# $MCom: ports-stable/x11-fm/nautilus/Makefile,v 1.2 2008/03/31 00:51:45 ahze Exp $ +# $MCom: ports/x11-fm/nautilus/Makefile,v 1.171 2008/11/25 01:09:55 marcus Exp $ # PORTNAME= nautilus -PORTVERSION= 2.22.5.1 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= File manager for the GNOME desktop +COMMENT?= File manager for the GNOME desktop LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif @@ -39,6 +38,9 @@ OPTIONS= TRACKER "Enable Tracker Search (sysutils/tracker)" Off GCONF_SCHEMAS= apps_nautilus_preferences.schemas +MAN1= nautilus-connect-server.1 nautilus-file-management-properties.1 \ + nautilus.1 + .include <bsd.port.pre.mk> .if defined(WITH_TRACKER) diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index 3a196d0310f7..94a77816c213 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/nautilus-2.22.5.1.tar.bz2) = a63596ca4cccddc970d695d62c05154a -SHA256 (gnome2/nautilus-2.22.5.1.tar.bz2) = 3c98d410f2d535ab2f000df91527b4a30c8d3ce2a7f6c7d1697e89f3868c66b9 -SIZE (gnome2/nautilus-2.22.5.1.tar.bz2) = 5017090 +MD5 (gnome2/nautilus-2.24.2.tar.bz2) = 783e5f7be6391d6c46b4725e38af475a +SHA256 (gnome2/nautilus-2.24.2.tar.bz2) = a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d +SIZE (gnome2/nautilus-2.24.2.tar.bz2) = 5356516 diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index a19ebf9300c3..367c06b74c6b 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -26,6 +26,28 @@ share/applications/nautilus-folder-handler.desktop share/applications/nautilus-home.desktop share/applications/nautilus.desktop share/applications/network-scheme.desktop +share/doc/libnautilus-extension/NautilusColumn.html +share/doc/libnautilus-extension/NautilusMenuItem.html +share/doc/libnautilus-extension/NautilusPropertyPage.html +share/doc/libnautilus-extension/ch01.html +share/doc/libnautilus-extension/home.png +share/doc/libnautilus-extension/index.html +share/doc/libnautilus-extension/index.sgml +share/doc/libnautilus-extension/ix01.html +share/doc/libnautilus-extension/left.png +share/doc/libnautilus-extension/libnautilus-extension.devhelp +share/doc/libnautilus-extension/libnautilus-extension.devhelp2 +share/doc/libnautilus-extension/libnautilus-extension-nautilus-column-provider.html +share/doc/libnautilus-extension/libnautilus-extension-nautilus-extension-types.html +share/doc/libnautilus-extension/libnautilus-extension-nautilus-file-info.html +share/doc/libnautilus-extension/libnautilus-extension-nautilus-info-provider.html +share/doc/libnautilus-extension/libnautilus-extension-nautilus-location-widget-provider.html +share/doc/libnautilus-extension/libnautilus-extension-nautilus-menu-provider.html +share/doc/libnautilus-extension/libnautilus-extension-nautilus-property-page-provider.html +share/doc/libnautilus-extension/pt01.html +share/doc/libnautilus-extension/right.png +share/doc/libnautilus-extension/style.css +share/doc/libnautilus-extension/up.png share/icons/hicolor/16x16/apps/nautilus.png share/icons/hicolor/22x22/apps/nautilus.png share/icons/hicolor/24x24/apps/nautilus.png @@ -35,6 +57,7 @@ share/locale/af/LC_MESSAGES/nautilus.mo share/locale/am/LC_MESSAGES/nautilus.mo share/locale/ar/LC_MESSAGES/nautilus.mo share/locale/as/LC_MESSAGES/nautilus.mo +share/locale/ast/LC_MESSAGES/nautilus.mo share/locale/az/LC_MESSAGES/nautilus.mo share/locale/be/LC_MESSAGES/nautilus.mo share/locale/be@latin/LC_MESSAGES/nautilus.mo @@ -60,6 +83,7 @@ share/locale/eu/LC_MESSAGES/nautilus.mo share/locale/fa/LC_MESSAGES/nautilus.mo share/locale/fi/LC_MESSAGES/nautilus.mo share/locale/fr/LC_MESSAGES/nautilus.mo +share/locale/fur/LC_MESSAGES/nautilus.mo share/locale/ga/LC_MESSAGES/nautilus.mo share/locale/gl/LC_MESSAGES/nautilus.mo share/locale/gu/LC_MESSAGES/nautilus.mo @@ -69,6 +93,7 @@ share/locale/hr/LC_MESSAGES/nautilus.mo share/locale/hu/LC_MESSAGES/nautilus.mo share/locale/hy/LC_MESSAGES/nautilus.mo share/locale/id/LC_MESSAGES/nautilus.mo +share/locale/io/LC_MESSAGES/nautilus.mo share/locale/is/LC_MESSAGES/nautilus.mo share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo @@ -96,6 +121,7 @@ share/locale/oc/LC_MESSAGES/nautilus.mo share/locale/or/LC_MESSAGES/nautilus.mo share/locale/pa/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo +share/locale/ps/LC_MESSAGES/nautilus.mo share/locale/pt/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo share/locale/ro/LC_MESSAGES/nautilus.mo @@ -106,7 +132,7 @@ share/locale/sk/LC_MESSAGES/nautilus.mo share/locale/sl/LC_MESSAGES/nautilus.mo share/locale/sq/LC_MESSAGES/nautilus.mo share/locale/sr/LC_MESSAGES/nautilus.mo -share/locale/sr@Latn/LC_MESSAGES/nautilus.mo +share/locale/sr@latin/LC_MESSAGES/nautilus.mo share/locale/sr@ije/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo share/locale/ta/LC_MESSAGES/nautilus.mo @@ -191,6 +217,7 @@ share/pixmaps/nautilus/thumbnail_frame.png @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrm share/doc/libnautilus-extension @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -201,12 +228,16 @@ share/pixmaps/nautilus/thumbnail_frame.png @dirrmtry share/locale/xh @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @@ -221,8 +252,12 @@ share/pixmaps/nautilus/thumbnail_frame.png @dirrmtry share/locale/ku @dirrmtry share/locale/km/LC_MESSAGES @dirrmtry share/locale/km +@dirrmtry share/locale/io/LC_MESSAGES +@dirrmtry share/locale/io @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -231,5 +266,7 @@ share/pixmaps/nautilus/thumbnail_frame.png @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile index 26edc0bffdcb..43e3a852f4c9 100644 --- a/x11-fm/py-nautilus/Makefile +++ b/x11-fm/py-nautilus/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-fm/py-nautilus/Makefile,v 1.6 2008/01/13 19:48:00 marcus Exp $ +# $MCom: ports/x11-fm/py-nautilus/Makefile,v 1.9 2009/01/10 01:59:22 mezz Exp $ # PORTNAME= nautilus -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTVERSION= 0.5.1 CATEGORIES= x11-fm gnome python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/nautilus-python/${PORTVERSION:R} diff --git a/x11-fm/py-nautilus/distinfo b/x11-fm/py-nautilus/distinfo index 9483614d91ef..5b9b922a78a0 100644 --- a/x11-fm/py-nautilus/distinfo +++ b/x11-fm/py-nautilus/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-python-0.5.0.tar.bz2) = f46cd826d74f62ef7bba5b258c1d415a -SHA256 (nautilus-python-0.5.0.tar.bz2) = 0caa73ef1dccdcfdc403191be409d22636ee58cbc56e1fc4600c0cc78b61da79 -SIZE (nautilus-python-0.5.0.tar.bz2) = 240144 +MD5 (nautilus-python-0.5.1.tar.bz2) = 83136937cdb790a2ee5823e96de20acf +SHA256 (nautilus-python-0.5.1.tar.bz2) = 34e79046b9bd420bc980befeabeac9c229a6a12e21e04c7648849cd540593d89 +SIZE (nautilus-python-0.5.1.tar.bz2) = 230999 diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 70da31009d97..a18bac299f54 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.14 2008/01/08 04:28:10 marcus Exp $ +# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.18 2008/08/21 21:53:01 mezz Exp $ # PORTNAME= fontconfig -PORTVERSION= 2.5.0 +PORTVERSION= 2.6.0 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-fonts @@ -24,7 +24,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ USE_GMAKE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 -USE_GNOME= gnomehack gnometarget pkgconfig ltverhack +USE_GNOME= gnomehack pkgconfig ltverhack CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ --with-expat-lib=${LOCALBASE}/lib \ @@ -41,22 +41,15 @@ PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/bin/docbook2man) -USE_DOCBOOK2MAN= yes -BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 -.endif - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} .endif ${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5 -.if !defined(USE_DOCBOOK2MAN) .for manpage in ${MAN1} ${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1 .endfor -.endif if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \ ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \ ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo index 0687fa08ca78..24a1c943bf82 100644 --- a/x11-fonts/fontconfig/distinfo +++ b/x11-fonts/fontconfig/distinfo @@ -1,3 +1,3 @@ -MD5 (fontconfig-2.5.0.tar.gz) = 21d14af8ecf645ef76211c782cdd7aeb -SHA256 (fontconfig-2.5.0.tar.gz) = 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe -SIZE (fontconfig-2.5.0.tar.gz) = 1385058 +MD5 (fontconfig-2.6.0.tar.gz) = ab54ec1d4ddd836313fdbc0cd5299d6d +SHA256 (fontconfig-2.6.0.tar.gz) = a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5 +SIZE (fontconfig-2.6.0.tar.gz) = 1403857 diff --git a/x11-fonts/fontconfig/files/fc-cache.1 b/x11-fonts/fontconfig/files/fc-cache.1 index 18809ffb1b01..3d77bd59c5b0 100644 --- a/x11-fonts/fontconfig/files/fc-cache.1 +++ b/x11-fonts/fontconfig/files/fc-cache.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FC-CACHE" "1" "12 November 2006" "" "" +.TH "FC-CACHE" "1" "05 May 2008" "" "" .SH NAME fc-cache \- build font information cache files diff --git a/x11-fonts/fontconfig/files/fc-cat.1 b/x11-fonts/fontconfig/files/fc-cat.1 index 07152a09abcf..b025d7c5e7ea 100644 --- a/x11-fonts/fontconfig/files/fc-cat.1 +++ b/x11-fonts/fontconfig/files/fc-cat.1 @@ -3,17 +3,18 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FC-CAT" "1" "12 November 2006" "" "" +.TH "FC-CAT" "1" "05 May 2008" "" "" .SH NAME fc-cat \- read font information cache files .SH SYNOPSIS -\fBfc-cat < fonts-cache-2-file >\fR [ \fB-V?\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIdirs\fB\fR ] +\fBfc-cat\fR [ \fB-rvV?\fR ] [ \fB--recurse\fR ] [ \fB--verbose\fR ] [ \fB--version\fR ] [ \fB--help\fR ] [ \fB\fIfonts-cache-2-files\fB\fR ] [ \fB\fIdirs\fB\fR ] .SH "DESCRIPTION" .PP -\fBfc-cat\fR reads a font information cache file +\fBfc-cat\fR reads the font information from +cache files or related to font directories and emits it in ASCII form. .SH "OPTIONS" .PP @@ -21,6 +22,12 @@ This program follows the usual GNU command line syntax, with long options starting with two dashes (`-'). A summary of options is included below. .TP +\fB-r --recurse \fR +Recurse into subdirectories. +.TP +\fB-v --verbose \fR +Be verbose. +.TP \fB-? --help \fR Show summary of options. .TP diff --git a/x11-fonts/fontconfig/files/fc-list.1 b/x11-fonts/fontconfig/files/fc-list.1 index 0bff184f883a..6a0145db1783 100644 --- a/x11-fonts/fontconfig/files/fc-list.1 +++ b/x11-fonts/fontconfig/files/fc-list.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FC-LIST" "1" "12 November 2006" "" "" +.TH "FC-LIST" "1" "05 May 2008" "" "" .SH NAME fc-list \- list available fonts diff --git a/x11-fonts/fontconfig/files/fc-match.1 b/x11-fonts/fontconfig/files/fc-match.1 index 336abc33a258..06f7aa3cb905 100644 --- a/x11-fonts/fontconfig/files/fc-match.1 +++ b/x11-fonts/fontconfig/files/fc-match.1 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "FC-MATCH" "1" "12 November 2006" "" "" +.TH "FC-MATCH" "1" "05 May 2008" "" "" .SH NAME fc-match \- match available fonts diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in index 0ebabf44ab0e..40d586736f14 100644 --- a/x11-fonts/fontconfig/files/patch-Makefile.in +++ b/x11-fonts/fontconfig/files/patch-Makefile.in @@ -1,7 +1,7 @@ ---- Makefile.in.orig Sat Nov 4 14:54:15 2006 -+++ Makefile.in Sat Nov 4 14:54:46 2006 -@@ -785,28 +785,6 @@ $(srcdir)/ChangeLog: - .PHONY: ChangeLog $(srcdir)/ChangeLog +--- Makefile.in.orig 2008-07-03 03:20:43.000000000 -0400 ++++ Makefile.in 2008-07-03 03:21:18.000000000 -0400 +@@ -789,28 +789,28 @@ ChangeLog: + .PHONY: ChangeLog install-data-local: - $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) @@ -17,8 +17,8 @@ - $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ - fi; fi - @(if $(RUN_FC_CACHE_TEST); then \ -- echo " fc-cache/fc-cache -s -f -v"; \ -- fc-cache/fc-cache -s -f -v; \ +- echo " $(bindir)/fc-cache -s -f -v"; \ +- $(bindir)/fc-cache -s -f -v; \ - else \ - echo "***"; \ - echo "*** Warning: fonts.cache not built"; \ @@ -26,6 +26,28 @@ - echo "*** Generate this file manually on host system using fc-cache"; \ - echo "***"; \ - fi) ++# $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) ++# if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ ++# echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ ++# mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \ ++# fi ++# if [ -f $(srcdir)/fonts.conf ]; then \ ++# echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \ ++# $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ ++# else if [ -f fonts.conf ]; then \ ++# echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \ ++# $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ ++# fi; fi ++# @(if $(RUN_FC_CACHE_TEST); then \ ++# echo " $(bindir)/fc-cache -s -f -v"; \ ++# $(bindir)/fc-cache -s -f -v; \ ++# else \ ++# echo "***"; \ ++# echo "*** Warning: fonts.cache not built"; \ ++# echo "***"; \ ++# echo "*** Generate this file manually on host system using fc-cache"; \ ++# echo "***"; \ ++# fi) uninstall-local: if [ -f $(srcdir)/fonts.conf ]; then \ diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist index 46bba932d100..3101d5ccf879 100644 --- a/x11-fonts/fontconfig/pkg-plist +++ b/x11-fonts/fontconfig/pkg-plist @@ -21,13 +21,13 @@ etc/fonts/conf.avail/50-user.conf etc/fonts/conf.avail/51-local.conf etc/fonts/conf.avail/60-latin.conf etc/fonts/conf.avail/65-fonts-persian.conf +etc/fonts/conf.avail/65-khmer.conf etc/fonts/conf.avail/65-nonlatin.conf etc/fonts/conf.avail/69-unifont.conf etc/fonts/conf.avail/70-no-bitmaps.conf etc/fonts/conf.avail/70-yes-bitmaps.conf etc/fonts/conf.avail/80-delicious.conf etc/fonts/conf.avail/90-synthetic.conf -etc/fonts/conf.avail/README etc/fonts/conf.d/20-fix-globaladvance.conf etc/fonts/conf.d/20-unhint-small-vera.conf etc/fonts/conf.d/30-metric-aliases.conf @@ -43,6 +43,7 @@ etc/fonts/conf.d/65-nonlatin.conf etc/fonts/conf.d/69-unifont.conf etc/fonts/conf.d/80-delicious.conf etc/fonts/conf.d/90-synthetic.conf +etc/fonts/conf.d/README @unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi etc/fonts/fonts.conf.default @exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile index e137df26b9d5..165ab140f7b1 100644 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.33 2008/03/10 01:12:43 mezz Exp $ +# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.41 2008/09/23 15:03:03 kwm Exp $ # PORTNAME= gnome-backgrounds -PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= x11-themes graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +19,7 @@ USE_BZIP2= yes USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnometarget gnomehack intlhack +USE_GNOME= gnomeprefix gnomehack intlhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo index ed14248f4670..328e2d3410e9 100644 --- a/x11-themes/gnome-backgrounds/distinfo +++ b/x11-themes/gnome-backgrounds/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-backgrounds-2.22.0.tar.bz2) = 1997e020288ea6b91ed460c2c6bfc8d4 -SHA256 (gnome2/gnome-backgrounds-2.22.0.tar.bz2) = 2c5b560ccc931c3f479b3ad2e39358ab622c9a4f8fd75f1667b8b6d18388a041 -SIZE (gnome2/gnome-backgrounds-2.22.0.tar.bz2) = 1213299 +MD5 (gnome2/gnome-backgrounds-2.24.0.tar.bz2) = fb84a0b2e63dd0aaa47d490d2a43209f +SHA256 (gnome2/gnome-backgrounds-2.24.0.tar.bz2) = 13bc5612e6744fc2c0841158759cdb0c23b58c2edf93841f72829ec7513cff18 +SIZE (gnome2/gnome-backgrounds-2.24.0.tar.bz2) = 9898313 diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist index c7042e027f2d..bce1424d0712 100644 --- a/x11-themes/gnome-backgrounds/pkg-plist +++ b/x11-themes/gnome-backgrounds/pkg-plist @@ -1,7 +1,5 @@ -share/gnome-background-properties/gnome-branded.xml +share/gnome-background-properties/gnome-abstract.xml share/gnome-background-properties/gnome-nature.xml -share/gnome-background-properties/gnome-tiles.xml -share/gnome-background-properties/gnome-translucent.xml share/locale/af/LC_MESSAGES/gnome-backgrounds.mo share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo share/locale/as/LC_MESSAGES/gnome-backgrounds.mo @@ -37,6 +35,7 @@ share/locale/id/LC_MESSAGES/gnome-backgrounds.mo share/locale/it/LC_MESSAGES/gnome-backgrounds.mo share/locale/ja/LC_MESSAGES/gnome-backgrounds.mo share/locale/ka/LC_MESSAGES/gnome-backgrounds.mo +share/locale/kn/LC_MESSAGES/gnome-backgrounds.mo share/locale/ko/LC_MESSAGES/gnome-backgrounds.mo share/locale/ku/LC_MESSAGES/gnome-backgrounds.mo share/locale/ky/LC_MESSAGES/gnome-backgrounds.mo @@ -56,6 +55,7 @@ share/locale/oc/LC_MESSAGES/gnome-backgrounds.mo share/locale/or/LC_MESSAGES/gnome-backgrounds.mo share/locale/pa/LC_MESSAGES/gnome-backgrounds.mo share/locale/pl/LC_MESSAGES/gnome-backgrounds.mo +share/locale/ps/LC_MESSAGES/gnome-backgrounds.mo share/locale/pt/LC_MESSAGES/gnome-backgrounds.mo share/locale/pt_BR/LC_MESSAGES/gnome-backgrounds.mo share/locale/ro/LC_MESSAGES/gnome-backgrounds.mo @@ -66,7 +66,7 @@ share/locale/sk/LC_MESSAGES/gnome-backgrounds.mo share/locale/sl/LC_MESSAGES/gnome-backgrounds.mo share/locale/sq/LC_MESSAGES/gnome-backgrounds.mo share/locale/sr/LC_MESSAGES/gnome-backgrounds.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-backgrounds.mo +share/locale/sr@latin/LC_MESSAGES/gnome-backgrounds.mo share/locale/sv/LC_MESSAGES/gnome-backgrounds.mo share/locale/ta/LC_MESSAGES/gnome-backgrounds.mo share/locale/te/LC_MESSAGES/gnome-backgrounds.mo @@ -79,19 +79,25 @@ share/locale/vi/LC_MESSAGES/gnome-backgrounds.mo share/locale/zh_CN/LC_MESSAGES/gnome-backgrounds.mo share/locale/zh_HK/LC_MESSAGES/gnome-backgrounds.mo share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo -share/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png +share/pixmaps/backgrounds/gnome/abstract/Flow.png +share/pixmaps/backgrounds/gnome/abstract/Gulp.png +share/pixmaps/backgrounds/gnome/abstract/Silk.png +share/pixmaps/backgrounds/gnome/abstract/Spring.png +share/pixmaps/backgrounds/gnome/abstract/Waves.png +share/pixmaps/backgrounds/gnome/nature/Aqua.jpg +share/pixmaps/backgrounds/gnome/nature/Blinds.jpg +share/pixmaps/backgrounds/gnome/nature/Dune.jpg share/pixmaps/backgrounds/gnome/nature/FreshFlower.jpg +share/pixmaps/backgrounds/gnome/nature/Garden.jpg share/pixmaps/backgrounds/gnome/nature/GreenMeadow.jpg -share/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg -share/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg -share/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg -share/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg -share/pixmaps/backgrounds/gnome/translucent/ellipsis.svg -share/pixmaps/backgrounds/gnome/translucent/tentacles.svg -@dirrm share/pixmaps/backgrounds/gnome/translucent -@dirrm share/pixmaps/backgrounds/gnome/tiles +share/pixmaps/backgrounds/gnome/nature/LadyBird.jpg +share/pixmaps/backgrounds/gnome/nature/RainDrops.jpg +share/pixmaps/backgrounds/gnome/nature/Storm.jpg +share/pixmaps/backgrounds/gnome/nature/TwoWings.jpg +share/pixmaps/backgrounds/gnome/nature/Wood.jpg +share/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg @dirrm share/pixmaps/backgrounds/gnome/nature -@dirrm share/pixmaps/backgrounds/gnome/branded +@dirrm share/pixmaps/backgrounds/gnome/abstract @dirrmtry share/pixmaps/backgrounds/gnome @dirrmtry share/pixmaps/backgrounds @dirrmtry share/gnome-background-properties @@ -101,10 +107,14 @@ share/pixmaps/backgrounds/gnome/translucent/tentacles.svg @dirrmtry share/locale/uz@cyrillic @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index a91e0bc05105..2ae4ba4d4434 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.138 2008/03/10 21:02:15 mezz Exp $ +# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.152 2008/10/20 23:11:42 kwm Exp $ # PORTNAME= gnome-themes -PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTVERSION= 2.24.1 CATEGORIES= x11-themes gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -27,7 +26,7 @@ USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 INSTALLS_ICONS= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack metacity libgnomeui +USE_GNOME= gnomehack gnomeprefix intlhack metacity libgnomeui CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 7f3fcb927293..b4b90ff1e074 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-themes-2.22.2.tar.bz2) = 1989167d700e835fe57993c6be90434c -SHA256 (gnome2/gnome-themes-2.22.2.tar.bz2) = b6047835d6fae7269825028c4f7da2c1ff380c023fbd58ac69fdea8a707bac77 -SIZE (gnome2/gnome-themes-2.22.2.tar.bz2) = 1498952 +MD5 (gnome2/gnome-themes-2.24.1.tar.bz2) = 9469a4ed1231ab54847983944bcd7d57 +SHA256 (gnome2/gnome-themes-2.24.1.tar.bz2) = d58cf38d4f3eb715d7faa95c3e824aba6aa49d19147efe992e48beabbf33eb62 +SIZE (gnome2/gnome-themes-2.24.1.tar.bz2) = 1541349 diff --git a/x11-themes/gnome-themes/files/patch-common_mkiconlinks.sh b/x11-themes/gnome-themes/files/patch-common_mkiconlinks.sh new file mode 100644 index 000000000000..bc7e26a01746 --- /dev/null +++ b/x11-themes/gnome-themes/files/patch-common_mkiconlinks.sh @@ -0,0 +1,11 @@ +--- common/mkiconlinks.sh.orig 2008-09-04 17:15:42.000000000 -0500 ++++ common/mkiconlinks.sh 2008-09-04 17:16:31.000000000 -0500 +@@ -16,7 +16,7 @@ + while [ ! -z "$NEXTLINE" ] ; do + + # Skip lines beginning with '#' +- if [ ! "${NEXTLINE:0:1}" == '#' ]; then ++ if ! echo ${NEXTLINE} | grep -q "^#" ; then + #Extract first field, minus its trailing colon + ORIG_FILE=`echo $NEXTLINE | awk '/:/{print $1}' | sed -e 's/://'` + diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 4dc6753d0ac6..d3578f536c79 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -66,6 +66,7 @@ share/icons/Crux/16x16/places/gnome-fs-smb.png share/icons/Crux/16x16/places/gnome-fs-ssh.png share/icons/Crux/16x16/places/gnome-mime-x-directory-smb-share.png share/icons/Crux/16x16/places/gtk-directory.png +share/icons/Crux/16x16/places/inode-directory.png share/icons/Crux/16x16/places/network.png share/icons/Crux/16x16/places/stock_folder.png share/icons/Crux/16x16/places/user-home.png @@ -144,6 +145,7 @@ share/icons/Crux/22x22/places/gnome-fs-smb.png share/icons/Crux/22x22/places/gnome-fs-ssh.png share/icons/Crux/22x22/places/gnome-mime-x-directory-smb-share.png share/icons/Crux/22x22/places/gtk-directory.png +share/icons/Crux/22x22/places/inode-directory.png share/icons/Crux/22x22/places/network.png share/icons/Crux/22x22/places/stock_folder.png share/icons/Crux/22x22/places/user-home.png @@ -222,6 +224,7 @@ share/icons/Crux/24x24/places/gnome-fs-smb.png share/icons/Crux/24x24/places/gnome-fs-ssh.png share/icons/Crux/24x24/places/gnome-mime-x-directory-smb-share.png share/icons/Crux/24x24/places/gtk-directory.png +share/icons/Crux/24x24/places/inode-directory.png share/icons/Crux/24x24/places/network.png share/icons/Crux/24x24/places/stock_folder.png share/icons/Crux/24x24/places/user-home.png @@ -249,6 +252,7 @@ share/icons/Crux/32x32/places/gnome-fs-smb.png share/icons/Crux/32x32/places/gnome-fs-ssh.png share/icons/Crux/32x32/places/gnome-mime-x-directory-smb-share.png share/icons/Crux/32x32/places/gtk-directory.png +share/icons/Crux/32x32/places/inode-directory.png share/icons/Crux/32x32/places/network.png share/icons/Crux/32x32/places/stock_folder.png share/icons/Crux/32x32/places/user-home.png @@ -328,6 +332,7 @@ share/icons/Crux/scalable/places/gnome-fs-smb.svg share/icons/Crux/scalable/places/gnome-fs-ssh.svg share/icons/Crux/scalable/places/gnome-mime-x-directory-smb-share.svg share/icons/Crux/scalable/places/gtk-directory.svg +share/icons/Crux/scalable/places/inode-directory.svg share/icons/Crux/scalable/places/network.svg share/icons/Crux/scalable/places/stock_folder.svg share/icons/Crux/scalable/places/user-home.svg @@ -413,6 +418,7 @@ share/icons/HighContrast-SVG/scalable/actions/gnome-lockscreen.svg share/icons/HighContrast-SVG/scalable/actions/gnome-logout.svg share/icons/HighContrast-SVG/scalable/actions/gnome-run.svg share/icons/HighContrast-SVG/scalable/actions/gnome-searchtool.svg +share/icons/HighContrast-SVG/scalable/actions/gnome-shutdown.svg share/icons/HighContrast-SVG/scalable/actions/gnome-stock-mail-fwd.svg share/icons/HighContrast-SVG/scalable/actions/gnome-stock-mail-new.svg share/icons/HighContrast-SVG/scalable/actions/gnome-stock-mail-rpl.svg @@ -503,7 +509,6 @@ share/icons/HighContrast-SVG/scalable/actions/gtk-undo-ltr.svg share/icons/HighContrast-SVG/scalable/actions/gtk-unindent-ltr.svg share/icons/HighContrast-SVG/scalable/actions/gtk-unindent-rtl.svg share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-100.svg -share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-fit.svg share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-in.svg share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-out.svg share/icons/HighContrast-SVG/scalable/actions/help-about.svg @@ -639,7 +644,6 @@ share/icons/HighContrast-SVG/scalable/actions/stock_up.svg share/icons/HighContrast-SVG/scalable/actions/stock_zoom-1.svg share/icons/HighContrast-SVG/scalable/actions/stock_zoom-in.svg share/icons/HighContrast-SVG/scalable/actions/stock_zoom-out.svg -share/icons/HighContrast-SVG/scalable/actions/stock_zoom-page.svg share/icons/HighContrast-SVG/scalable/actions/stop.svg share/icons/HighContrast-SVG/scalable/actions/system-lock-screen.svg share/icons/HighContrast-SVG/scalable/actions/system-log-out.svg @@ -663,7 +667,6 @@ share/icons/HighContrast-SVG/scalable/actions/view-sort-descending.svg share/icons/HighContrast-SVG/scalable/actions/viewmag+.svg share/icons/HighContrast-SVG/scalable/actions/viewmag-.svg share/icons/HighContrast-SVG/scalable/actions/viewmag1.svg -share/icons/HighContrast-SVG/scalable/actions/viewmagfit.svg share/icons/HighContrast-SVG/scalable/actions/window-close.svg share/icons/HighContrast-SVG/scalable/actions/window-new.svg share/icons/HighContrast-SVG/scalable/actions/window_fullscreen.svg @@ -1056,6 +1059,7 @@ share/icons/HighContrast-SVG/scalable/places/gnome-mime-x-directory-smb-workgrou share/icons/HighContrast-SVG/scalable/places/gnome-stock-trash.svg share/icons/HighContrast-SVG/scalable/places/gtk-directory.svg share/icons/HighContrast-SVG/scalable/places/gtk-network.svg +share/icons/HighContrast-SVG/scalable/places/inode-directory.svg share/icons/HighContrast-SVG/scalable/places/library-internet-radio.svg share/icons/HighContrast-SVG/scalable/places/library-podcast.svg share/icons/HighContrast-SVG/scalable/places/network-server.svg @@ -1138,251 +1142,322 @@ share/icons/HighContrast-SVG/scalable/status/user-trash-full.svg share/icons/HighContrast-SVG/scalable/status/xfce-trash_full.svg share/icons/HighContrast/index.theme share/icons/HighContrastInverse/index.theme -share/icons/HighContrastLargePrint/36x36/apps/gnome-spinner-rest.png -share/icons/HighContrastLargePrint/36x36/apps/gnome-spinner.png -share/icons/HighContrastLargePrint/48x48/apps/JUSimageIcon.png +share/icons/HighContrastLargePrint/36x36/animations/gnome-spinner-rest.png +share/icons/HighContrastLargePrint/36x36/animations/gnome-spinner.png +share/icons/HighContrastLargePrint/36x36/animations/process-idle.png +share/icons/HighContrastLargePrint/36x36/animations/process-working.png +share/icons/HighContrastLargePrint/48x48/actions/exit.png +share/icons/HighContrastLargePrint/48x48/actions/gnome-logout.png +share/icons/HighContrastLargePrint/48x48/actions/gnome-run.png +share/icons/HighContrastLargePrint/48x48/actions/gnome-searchtool.png +share/icons/HighContrastLargePrint/48x48/actions/gnome-shutdown.png +share/icons/HighContrastLargePrint/48x48/actions/go-home.png +share/icons/HighContrastLargePrint/48x48/actions/gohome.png +share/icons/HighContrastLargePrint/48x48/actions/gtk-execute.png +share/icons/HighContrastLargePrint/48x48/actions/gtk-home.png +share/icons/HighContrastLargePrint/48x48/actions/gtk-media-pause.png +share/icons/HighContrastLargePrint/48x48/actions/gtk-refresh.png +share/icons/HighContrastLargePrint/48x48/actions/kfind.png +share/icons/HighContrastLargePrint/48x48/actions/kfm_home.png +share/icons/HighContrastLargePrint/48x48/actions/media-playback-pause.png +share/icons/HighContrastLargePrint/48x48/actions/player_pause.png +share/icons/HighContrastLargePrint/48x48/actions/redhat-home.png +share/icons/HighContrastLargePrint/48x48/actions/reload.png +share/icons/HighContrastLargePrint/48x48/actions/reload3.png +share/icons/HighContrastLargePrint/48x48/actions/reload_all_tabs.png +share/icons/HighContrastLargePrint/48x48/actions/reload_page.png +share/icons/HighContrastLargePrint/48x48/actions/search.png +share/icons/HighContrastLargePrint/48x48/actions/stock_home.png +share/icons/HighContrastLargePrint/48x48/actions/stock_media-pause.png +share/icons/HighContrastLargePrint/48x48/actions/stock_new-tab.png +share/icons/HighContrastLargePrint/48x48/actions/stock_refresh.png +share/icons/HighContrastLargePrint/48x48/actions/system-log-out.png +share/icons/HighContrastLargePrint/48x48/actions/system-run.png +share/icons/HighContrastLargePrint/48x48/actions/system-search.png +share/icons/HighContrastLargePrint/48x48/actions/system-shutdown.png +share/icons/HighContrastLargePrint/48x48/actions/view-refresh.png +share/icons/HighContrastLargePrint/48x48/apps/access.png share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png -share/icons/HighContrastLargePrint/48x48/apps/acme-48.png -share/icons/HighContrastLargePrint/48x48/apps/administration.png +share/icons/HighContrastLargePrint/48x48/apps/accessories-calculator.png +share/icons/HighContrastLargePrint/48x48/apps/accessories-character-map.png +share/icons/HighContrastLargePrint/48x48/apps/accessories-text-editor.png share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png +share/icons/HighContrastLargePrint/48x48/apps/applets-screenshooter.png +share/icons/HighContrastLargePrint/48x48/apps/arts.png share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png -share/icons/HighContrastLargePrint/48x48/apps/battstat.png +share/icons/HighContrastLargePrint/48x48/apps/background.png +share/icons/HighContrastLargePrint/48x48/apps/calc.png share/icons/HighContrastLargePrint/48x48/apps/charpick.png share/icons/HighContrastLargePrint/48x48/apps/clock.png share/icons/HighContrastLargePrint/48x48/apps/config-language.png -share/icons/HighContrastLargePrint/48x48/apps/config-users.png -share/icons/HighContrastLargePrint/48x48/apps/config-xfree.png -share/icons/HighContrastLargePrint/48x48/apps/disks.png share/icons/HighContrastLargePrint/48x48/apps/display-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/drivemount-applet.png -share/icons/HighContrastLargePrint/48x48/apps/evolution-1.4.png +share/icons/HighContrastLargePrint/48x48/apps/eog.png +share/icons/HighContrastLargePrint/48x48/apps/evince.png share/icons/HighContrastLargePrint/48x48/apps/evolution.png share/icons/HighContrastLargePrint/48x48/apps/file-manager.png share/icons/HighContrastLargePrint/48x48/apps/file-roller.png -share/icons/HighContrastLargePrint/48x48/apps/fsexam-icon.png -share/icons/HighContrastLargePrint/48x48/apps/gaim.png -share/icons/HighContrastLargePrint/48x48/apps/gataxx.png -share/icons/HighContrastLargePrint/48x48/apps/gcalctool.png -share/icons/HighContrastLargePrint/48x48/apps/gconf-editor.png +share/icons/HighContrastLargePrint/48x48/apps/fonts.png share/icons/HighContrastLargePrint/48x48/apps/gdict.png -share/icons/HighContrastLargePrint/48x48/apps/gdm-setup.png -share/icons/HighContrastLargePrint/48x48/apps/gdm-xnest.png -share/icons/HighContrastLargePrint/48x48/apps/gdm.png -share/icons/HighContrastLargePrint/48x48/apps/gedit-icon.png +share/icons/HighContrastLargePrint/48x48/apps/ghex.png +share/icons/HighContrastLargePrint/48x48/apps/gimp.png share/icons/HighContrastLargePrint/48x48/apps/gkb.png -share/icons/HighContrastLargePrint/48x48/apps/glade-2.png -share/icons/HighContrastLargePrint/48x48/apps/glines.png -share/icons/HighContrastLargePrint/48x48/apps/glow-app-icon.png -share/icons/HighContrastLargePrint/48x48/apps/gnect-icon.png share/icons/HighContrastLargePrint/48x48/apps/gnome-application-generic.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-applications.png share/icons/HighContrastLargePrint/48x48/apps/gnome-audio2.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-blackjack.png share/icons/HighContrastLargePrint/48x48/apps/gnome-calc3.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-calculator.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ccmime.png share/icons/HighContrastLargePrint/48x48/apps/gnome-ccscreensaver.png share/icons/HighContrastLargePrint/48x48/apps/gnome-cd.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png share/icons/HighContrastLargePrint/48x48/apps/gnome-character-map.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-desktop-config.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-devel.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-eog.png share/icons/HighContrastLargePrint/48x48/apps/gnome-folder-generic.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-ftp.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-ghex.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-ghostview.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-globe.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-gnobots2.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-gnomine.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-gnotravex.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-graphics.png share/icons/HighContrastLargePrint/48x48/apps/gnome-grecord.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-gsame.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-gtali.png share/icons/HighContrastLargePrint/48x48/apps/gnome-help.png share/icons/HighContrastLargePrint/48x48/apps/gnome-home.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-joystick.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-lockscreen.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-info.png share/icons/HighContrastLargePrint/48x48/apps/gnome-log.png share/icons/HighContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-logout.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-mahjongg.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mailcheck.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-modem.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-money.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-monitor.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-multimedia.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-nibbles.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-other.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-palm.png share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-pdf.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-planner.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-remote-desktop.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-run.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-screensaver.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-screenshot.png share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-server-config.png share/icons/HighContrastLargePrint/48x48/apps/gnome-session.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-background.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-default-applications.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-font.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-im.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-keybindings.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-sound.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-theme.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-settings.png share/icons/HighContrastLargePrint/48x48/apps/gnome-starthere.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-stones.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-system.png share/icons/HighContrastLargePrint/48x48/apps/gnome-terminal.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-util.png share/icons/HighContrastLargePrint/48x48/apps/gnome-window-manager.png share/icons/HighContrastLargePrint/48x48/apps/gnome-windows.png share/icons/HighContrastLargePrint/48x48/apps/gnome-workspace.png -share/icons/HighContrastLargePrint/48x48/apps/gnomemeeting-logo-icon.png -share/icons/HighContrastLargePrint/48x48/apps/gnopernicus.png -share/icons/HighContrastLargePrint/48x48/apps/gnotski-icon.png share/icons/HighContrastLargePrint/48x48/apps/gok.png -share/icons/HighContrastLargePrint/48x48/apps/gswitchit-applet.png -share/icons/HighContrastLargePrint/48x48/apps/gthumb.png -share/icons/HighContrastLargePrint/48x48/apps/gtkam-camera.png +share/icons/HighContrastLargePrint/48x48/apps/gtk-help.png share/icons/HighContrastLargePrint/48x48/apps/gucharmap.png -share/icons/HighContrastLargePrint/48x48/apps/hwbrowser.png -share/icons/HighContrastLargePrint/48x48/apps/iagno.png -share/icons/HighContrastLargePrint/48x48/apps/jDictionary.png -share/icons/HighContrastLargePrint/48x48/apps/jDiskReport.png -share/icons/HighContrastLargePrint/48x48/apps/jEdit.png -share/icons/HighContrastLargePrint/48x48/apps/jGraphPad.png -share/icons/HighContrastLargePrint/48x48/apps/jSpiderIcon.png -share/icons/HighContrastLargePrint/48x48/apps/jmplay.48.png -share/icons/HighContrastLargePrint/48x48/apps/keyboard.png +share/icons/HighContrastLargePrint/48x48/apps/help-browser.png +share/icons/HighContrastLargePrint/48x48/apps/help.png +share/icons/HighContrastLargePrint/48x48/apps/kcalc.png +share/icons/HighContrastLargePrint/48x48/apps/kcharselect.png +share/icons/HighContrastLargePrint/48x48/apps/kcmkwm.png +share/icons/HighContrastLargePrint/48x48/apps/kcmsound.png +share/icons/HighContrastLargePrint/48x48/apps/kedit.png +share/icons/HighContrastLargePrint/48x48/apps/key_bindings.png +share/icons/HighContrastLargePrint/48x48/apps/kfm.png +share/icons/HighContrastLargePrint/48x48/apps/khelpcenter.png +share/icons/HighContrastLargePrint/48x48/apps/knotify.png +share/icons/HighContrastLargePrint/48x48/apps/konsole.png +share/icons/HighContrastLargePrint/48x48/apps/kwin.png share/icons/HighContrastLargePrint/48x48/apps/launcher-program.png -share/icons/HighContrastLargePrint/48x48/apps/logviewer.png -share/icons/HighContrastLargePrint/48x48/apps/media-player-48.png +share/icons/HighContrastLargePrint/48x48/apps/locale.png share/icons/HighContrastLargePrint/48x48/apps/mozilla-icon.png -share/icons/HighContrastLargePrint/48x48/apps/nb48x48.png -share/icons/HighContrastLargePrint/48x48/apps/netapplet.png -share/icons/HighContrastLargePrint/48x48/apps/network-config.png -share/icons/HighContrastLargePrint/48x48/apps/network.png +share/icons/HighContrastLargePrint/48x48/apps/multimedia-volume-control.png +share/icons/HighContrastLargePrint/48x48/apps/multimedia.png +share/icons/HighContrastLargePrint/48x48/apps/openterm.png share/icons/HighContrastLargePrint/48x48/apps/orca.png share/icons/HighContrastLargePrint/48x48/apps/panel-drawer.png share/icons/HighContrastLargePrint/48x48/apps/panel-force-quit.png -share/icons/HighContrastLargePrint/48x48/apps/panel-notification-area.png -share/icons/HighContrastLargePrint/48x48/apps/password.png share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png -share/icons/HighContrastLargePrint/48x48/apps/postscript-viewer.png -share/icons/HighContrastLargePrint/48x48/apps/procman.png -share/icons/HighContrastLargePrint/48x48/apps/quick-lounge-applet.png -share/icons/HighContrastLargePrint/48x48/apps/realplay.png -share/icons/HighContrastLargePrint/48x48/apps/screensaver.png -share/icons/HighContrastLargePrint/48x48/apps/serviceconf.png -share/icons/HighContrastLargePrint/48x48/apps/sound-capplet.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-accessibility.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-font.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-keyboard-shortcuts.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-keyboard.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-locale.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-sound.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-theme.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-desktop-wallpaper.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-system-session.png +share/icons/HighContrastLargePrint/48x48/apps/preferences-system-windows.png +share/icons/HighContrastLargePrint/48x48/apps/redhat-filemanager.png +share/icons/HighContrastLargePrint/48x48/apps/session-properties.png +share/icons/HighContrastLargePrint/48x48/apps/smc.png +share/icons/HighContrastLargePrint/48x48/apps/sound-juicer.png share/icons/HighContrastLargePrint/48x48/apps/star.png -share/icons/HighContrastLargePrint/48x48/apps/start-here.png -share/icons/HighContrastLargePrint/48x48/apps/stock_notes.png -share/icons/HighContrastLargePrint/48x48/apps/stock_proxy.png -share/icons/HighContrastLargePrint/48x48/apps/stock_timezone.png -share/icons/HighContrastLargePrint/48x48/apps/stock_weather-storm.png -share/icons/HighContrastLargePrint/48x48/apps/sun_java.png -share/icons/HighContrastLargePrint/48x48/apps/web-browser.png +share/icons/HighContrastLargePrint/48x48/apps/stock_help.png +share/icons/HighContrastLargePrint/48x48/apps/style.png +share/icons/HighContrastLargePrint/48x48/apps/susehelpcenter.png +share/icons/HighContrastLargePrint/48x48/apps/system-file-manager.png +share/icons/HighContrastLargePrint/48x48/apps/terminal.png +share/icons/HighContrastLargePrint/48x48/apps/text-editor.png +share/icons/HighContrastLargePrint/48x48/apps/utilities-terminal.png +share/icons/HighContrastLargePrint/48x48/apps/volume-knob.png +share/icons/HighContrastLargePrint/48x48/apps/wallpaper.png share/icons/HighContrastLargePrint/48x48/apps/window-capplet.png -share/icons/HighContrastLargePrint/48x48/apps/xsane.png +share/icons/HighContrastLargePrint/48x48/apps/xfce-filemanager.png +share/icons/HighContrastLargePrint/48x48/apps/xfce-terminal.png +share/icons/HighContrastLargePrint/48x48/apps/xfce4-backdrop.png +share/icons/HighContrastLargePrint/48x48/apps/xfce4-mixer.png +share/icons/HighContrastLargePrint/48x48/apps/xfce4-session.png +share/icons/HighContrastLargePrint/48x48/apps/xfce4-sound.png +share/icons/HighContrastLargePrint/48x48/apps/xfwm4.png +share/icons/HighContrastLargePrint/48x48/categories/applications-accessories.png +share/icons/HighContrastLargePrint/48x48/categories/applications-development.png +share/icons/HighContrastLargePrint/48x48/categories/applications-engineering.png +share/icons/HighContrastLargePrint/48x48/categories/applications-games.png +share/icons/HighContrastLargePrint/48x48/categories/applications-graphics.png +share/icons/HighContrastLargePrint/48x48/categories/applications-internet.png +share/icons/HighContrastLargePrint/48x48/categories/applications-multimedia.png +share/icons/HighContrastLargePrint/48x48/categories/applications-office.png +share/icons/HighContrastLargePrint/48x48/categories/applications-other.png +share/icons/HighContrastLargePrint/48x48/categories/applications-science.png +share/icons/HighContrastLargePrint/48x48/categories/applications-system.png +share/icons/HighContrastLargePrint/48x48/categories/applications-utilities.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-applications.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-control-center.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-devel.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-globe.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-graphics.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-joystick.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-multimedia.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-other.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-settings.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-system.png +share/icons/HighContrastLargePrint/48x48/categories/gnome-util.png +share/icons/HighContrastLargePrint/48x48/categories/gtk-preferences.png +share/icons/HighContrastLargePrint/48x48/categories/input_devices_settings.png +share/icons/HighContrastLargePrint/48x48/categories/kcontrol.png +share/icons/HighContrastLargePrint/48x48/categories/package_development.png +share/icons/HighContrastLargePrint/48x48/categories/package_games.png +share/icons/HighContrastLargePrint/48x48/categories/package_graphics.png +share/icons/HighContrastLargePrint/48x48/categories/package_multimedia.png +share/icons/HighContrastLargePrint/48x48/categories/package_network.png +share/icons/HighContrastLargePrint/48x48/categories/package_office.png +share/icons/HighContrastLargePrint/48x48/categories/package_settings.png +share/icons/HighContrastLargePrint/48x48/categories/package_system.png +share/icons/HighContrastLargePrint/48x48/categories/package_utilities.png +share/icons/HighContrastLargePrint/48x48/categories/preferences-desktop-peripherals.png +share/icons/HighContrastLargePrint/48x48/categories/preferences-desktop-personal.png +share/icons/HighContrastLargePrint/48x48/categories/preferences-desktop.png +share/icons/HighContrastLargePrint/48x48/categories/preferences-other.png +share/icons/HighContrastLargePrint/48x48/categories/preferences-system-network.png +share/icons/HighContrastLargePrint/48x48/categories/preferences-system.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-accessories.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-games.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-graphics.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-internet.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-office.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-preferences.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-programming.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-sound_video.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-system_settings.png +share/icons/HighContrastLargePrint/48x48/categories/redhat-system_tools.png +share/icons/HighContrastLargePrint/48x48/categories/stock_internet.png +share/icons/HighContrastLargePrint/48x48/categories/xfce-games.png +share/icons/HighContrastLargePrint/48x48/categories/xfce-graphics.png +share/icons/HighContrastLargePrint/48x48/categories/xfce-internet.png +share/icons/HighContrastLargePrint/48x48/categories/xfce-multimedia.png +share/icons/HighContrastLargePrint/48x48/categories/xfce-office.png +share/icons/HighContrastLargePrint/48x48/categories/xfce-system-settings.png +share/icons/HighContrastLargePrint/48x48/categories/xfce-utils.png +share/icons/HighContrastLargePrint/48x48/categories/xfce4-settings.png +share/icons/HighContrastLargePrint/48x48/devices/3floppy_unmount.png +share/icons/HighContrastLargePrint/48x48/devices/cdrom_unmount.png +share/icons/HighContrastLargePrint/48x48/devices/cdwriter_unmount.png +share/icons/HighContrastLargePrint/48x48/devices/computer.png +share/icons/HighContrastLargePrint/48x48/devices/drive-cdrom.png +share/icons/HighContrastLargePrint/48x48/devices/drive-harddisk.png +share/icons/HighContrastLargePrint/48x48/devices/drive-optical.png +share/icons/HighContrastLargePrint/48x48/devices/drive-removable-media.png +share/icons/HighContrastLargePrint/48x48/devices/dvd_unmount.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-cdrom.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-computer.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-disc-cdr.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-disc-cdrw.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-disc-dvdr-plus.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-disc-dvdr.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-disc-dvdram.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-disc-dvdrom.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-disc-dvdrw.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-dvd.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-floppy.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-harddisk-1394.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-harddisk-usb.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-harddisk.png -share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-keyboard.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-ball.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer-network.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer-new.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-removable-1394.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-removable-usb.png share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-removable.png -share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png +share/icons/HighContrastLargePrint/48x48/devices/gnome-fs-client.png +share/icons/HighContrastLargePrint/48x48/devices/gtk-cdrom.png +share/icons/HighContrastLargePrint/48x48/devices/gtk-floppy.png +share/icons/HighContrastLargePrint/48x48/devices/gtk-harddisk.png +share/icons/HighContrastLargePrint/48x48/devices/harddrive.png +share/icons/HighContrastLargePrint/48x48/devices/hdd_unmount.png +share/icons/HighContrastLargePrint/48x48/devices/input-keyboard.png +share/icons/HighContrastLargePrint/48x48/devices/input-mouse.png +share/icons/HighContrastLargePrint/48x48/devices/keyboard.png +share/icons/HighContrastLargePrint/48x48/devices/kjobviewer.png +share/icons/HighContrastLargePrint/48x48/devices/kxkb.png +share/icons/HighContrastLargePrint/48x48/devices/media-cdrom.png +share/icons/HighContrastLargePrint/48x48/devices/media-floppy.png +share/icons/HighContrastLargePrint/48x48/devices/media-optical.png +share/icons/HighContrastLargePrint/48x48/devices/mouse.png +share/icons/HighContrastLargePrint/48x48/devices/printer-remote.png +share/icons/HighContrastLargePrint/48x48/devices/printer.png +share/icons/HighContrastLargePrint/48x48/devices/printer1.png +share/icons/HighContrastLargePrint/48x48/devices/printmgr.png +share/icons/HighContrastLargePrint/48x48/devices/stock_printers.png +share/icons/HighContrastLargePrint/48x48/devices/system-floppy.png +share/icons/HighContrastLargePrint/48x48/devices/system.png +share/icons/HighContrastLargePrint/48x48/devices/usbpendrive_unmount.png +share/icons/HighContrastLargePrint/48x48/devices/xfce-printer.png +share/icons/HighContrastLargePrint/48x48/devices/xfce4-keyboard.png +share/icons/HighContrastLargePrint/48x48/devices/xfce4-mouse.png +share/icons/HighContrastLargePrint/48x48/devices/yast_HD.png +share/icons/HighContrastLargePrint/48x48/devices/yast_idetude.png +share/icons/HighContrastLargePrint/48x48/devices/yast_mouse.png +share/icons/HighContrastLargePrint/48x48/devices/yast_printer.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-default.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-desktop.png share/icons/HighContrastLargePrint/48x48/emblems/emblem-important.png share/icons/HighContrastLargePrint/48x48/emblems/emblem-noread.png share/icons/HighContrastLargePrint/48x48/emblems/emblem-personal.png share/icons/HighContrastLargePrint/48x48/emblems/emblem-special.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-client.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-desktop.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory-visiting.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-directory.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-executable.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-home.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-loading-icon.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-network.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-regular.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-share.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-smb.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-ssh.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-trash-empty.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-trash-full.png -share/icons/HighContrastLargePrint/48x48/filesystems/gnome-fs-web.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-compressed.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-library.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-lhz.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-msword.png +share/icons/HighContrastLargePrint/48x48/emblems/emblem-unreadable.png +share/icons/HighContrastLargePrint/48x48/emblems/stock_mail-priority-high.png +share/icons/HighContrastLargePrint/48x48/mimetypes/application-x-executable.png +share/icons/HighContrastLargePrint/48x48/mimetypes/ascii.png +share/icons/HighContrastLargePrint/48x48/mimetypes/audio-x-generic.png +share/icons/HighContrastLargePrint/48x48/mimetypes/binary.png +share/icons/HighContrastLargePrint/48x48/mimetypes/contents2.png +share/icons/HighContrastLargePrint/48x48/mimetypes/deb.png +share/icons/HighContrastLargePrint/48x48/mimetypes/empty.png +share/icons/HighContrastLargePrint/48x48/mimetypes/exec.png +share/icons/HighContrastLargePrint/48x48/mimetypes/folder_tar.png +share/icons/HighContrastLargePrint/48x48/mimetypes/font-x-generic.png +share/icons/HighContrastLargePrint/48x48/mimetypes/font.png +share/icons/HighContrastLargePrint/48x48/mimetypes/font_bitmap.png +share/icons/HighContrastLargePrint/48x48/mimetypes/font_truetype.png +share/icons/HighContrastLargePrint/48x48/mimetypes/font_type1.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-fs-executable.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-fs-regular.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-ogg.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pdf.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-encrypted.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-keys.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-postscript.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-qif.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-rhythmbox-effect.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-rhythmbox-playlist.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-rtf.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-smil.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-abiword.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-applix-word.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-7z-compressed.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-archive.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-arj.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-backup.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-blender.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-bzip.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-cd-image.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-class-file.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-compress.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-core-file.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-core.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-cpio.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-dc-rom.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-deb.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-dia-diagram.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-dvi.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-e-theme.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-executable.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-afm.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-bdf.png @@ -1390,294 +1465,332 @@ share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-pcf.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-ttf.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gameboy-rom.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-genesis-rom.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-glade.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gnome-app-info.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gnucash.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gnumeric.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gtktalog.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gzip.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-ipod-firmware.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-jar.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-java-byte-code.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-kde-app-info.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-killustrator.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-kpresenter.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-kspread.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-kword.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lha.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-mrproject.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-msx-rom.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-n64-rom.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-nes-rom.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-object-file.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-object.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-ogg.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-php.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-python.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-qw.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lzma.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-lhz.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-ms-dos-executable.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-rar.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-reject.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-rpm.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-scheme.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-sharedlib.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-shellscript.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-smil.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-sms-rom.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-sql.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-stuffit.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-tar.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-tex.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-trash.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-tarz.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-zip.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-ac3.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-basic.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-midi.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-aiff.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-it.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-midi.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-mod.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-mp3.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-pn-realaudio.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-s3m.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-stm.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-ulaw.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-voc.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-wav.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-xi.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-xm.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-audio.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-bmp.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-gif.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-ief.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-jpeg.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-png.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-svg+xml.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-svg.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-tiff.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-3ds.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-applix-graphic.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-cmu-raster.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-lwo.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-lws.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-portable-anymap.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-portable-bitmap.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-portable-graymap.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-portable-pixmap.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-psd.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-rgb.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-tga.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xbitmap.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xcf.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xfig.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xpixmap.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xwindowdump.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-image.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-css.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-html.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-authors.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-c++.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-c++src.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-c-header.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-c.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-chdr.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-copying.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-credits.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-csh.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-csharp.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-csrc.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-haskell.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-install.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-java.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-literate-haskell.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-lyx.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-makefile.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-patch.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-perl.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-python.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-readme.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-scheme.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-sh.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-sql.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-tex.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-troff-man.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-vcalendar.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-vcard.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-zsh.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text-xml.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-text.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-video-mpeg.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-video-quicktime.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-ms-asf.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-ms-wmv.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-msvideo.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-video.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png -share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-x-font.png share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-package.png +share/icons/HighContrastLargePrint/48x48/mimetypes/gtk-file.png +share/icons/HighContrastLargePrint/48x48/mimetypes/image-x-generic.png +share/icons/HighContrastLargePrint/48x48/mimetypes/image.png +share/icons/HighContrastLargePrint/48x48/mimetypes/mime_ascii.png +share/icons/HighContrastLargePrint/48x48/mimetypes/misc.png +share/icons/HighContrastLargePrint/48x48/mimetypes/package-x-generic.png +share/icons/HighContrastLargePrint/48x48/mimetypes/package.png +share/icons/HighContrastLargePrint/48x48/mimetypes/package_editors.png +share/icons/HighContrastLargePrint/48x48/mimetypes/rpm.png +share/icons/HighContrastLargePrint/48x48/mimetypes/sound.png +share/icons/HighContrastLargePrint/48x48/mimetypes/stock_addressbook.png +share/icons/HighContrastLargePrint/48x48/mimetypes/tar.png +share/icons/HighContrastLargePrint/48x48/mimetypes/text-x-generic.png +share/icons/HighContrastLargePrint/48x48/mimetypes/text-x-preview.png +share/icons/HighContrastLargePrint/48x48/mimetypes/tgz.png +share/icons/HighContrastLargePrint/48x48/mimetypes/txt.png +share/icons/HighContrastLargePrint/48x48/mimetypes/txt2.png +share/icons/HighContrastLargePrint/48x48/mimetypes/unknown.png +share/icons/HighContrastLargePrint/48x48/mimetypes/vcard.png +share/icons/HighContrastLargePrint/48x48/mimetypes/video-x-generic.png +share/icons/HighContrastLargePrint/48x48/mimetypes/video.png +share/icons/HighContrastLargePrint/48x48/mimetypes/x-office-address-book.png +share/icons/HighContrastLargePrint/48x48/mimetypes/zip.png +share/icons/HighContrastLargePrint/48x48/places/desktop.png +share/icons/HighContrastLargePrint/48x48/places/distributor-logo.png +share/icons/HighContrastLargePrint/48x48/places/emptytrash.png +share/icons/HighContrastLargePrint/48x48/places/folder-remote.png +share/icons/HighContrastLargePrint/48x48/places/folder.icon +share/icons/HighContrastLargePrint/48x48/places/folder.png +share/icons/HighContrastLargePrint/48x48/places/folder_home.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-desktop.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-directory.icon +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-directory.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-ftp.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-home.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-network.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-nfs.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-server.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-share.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-smb.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-ssh.png +share/icons/HighContrastLargePrint/48x48/places/gnome-fs-trash-empty.png +share/icons/HighContrastLargePrint/48x48/places/gnome-main-menu.png +share/icons/HighContrastLargePrint/48x48/places/gnome-mime-x-directory-nfs-server.png +share/icons/HighContrastLargePrint/48x48/places/gnome-mime-x-directory-smb-server.png +share/icons/HighContrastLargePrint/48x48/places/gnome-mime-x-directory-smb-share.png +share/icons/HighContrastLargePrint/48x48/places/gnome-mime-x-directory-smb-workgroup.png +share/icons/HighContrastLargePrint/48x48/places/gnome-stock-trash.png +share/icons/HighContrastLargePrint/48x48/places/gtk-directory.icon +share/icons/HighContrastLargePrint/48x48/places/gtk-directory.png +share/icons/HighContrastLargePrint/48x48/places/gtk-network.png +share/icons/HighContrastLargePrint/48x48/places/inode-directory.icon +share/icons/HighContrastLargePrint/48x48/places/inode-directory.png +share/icons/HighContrastLargePrint/48x48/places/network-server.png +share/icons/HighContrastLargePrint/48x48/places/network-workgroup.png +share/icons/HighContrastLargePrint/48x48/places/network.png +share/icons/HighContrastLargePrint/48x48/places/network_local.png +share/icons/HighContrastLargePrint/48x48/places/novell-button.png +share/icons/HighContrastLargePrint/48x48/places/redhat-network-server.png +share/icons/HighContrastLargePrint/48x48/places/server.png +share/icons/HighContrastLargePrint/48x48/places/start-here.png +share/icons/HighContrastLargePrint/48x48/places/stock_folder.icon +share/icons/HighContrastLargePrint/48x48/places/stock_folder.png +share/icons/HighContrastLargePrint/48x48/places/trashcan_empty.png +share/icons/HighContrastLargePrint/48x48/places/user-desktop.png +share/icons/HighContrastLargePrint/48x48/places/user-home.png +share/icons/HighContrastLargePrint/48x48/places/user-trash.png +share/icons/HighContrastLargePrint/48x48/places/xfce-trash_empty.png +share/icons/HighContrastLargePrint/48x48/status/audio-volume-high.png +share/icons/HighContrastLargePrint/48x48/status/audio-volume-low.png +share/icons/HighContrastLargePrint/48x48/status/audio-volume-medium.png +share/icons/HighContrastLargePrint/48x48/status/audio-volume-muted.png +share/icons/HighContrastLargePrint/48x48/status/edittrash.png +share/icons/HighContrastLargePrint/48x48/status/folder-drag-accept.icon +share/icons/HighContrastLargePrint/48x48/status/folder-drag-accept.png +share/icons/HighContrastLargePrint/48x48/status/gnome-fs-directory-accept.icon +share/icons/HighContrastLargePrint/48x48/status/gnome-fs-directory-accept.png +share/icons/HighContrastLargePrint/48x48/status/gnome-fs-trash-full.png +share/icons/HighContrastLargePrint/48x48/status/gnome-stock-trash-full.png +share/icons/HighContrastLargePrint/48x48/status/stock_trash_full.png +share/icons/HighContrastLargePrint/48x48/status/stock_volume-0.png +share/icons/HighContrastLargePrint/48x48/status/stock_volume-max.png +share/icons/HighContrastLargePrint/48x48/status/stock_volume-med.png +share/icons/HighContrastLargePrint/48x48/status/stock_volume-min.png +share/icons/HighContrastLargePrint/48x48/status/stock_volume-mute.png +share/icons/HighContrastLargePrint/48x48/status/stock_volume.png +share/icons/HighContrastLargePrint/48x48/status/trashcan_full.png +share/icons/HighContrastLargePrint/48x48/status/user-trash-full.png +share/icons/HighContrastLargePrint/48x48/status/xfce-trash_full.png share/icons/HighContrastLargePrint/index.theme -share/icons/HighContrastLargePrintInverse/36x36/apps/gnome-spinner-rest.png -share/icons/HighContrastLargePrintInverse/36x36/apps/gnome-spinner.png -share/icons/HighContrastLargePrintInverse/48x48/apps/JUSimageIcon.png +share/icons/HighContrastLargePrintInverse/36x36/animations/gnome-spinner-rest.png +share/icons/HighContrastLargePrintInverse/36x36/animations/gnome-spinner.png +share/icons/HighContrastLargePrintInverse/36x36/animations/process-idle.png +share/icons/HighContrastLargePrintInverse/36x36/animations/process-working.png +share/icons/HighContrastLargePrintInverse/48x48/actions/exit.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gnome-logout.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gnome-run.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gnome-searchtool.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gnome-shutdown.png +share/icons/HighContrastLargePrintInverse/48x48/actions/go-home.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gohome.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-execute.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-home.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-media-pause.png +share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-refresh.png +share/icons/HighContrastLargePrintInverse/48x48/actions/kfind.png +share/icons/HighContrastLargePrintInverse/48x48/actions/kfm_home.png +share/icons/HighContrastLargePrintInverse/48x48/actions/media-playback-pause.png +share/icons/HighContrastLargePrintInverse/48x48/actions/player_pause.png +share/icons/HighContrastLargePrintInverse/48x48/actions/redhat-home.png +share/icons/HighContrastLargePrintInverse/48x48/actions/reload.png +share/icons/HighContrastLargePrintInverse/48x48/actions/reload3.png +share/icons/HighContrastLargePrintInverse/48x48/actions/reload_all_tabs.png +share/icons/HighContrastLargePrintInverse/48x48/actions/reload_page.png +share/icons/HighContrastLargePrintInverse/48x48/actions/search.png +share/icons/HighContrastLargePrintInverse/48x48/actions/stock_home.png +share/icons/HighContrastLargePrintInverse/48x48/actions/stock_media-pause.png +share/icons/HighContrastLargePrintInverse/48x48/actions/stock_new-tab.png +share/icons/HighContrastLargePrintInverse/48x48/actions/stock_refresh.png +share/icons/HighContrastLargePrintInverse/48x48/actions/system-log-out.png +share/icons/HighContrastLargePrintInverse/48x48/actions/system-run.png +share/icons/HighContrastLargePrintInverse/48x48/actions/system-search.png +share/icons/HighContrastLargePrintInverse/48x48/actions/system-shutdown.png +share/icons/HighContrastLargePrintInverse/48x48/actions/view-refresh.png +share/icons/HighContrastLargePrintInverse/48x48/apps/access.png share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png -share/icons/HighContrastLargePrintInverse/48x48/apps/acme-48.png -share/icons/HighContrastLargePrintInverse/48x48/apps/administration.png +share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-calculator.png +share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-character-map.png +share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-text-editor.png share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png +share/icons/HighContrastLargePrintInverse/48x48/apps/applets-screenshooter.png +share/icons/HighContrastLargePrintInverse/48x48/apps/arts.png share/icons/HighContrastLargePrintInverse/48x48/apps/ax-applet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/battstat.png +share/icons/HighContrastLargePrintInverse/48x48/apps/background.png +share/icons/HighContrastLargePrintInverse/48x48/apps/calc.png share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png share/icons/HighContrastLargePrintInverse/48x48/apps/clock.png share/icons/HighContrastLargePrintInverse/48x48/apps/config-language.png -share/icons/HighContrastLargePrintInverse/48x48/apps/config-users.png -share/icons/HighContrastLargePrintInverse/48x48/apps/config-xfree.png -share/icons/HighContrastLargePrintInverse/48x48/apps/disks.png share/icons/HighContrastLargePrintInverse/48x48/apps/display-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/drivemount-applet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/evolution-1.4.png +share/icons/HighContrastLargePrintInverse/48x48/apps/eog.png +share/icons/HighContrastLargePrintInverse/48x48/apps/evince.png share/icons/HighContrastLargePrintInverse/48x48/apps/evolution.png share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png share/icons/HighContrastLargePrintInverse/48x48/apps/file-roller.png -share/icons/HighContrastLargePrintInverse/48x48/apps/fsexam-icon.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gaim.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gataxx.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gcalctool.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gconf-editor.png +share/icons/HighContrastLargePrintInverse/48x48/apps/fonts.png share/icons/HighContrastLargePrintInverse/48x48/apps/gdict.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gdm-setup.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gdm-xnest.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gdm.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gedit-icon.png +share/icons/HighContrastLargePrintInverse/48x48/apps/ghex.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gimp.png share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png -share/icons/HighContrastLargePrintInverse/48x48/apps/glade-2.png -share/icons/HighContrastLargePrintInverse/48x48/apps/glines.png -share/icons/HighContrastLargePrintInverse/48x48/apps/glow-app-icon.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnect-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-application-generic.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-blackjack.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calculator.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccmime.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cdplayer-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-desktop-config.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-devel.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-eog.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-folder-generic.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ftp.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ghex.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ghostview.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-globe.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-gnobots2.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-gnomine.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-gnotravex.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-graphics.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-grecord.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-gsame.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-gtali.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-help.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-home.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-joystick.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-lockscreen.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-info.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-log.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-logo-icon-transparent.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-logout.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mahjongg.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mailcheck.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-modem.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-money.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-monitor.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-multimedia.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-nibbles.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-other.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-palm.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-pdf.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-planner.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-remote-desktop.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-run.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-screensaver.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-screenshot.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation-rest.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-server-config.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-technologies.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-background.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-default-applications.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-font.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-im.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-keybindings.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-sound.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-theme.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-ui-behavior.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-starthere.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-stones.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-system.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-terminal.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-util.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-window-manager.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-windows.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-workspace.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnomemeeting-logo-icon.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnopernicus.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnotski-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gok.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gswitchit-applet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gthumb.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gtkam-camera.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gtk-help.png share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png -share/icons/HighContrastLargePrintInverse/48x48/apps/hwbrowser.png -share/icons/HighContrastLargePrintInverse/48x48/apps/iagno.png -share/icons/HighContrastLargePrintInverse/48x48/apps/jDictionary.png -share/icons/HighContrastLargePrintInverse/48x48/apps/jDiskReport.png -share/icons/HighContrastLargePrintInverse/48x48/apps/jEdit.png -share/icons/HighContrastLargePrintInverse/48x48/apps/jGraphPad.png -share/icons/HighContrastLargePrintInverse/48x48/apps/jSpiderIcon.png -share/icons/HighContrastLargePrintInverse/48x48/apps/jmplay.48.png -share/icons/HighContrastLargePrintInverse/48x48/apps/keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/apps/help-browser.png +share/icons/HighContrastLargePrintInverse/48x48/apps/help.png +share/icons/HighContrastLargePrintInverse/48x48/apps/kcalc.png +share/icons/HighContrastLargePrintInverse/48x48/apps/kcharselect.png +share/icons/HighContrastLargePrintInverse/48x48/apps/kcmkwm.png +share/icons/HighContrastLargePrintInverse/48x48/apps/kcmsound.png +share/icons/HighContrastLargePrintInverse/48x48/apps/kedit.png +share/icons/HighContrastLargePrintInverse/48x48/apps/key_bindings.png +share/icons/HighContrastLargePrintInverse/48x48/apps/kfm.png +share/icons/HighContrastLargePrintInverse/48x48/apps/khelpcenter.png +share/icons/HighContrastLargePrintInverse/48x48/apps/knotify.png +share/icons/HighContrastLargePrintInverse/48x48/apps/konsole.png +share/icons/HighContrastLargePrintInverse/48x48/apps/kwin.png share/icons/HighContrastLargePrintInverse/48x48/apps/launcher-program.png -share/icons/HighContrastLargePrintInverse/48x48/apps/logviewer.png -share/icons/HighContrastLargePrintInverse/48x48/apps/media-player-48.png +share/icons/HighContrastLargePrintInverse/48x48/apps/locale.png share/icons/HighContrastLargePrintInverse/48x48/apps/mozilla-icon.png -share/icons/HighContrastLargePrintInverse/48x48/apps/nb48x48.png -share/icons/HighContrastLargePrintInverse/48x48/apps/netapplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/network-config.png -share/icons/HighContrastLargePrintInverse/48x48/apps/network.png +share/icons/HighContrastLargePrintInverse/48x48/apps/multimedia-volume-control.png +share/icons/HighContrastLargePrintInverse/48x48/apps/multimedia.png +share/icons/HighContrastLargePrintInverse/48x48/apps/openterm.png share/icons/HighContrastLargePrintInverse/48x48/apps/orca.png share/icons/HighContrastLargePrintInverse/48x48/apps/panel-drawer.png share/icons/HighContrastLargePrintInverse/48x48/apps/panel-force-quit.png -share/icons/HighContrastLargePrintInverse/48x48/apps/panel-notification-area.png -share/icons/HighContrastLargePrintInverse/48x48/apps/password.png share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png -share/icons/HighContrastLargePrintInverse/48x48/apps/postscript-viewer.png -share/icons/HighContrastLargePrintInverse/48x48/apps/procman.png -share/icons/HighContrastLargePrintInverse/48x48/apps/quick-lounge-applet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/realplay.png -share/icons/HighContrastLargePrintInverse/48x48/apps/screensaver.png -share/icons/HighContrastLargePrintInverse/48x48/apps/serviceconf.png -share/icons/HighContrastLargePrintInverse/48x48/apps/sound-capplet.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-accessibility.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-font.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard-shortcuts.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-locale.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-sound.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-theme.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-wallpaper.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-system-session.png +share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-system-windows.png +share/icons/HighContrastLargePrintInverse/48x48/apps/redhat-filemanager.png +share/icons/HighContrastLargePrintInverse/48x48/apps/session-properties.png +share/icons/HighContrastLargePrintInverse/48x48/apps/smc.png +share/icons/HighContrastLargePrintInverse/48x48/apps/sound-juicer.png share/icons/HighContrastLargePrintInverse/48x48/apps/star.png -share/icons/HighContrastLargePrintInverse/48x48/apps/stock_notes.png -share/icons/HighContrastLargePrintInverse/48x48/apps/stock_proxy.png -share/icons/HighContrastLargePrintInverse/48x48/apps/stock_timezone.png -share/icons/HighContrastLargePrintInverse/48x48/apps/stock_weather-storm.png -share/icons/HighContrastLargePrintInverse/48x48/apps/sun_java.png -share/icons/HighContrastLargePrintInverse/48x48/apps/web-browser.png +share/icons/HighContrastLargePrintInverse/48x48/apps/stock_help.png +share/icons/HighContrastLargePrintInverse/48x48/apps/style.png +share/icons/HighContrastLargePrintInverse/48x48/apps/susehelpcenter.png +share/icons/HighContrastLargePrintInverse/48x48/apps/system-file-manager.png +share/icons/HighContrastLargePrintInverse/48x48/apps/terminal.png +share/icons/HighContrastLargePrintInverse/48x48/apps/text-editor.png +share/icons/HighContrastLargePrintInverse/48x48/apps/utilities-terminal.png +share/icons/HighContrastLargePrintInverse/48x48/apps/volume-knob.png +share/icons/HighContrastLargePrintInverse/48x48/apps/wallpaper.png share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png -share/icons/HighContrastLargePrintInverse/48x48/apps/xsane.png +share/icons/HighContrastLargePrintInverse/48x48/apps/xfce-filemanager.png +share/icons/HighContrastLargePrintInverse/48x48/apps/xfce-terminal.png +share/icons/HighContrastLargePrintInverse/48x48/apps/xfce4-backdrop.png +share/icons/HighContrastLargePrintInverse/48x48/apps/xfce4-mixer.png +share/icons/HighContrastLargePrintInverse/48x48/apps/xfce4-session.png +share/icons/HighContrastLargePrintInverse/48x48/apps/xfce4-sound.png +share/icons/HighContrastLargePrintInverse/48x48/apps/xfwm4.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-accessories.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-development.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-engineering.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-games.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-graphics.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-internet.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-multimedia.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-office.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-other.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-science.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-system.png +share/icons/HighContrastLargePrintInverse/48x48/categories/applications-utilities.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-applications.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-control-center.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-devel.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-globe.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-graphics.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-joystick.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-multimedia.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-other.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-settings.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-system.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-util.png +share/icons/HighContrastLargePrintInverse/48x48/categories/gtk-preferences.png +share/icons/HighContrastLargePrintInverse/48x48/categories/input_devices_settings.png +share/icons/HighContrastLargePrintInverse/48x48/categories/kcontrol.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_development.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_games.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_graphics.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_multimedia.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_network.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_office.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_settings.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_system.png +share/icons/HighContrastLargePrintInverse/48x48/categories/package_utilities.png +share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-desktop-peripherals.png +share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-desktop-personal.png +share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-desktop.png +share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-other.png +share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-system-network.png +share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-system.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-accessories.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-games.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-graphics.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-internet.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-office.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-preferences.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-programming.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-sound_video.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-system_settings.png +share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-system_tools.png +share/icons/HighContrastLargePrintInverse/48x48/categories/stock_internet.png +share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-games.png +share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-graphics.png +share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-internet.png +share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-multimedia.png +share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-office.png +share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-system-settings.png +share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-utils.png +share/icons/HighContrastLargePrintInverse/48x48/categories/xfce4-settings.png share/icons/HighContrastLargePrintInverse/48x48/devices/3floppy_unmount.png share/icons/HighContrastLargePrintInverse/48x48/devices/cdrom_unmount.png share/icons/HighContrastLargePrintInverse/48x48/devices/cdwriter_unmount.png @@ -1705,6 +1818,8 @@ share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-harddisk.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-keyboard.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-ball.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-optical.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer-network.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer-new.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable-1394.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable-usb.png @@ -1739,10 +1854,14 @@ share/icons/HighContrastLargePrintInverse/48x48/devices/yast_HD.png share/icons/HighContrastLargePrintInverse/48x48/devices/yast_idetude.png share/icons/HighContrastLargePrintInverse/48x48/devices/yast_mouse.png share/icons/HighContrastLargePrintInverse/48x48/devices/yast_printer.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-default.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-desktop.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-important.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-noread.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-unreadable.png +share/icons/HighContrastLargePrintInverse/48x48/emblems/stock_mail-priority-high.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-x-executable.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/ascii.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/audio-x-generic.png @@ -1785,6 +1904,8 @@ share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-jar.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-killustrator.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lha.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lzma.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lhz.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-ms-dos-executable.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-rar.png @@ -1852,6 +1973,8 @@ share/icons/HighContrastLargePrintInverse/48x48/places/gnome-stock-trash.png share/icons/HighContrastLargePrintInverse/48x48/places/gtk-directory.icon share/icons/HighContrastLargePrintInverse/48x48/places/gtk-directory.png share/icons/HighContrastLargePrintInverse/48x48/places/gtk-network.png +share/icons/HighContrastLargePrintInverse/48x48/places/inode-directory.icon +share/icons/HighContrastLargePrintInverse/48x48/places/inode-directory.png share/icons/HighContrastLargePrintInverse/48x48/places/network-server.png share/icons/HighContrastLargePrintInverse/48x48/places/network-workgroup.png share/icons/HighContrastLargePrintInverse/48x48/places/network.png @@ -1867,6 +1990,10 @@ share/icons/HighContrastLargePrintInverse/48x48/places/user-desktop.png share/icons/HighContrastLargePrintInverse/48x48/places/user-home.png share/icons/HighContrastLargePrintInverse/48x48/places/user-trash.png share/icons/HighContrastLargePrintInverse/48x48/places/xfce-trash_empty.png +share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-high.png +share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-low.png +share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-medium.png +share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-muted.png share/icons/HighContrastLargePrintInverse/48x48/status/edittrash.png share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.icon share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.png @@ -1875,6 +2002,12 @@ share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-trash-full.png share/icons/HighContrastLargePrintInverse/48x48/status/gnome-stock-trash-full.png share/icons/HighContrastLargePrintInverse/48x48/status/stock_trash_full.png +share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-0.png +share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-max.png +share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-med.png +share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-min.png +share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-mute.png +share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume.png share/icons/HighContrastLargePrintInverse/48x48/status/trashcan_full.png share/icons/HighContrastLargePrintInverse/48x48/status/user-trash-full.png share/icons/HighContrastLargePrintInverse/48x48/status/xfce-trash_full.png @@ -1898,6 +2031,7 @@ share/icons/Mist/16x16/places/gnome-fs-smb.png share/icons/Mist/16x16/places/gnome-fs-ssh.png share/icons/Mist/16x16/places/gnome-mime-x-directory-smb-share.png share/icons/Mist/16x16/places/gtk-directory.png +share/icons/Mist/16x16/places/inode-directory.png share/icons/Mist/16x16/places/network.png share/icons/Mist/16x16/places/stock_folder.png share/icons/Mist/16x16/places/user-home.png @@ -1926,6 +2060,7 @@ share/icons/Mist/22x22/places/gnome-fs-smb.png share/icons/Mist/22x22/places/gnome-fs-ssh.png share/icons/Mist/22x22/places/gnome-mime-x-directory-smb-share.png share/icons/Mist/22x22/places/gtk-directory.png +share/icons/Mist/22x22/places/inode-directory.png share/icons/Mist/22x22/places/network.png share/icons/Mist/22x22/places/stock_folder.png share/icons/Mist/22x22/places/user-home.svg @@ -1954,6 +2089,7 @@ share/icons/Mist/24x24/places/gnome-fs-smb.png share/icons/Mist/24x24/places/gnome-fs-ssh.png share/icons/Mist/24x24/places/gnome-mime-x-directory-smb-share.png share/icons/Mist/24x24/places/gtk-directory.png +share/icons/Mist/24x24/places/inode-directory.png share/icons/Mist/24x24/places/network.png share/icons/Mist/24x24/places/stock_folder.png share/icons/Mist/24x24/places/user-home.png @@ -1982,6 +2118,7 @@ share/icons/Mist/32x32/places/gnome-fs-smb.svg share/icons/Mist/32x32/places/gnome-fs-ssh.svg share/icons/Mist/32x32/places/gnome-mime-x-directory-smb-share.svg share/icons/Mist/32x32/places/gtk-directory.svg +share/icons/Mist/32x32/places/inode-directory.svg share/icons/Mist/32x32/places/network.svg share/icons/Mist/32x32/places/stock_folder.svg share/icons/Mist/32x32/places/user-home.svg @@ -2011,6 +2148,7 @@ share/icons/Mist/scalable/places/gnome-fs-smb.svg share/icons/Mist/scalable/places/gnome-fs-ssh.svg share/icons/Mist/scalable/places/gnome-mime-x-directory-smb-share.svg share/icons/Mist/scalable/places/gtk-directory.svg +share/icons/Mist/scalable/places/inode-directory.svg share/icons/Mist/scalable/places/network.svg share/icons/Mist/scalable/places/stock_folder.svg share/icons/Mist/scalable/places/user-home.svg @@ -2088,7 +2226,7 @@ share/locale/sk/LC_MESSAGES/gnome-themes.mo share/locale/sl/LC_MESSAGES/gnome-themes.mo share/locale/sq/LC_MESSAGES/gnome-themes.mo share/locale/sr/LC_MESSAGES/gnome-themes.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-themes.mo +share/locale/sr@latin/LC_MESSAGES/gnome-themes.mo share/locale/sv/LC_MESSAGES/gnome-themes.mo share/locale/ta/LC_MESSAGES/gnome-themes.mo share/locale/th/LC_MESSAGES/gnome-themes.mo @@ -2579,18 +2717,23 @@ share/themes/Simple/gtk-2.0/gtkrc @dirrm share/icons/HighContrastLargePrintInverse/48x48/mimetypes @dirrm share/icons/HighContrastLargePrintInverse/48x48/emblems @dirrm share/icons/HighContrastLargePrintInverse/48x48/devices +@dirrm share/icons/HighContrastLargePrintInverse/48x48/categories @dirrm share/icons/HighContrastLargePrintInverse/48x48/apps +@dirrm share/icons/HighContrastLargePrintInverse/48x48/actions @dirrm share/icons/HighContrastLargePrintInverse/48x48 -@dirrm share/icons/HighContrastLargePrintInverse/36x36/apps +@dirrm share/icons/HighContrastLargePrintInverse/36x36/animations @dirrm share/icons/HighContrastLargePrintInverse/36x36 @dirrm share/icons/HighContrastLargePrintInverse +@dirrm share/icons/HighContrastLargePrint/48x48/status +@dirrm share/icons/HighContrastLargePrint/48x48/places @dirrm share/icons/HighContrastLargePrint/48x48/mimetypes -@dirrm share/icons/HighContrastLargePrint/48x48/filesystems @dirrm share/icons/HighContrastLargePrint/48x48/emblems @dirrm share/icons/HighContrastLargePrint/48x48/devices +@dirrm share/icons/HighContrastLargePrint/48x48/categories @dirrm share/icons/HighContrastLargePrint/48x48/apps +@dirrm share/icons/HighContrastLargePrint/48x48/actions @dirrm share/icons/HighContrastLargePrint/48x48 -@dirrm share/icons/HighContrastLargePrint/36x36/apps +@dirrm share/icons/HighContrastLargePrint/36x36/animations @dirrm share/icons/HighContrastLargePrint/36x36 @dirrm share/icons/HighContrastLargePrint @dirrm share/icons/HighContrastInverse @@ -2636,6 +2779,8 @@ share/themes/Simple/gtk-2.0/gtkrc @dirrmtry share/locale/xh @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index d86e0ca9b8b3..9c98f0049882 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.59 2008/03/18 12:15:18 ahze Exp $ +# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.69 2009/01/10 01:59:22 mezz Exp $ # PORTNAME= gtk-engines2 -PORTVERSION= 2.14.3 +PORTVERSION= 2.16.1 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -15,14 +15,14 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= Theme engine for the Gtk+-2.0 toolkit +COMMENT= Theme engine for the GTK+-2.0 toolkit CONFLICTS= gtk-smooth-engine-[0-9]* clearlooks-[0-9]* USE_GMAKE= yes USE_BZIP2= yes USE_GNOME= gnomehack gtk20 intlhack ltasneededhack -#USE_GETTEXT= yes +USE_GETTEXT= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" @@ -35,4 +35,7 @@ OPTIONS= ANIMATION "Enable experimental animated progressbars" off CONFIGURE_ARGS+= --enable-animation .endif +post-install: + @(cd ${WRKSRC}/po && ${GMAKE} install) + .include <bsd.port.post.mk> diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index 4b5a8075e998..a4ebdd5b8ad0 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk-engines-2.14.3.tar.bz2) = be92ddda833defb7296a850331c03d05 -SHA256 (gnome2/gtk-engines-2.14.3.tar.bz2) = ee5af9003eb156859b5caf7f75e3e90139974db7b8387bba89e04714a29e096f -SIZE (gnome2/gtk-engines-2.14.3.tar.bz2) = 674620 +MD5 (gnome2/gtk-engines-2.16.1.tar.bz2) = acf5a9792507d0cb3b29a3ce6333d003 +SHA256 (gnome2/gtk-engines-2.16.1.tar.bz2) = 5ce5bd23df9c26444c92d415935622d5f1f7c1c9669ec5165607de05125dc2c1 +SIZE (gnome2/gtk-engines-2.16.1.tar.bz2) = 588253 diff --git a/x11-themes/gtk-engines2/pkg-descr b/x11-themes/gtk-engines2/pkg-descr index d1b5370dcea0..e787f789bb62 100644 --- a/x11-themes/gtk-engines2/pkg-descr +++ b/x11-themes/gtk-engines2/pkg-descr @@ -1,3 +1,3 @@ -Theme engine for the Gtk+-2.0 toolkit. +Theme engine for the gtk+-2.0 toolkit. WWW: http://www.gtk.org/ diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index d6c9ec5a9e5c..963a26e62de9 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -19,9 +19,6 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmist.so lib/gtk-2.0/%%GTK2_VERSION%%/engines/libredmond95.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libredmond95.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libredmond95.so -lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.a -lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.la -lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.so lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.so @@ -33,8 +30,61 @@ share/gtk-engines/hcengine.xml share/gtk-engines/industrial.xml share/gtk-engines/mist.xml share/gtk-engines/redmond95.xml -share/gtk-engines/smooth.xml share/gtk-engines/thinice.xml +share/locale/ar/LC_MESSAGES/gtk-engines.mo +share/locale/be@latin/LC_MESSAGES/gtk-engines.mo +share/locale/bg/LC_MESSAGES/gtk-engines.mo +share/locale/bn_IN/LC_MESSAGES/gtk-engines.mo +share/locale/ca/LC_MESSAGES/gtk-engines.mo +share/locale/cs/LC_MESSAGES/gtk-engines.mo +share/locale/da/LC_MESSAGES/gtk-engines.mo +share/locale/de/LC_MESSAGES/gtk-engines.mo +share/locale/dz/LC_MESSAGES/gtk-engines.mo +share/locale/el/LC_MESSAGES/gtk-engines.mo +share/locale/en_GB/LC_MESSAGES/gtk-engines.mo +share/locale/es/LC_MESSAGES/gtk-engines.mo +share/locale/et/LC_MESSAGES/gtk-engines.mo +share/locale/eu/LC_MESSAGES/gtk-engines.mo +share/locale/fi/LC_MESSAGES/gtk-engines.mo +share/locale/fr/LC_MESSAGES/gtk-engines.mo +share/locale/fur/LC_MESSAGES/gtk-engines.mo +share/locale/gl/LC_MESSAGES/gtk-engines.mo +share/locale/gu/LC_MESSAGES/gtk-engines.mo +share/locale/he/LC_MESSAGES/gtk-engines.mo +share/locale/hi/LC_MESSAGES/gtk-engines.mo +share/locale/hu/LC_MESSAGES/gtk-engines.mo +share/locale/it/LC_MESSAGES/gtk-engines.mo +share/locale/ja/LC_MESSAGES/gtk-engines.mo +share/locale/ko/LC_MESSAGES/gtk-engines.mo +share/locale/lt/LC_MESSAGES/gtk-engines.mo +share/locale/mk/LC_MESSAGES/gtk-engines.mo +share/locale/ml/LC_MESSAGES/gtk-engines.mo +share/locale/mr/LC_MESSAGES/gtk-engines.mo +share/locale/nb/LC_MESSAGES/gtk-engines.mo +share/locale/nl/LC_MESSAGES/gtk-engines.mo +share/locale/nn/LC_MESSAGES/gtk-engines.mo +share/locale/oc/LC_MESSAGES/gtk-engines.mo +share/locale/or/LC_MESSAGES/gtk-engines.mo +share/locale/pa/LC_MESSAGES/gtk-engines.mo +share/locale/pl/LC_MESSAGES/gtk-engines.mo +share/locale/pt/LC_MESSAGES/gtk-engines.mo +share/locale/pt_BR/LC_MESSAGES/gtk-engines.mo +share/locale/ru/LC_MESSAGES/gtk-engines.mo +share/locale/si/LC_MESSAGES/gtk-engines.mo +share/locale/sl/LC_MESSAGES/gtk-engines.mo +share/locale/sq/LC_MESSAGES/gtk-engines.mo +share/locale/sr/LC_MESSAGES/gtk-engines.mo +share/locale/sr@latin/LC_MESSAGES/gtk-engines.mo +share/locale/sv/LC_MESSAGES/gtk-engines.mo +share/locale/ta/LC_MESSAGES/gtk-engines.mo +share/locale/te/LC_MESSAGES/gtk-engines.mo +share/locale/th/LC_MESSAGES/gtk-engines.mo +share/locale/tr/LC_MESSAGES/gtk-engines.mo +share/locale/uk/LC_MESSAGES/gtk-engines.mo +share/locale/vi/LC_MESSAGES/gtk-engines.mo +share/locale/zh_CN/LC_MESSAGES/gtk-engines.mo +share/locale/zh_HK/LC_MESSAGES/gtk-engines.mo +share/locale/zh_TW/LC_MESSAGES/gtk-engines.mo share/themes/Clearlooks/gtk-2.0/gtkrc share/themes/Crux/gtk-2.0/gtkrc share/themes/Industrial/gtk-2.0/gtkrc @@ -55,3 +105,23 @@ share/themes/ThinIce/gtk-2.0/gtkrc @dirrmtry share/themes/Clearlooks @dirrmtry share/themes @dirrm share/gtk-engines +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@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/si/LC_MESSAGES +@dirrmtry share/locale/si +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/x11-themes/icon-naming-utils/Makefile b/x11-themes/icon-naming-utils/Makefile index 88b6ce4eed90..9793114295ec 100644 --- a/x11-themes/icon-naming-utils/Makefile +++ b/x11-themes/icon-naming-utils/Makefile @@ -6,7 +6,7 @@ # PORTNAME= icon-naming-utils -PORTVERSION= 0.8.6 +PORTVERSION= 0.8.7 CATEGORIES= x11-themes MASTER_SITES= http://tango.freedesktop.org/releases/ @@ -19,7 +19,7 @@ RUN_DEPENDS= ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple USE_PERL5= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig gnometarget +USE_GNOME= gnomehack pkgconfig pre-configure: @ ${REINPLACE_CMD} -e "s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g" ${WRKSRC}/Makefile.in diff --git a/x11-themes/icon-naming-utils/distinfo b/x11-themes/icon-naming-utils/distinfo index 8123acb63972..0aca91081c6f 100644 --- a/x11-themes/icon-naming-utils/distinfo +++ b/x11-themes/icon-naming-utils/distinfo @@ -1,3 +1,3 @@ -MD5 (icon-naming-utils-0.8.6.tar.gz) = 22bd13295d42ff886f6ea355d00e036b -SHA256 (icon-naming-utils-0.8.6.tar.gz) = 85a5d8f7d189df307e51375f5575aaecb8574003c5756620b28a469f133f1102 -SIZE (icon-naming-utils-0.8.6.tar.gz) = 69522 +MD5 (icon-naming-utils-0.8.7.tar.gz) = 4abe604721ce2ccb67f451aa7ceb44d6 +SHA256 (icon-naming-utils-0.8.7.tar.gz) = 1cb49ce6a04626939893a447da696f20003903d61bd80c6d74d29dd79ca340d2 +SIZE (icon-naming-utils-0.8.7.tar.gz) = 69675 diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 04f0be65c36e..ae788a866fdd 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -180,6 +180,7 @@ SUBDIR += p5-Tk-TableMatrix SUBDIR += pango SUBDIR += pango-reference + SUBDIR += pangomm SUBDIR += pangoxsl SUBDIR += paragui SUBDIR += paragui-devel diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile index 1c473cf83aab..5cb8868d2a2b 100644 --- a/x11-toolkits/bakery/Makefile +++ b/x11-toolkits/bakery/Makefile @@ -3,12 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/bakery/Makefile,v 1.11 2008/03/23 06:57:57 marcus Exp $ +# $MCom: ports/x11-toolkits/bakery/Makefile,v 1.16 2009/01/09 22:07:11 kwm Exp $ # PORTNAME= bakery -PORTVERSION= 2.4.4 -PORTREVISION= 1 +PORTVERSION= 2.6.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME @@ -20,7 +19,7 @@ LIB_DEPENDS= gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \ gnomevfsmm-2.6:${PORTSDIR}/devel/gnome-vfsmm \ xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 -USE_GNOME= gnomehack gnomeprefix gnometarget intlhack ltverhack +USE_GNOME= gnomehack gnomeprefix intlhack ltverhack USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes @@ -29,7 +28,7 @@ USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.4" API_VERSION="2.4" +PLIST_SUB= VERSION="2.6" API_VERSION="2.6" post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \ diff --git a/x11-toolkits/bakery/distinfo b/x11-toolkits/bakery/distinfo index dadb0ad3f19c..5cfa1968f748 100644 --- a/x11-toolkits/bakery/distinfo +++ b/x11-toolkits/bakery/distinfo @@ -1,3 +1,3 @@ -MD5 (bakery-2.4.4.tar.bz2) = c80b4cf39dc8aa65bb9302b84f084b93 -SHA256 (bakery-2.4.4.tar.bz2) = 04fccb599d28884214da9a6ed71e195141baa4e48da09c1f80fc2ec5440f02b9 -SIZE (bakery-2.4.4.tar.bz2) = 382214 +MD5 (bakery-2.6.2.tar.bz2) = 749586e2f9dfc381a16c4f7cc56c03f1 +SHA256 (bakery-2.6.2.tar.bz2) = 8617eb028f72c2f0c426950c5b7b06a369212ae8f373ef4aa04dfd1504b9eb53 +SIZE (bakery-2.6.2.tar.bz2) = 1190518 diff --git a/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in b/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in deleted file mode 100644 index 61609f1dea58..000000000000 --- a/x11-toolkits/bakery/files/patch-bakery-2.4.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- bakery-2.4.pc.in.orig 2007-12-02 01:54:38.000000000 -0500 -+++ bakery-2.4.pc.in 2007-12-02 01:54:46.000000000 -0500 -@@ -8,5 +8,5 @@ Description: C++ Application Framework f - Requires: gtkmm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.6.0 gnome-vfsmm-2.6 >= 2.6.0 - Version: @VERSION@ - Libs: -L${libdir} -lbakery-2.4 --Cflags: -I${includedir}/bakery-2.4 -I${libdir}/bakery-2.4/include -+Cflags: -I${includedir}/bakery-2.4 - diff --git a/x11-toolkits/bakery/files/patch-bakery-2.6.pc.in b/x11-toolkits/bakery/files/patch-bakery-2.6.pc.in new file mode 100644 index 000000000000..eaeaad3550fa --- /dev/null +++ b/x11-toolkits/bakery/files/patch-bakery-2.6.pc.in @@ -0,0 +1,9 @@ +--- bakery-2.6.pc.in.orig 2008-03-18 10:47:08.000000000 +0100 ++++ bakery-2.6.pc.in 2008-08-08 02:10:39.000000000 +0200 +@@ -8,5 +8,5 @@ Description: C++ Application Framework f + Requires: gtkmm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.0 libglademm-2.4 >= 2.4.0 libxml++-2.6 >= 2.6.0 giomm-2.4 >= 2.16.0 + Version: @VERSION@ + Libs: -L${libdir} -lbakery-2.6 +-Cflags: -I${includedir}/bakery-2.6 -I${libdir}/bakery-2.6/include ++Cflags: -I${includedir}/bakery-2.6 + diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in index 90f78eb92bdd..39cb5057a688 100644 --- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in +++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in @@ -1,15 +1,15 @@ ---- bakery/Makefile.in.orig 2008-04-07 16:18:10.000000000 -0500 -+++ bakery/Makefile.in 2008-04-07 16:19:12.000000000 -0500 -@@ -284,10 +284,10 @@ +--- bakery/Makefile.in.orig 2008-08-08 02:12:58.000000000 +0200 ++++ bakery/Makefile.in 2008-08-08 02:13:37.000000000 +0200 +@@ -287,10 +287,10 @@ libbakery_2_6_la_LIBADD = App/libbakery_ View/libbakery_view.la \ $(BAKERY_LIBS) --libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE) -no-undefined -+libbakery_2_4_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +-libbakery_2_6_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -release $(GENERIC_RELEASE) -no-undefined ++libbakery_2_6_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) # Install the headers: --library_configdir = $(libdir)/bakery-2.4/include -+library_configdir = $(includedir)/bakery-2.4 +-library_configdir = $(libdir)/bakery-2.6/include ++library_configdir = $(includedir)/bakery-2.6 library_config_DATA = bakeryconfig.h all: bakeryconfig.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist index b8d3c54424e6..84d82572432e 100644 --- a/x11-toolkits/bakery/pkg-plist +++ b/x11-toolkits/bakery/pkg-plist @@ -27,12 +27,14 @@ libdata/pkgconfig/bakery-%%API_VERSION%%.pc share/locale/ar/LC_MESSAGES/bakery.mo share/locale/bg/LC_MESSAGES/bakery.mo share/locale/ca/LC_MESSAGES/bakery.mo +share/locale/da/LC_MESSAGES/bakery.mo share/locale/de/LC_MESSAGES/bakery.mo share/locale/dz/LC_MESSAGES/bakery.mo share/locale/el/LC_MESSAGES/bakery.mo share/locale/en_CA/LC_MESSAGES/bakery.mo share/locale/en_GB/LC_MESSAGES/bakery.mo share/locale/es/LC_MESSAGES/bakery.mo +share/locale/eu/LC_MESSAGES/bakery.mo share/locale/fi/LC_MESSAGES/bakery.mo share/locale/fr/LC_MESSAGES/bakery.mo share/locale/gl/LC_MESSAGES/bakery.mo diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index c0f3f8356d1d..fb6e22c418a5 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -3,12 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/eel/Makefile,v 1.67 2008/03/10 21:38:32 mezz Exp $ +# $MCom: ports/x11-toolkits/eel/Makefile,v 1.80 2008/10/20 21:37:09 mezz Exp $ # PORTNAME= eel -PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTVERSION= 2.24.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XORG= xrender GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gail gnomedesktop ltverhack intlhack +USE_GNOME= gnomeprefix gnomehack gnomedesktop ltverhack intlhack USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-static diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo index da75f3eacd4d..aa469fcbd173 100644 --- a/x11-toolkits/eel/distinfo +++ b/x11-toolkits/eel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eel-2.22.2.tar.bz2) = f0dc46f4bc6a772da9e149c0018a8b09 -SHA256 (gnome2/eel-2.22.2.tar.bz2) = e91e576ed22e5ba9a930d4292e3dbec4fe4ec7276029d82188cc91db117e21d4 -SIZE (gnome2/eel-2.22.2.tar.bz2) = 597895 +MD5 (gnome2/eel-2.24.1.tar.bz2) = b591df36af8f1b23dd175be33b5de073 +SHA256 (gnome2/eel-2.24.1.tar.bz2) = 32cde7b589b49f439d82f76b6456983d36de7d20688f7c6ac2fdae4ce354e629 +SIZE (gnome2/eel-2.24.1.tar.bz2) = 596529 diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index 8316a352c40a..628987f36aab 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -1,6 +1,5 @@ include/eel-2/eel/eel-accessibility.h include/eel-2/eel/eel-alert-dialog.h -include/eel-2/eel/eel-app-launch-context.h include/eel-2/eel/eel-art-extensions.h include/eel-2/eel/eel-art-gtk-extensions.h include/eel-2/eel/eel-background-box.h @@ -102,6 +101,7 @@ share/locale/oc/LC_MESSAGES/eel-2.0.mo share/locale/or/LC_MESSAGES/eel-2.0.mo share/locale/pa/LC_MESSAGES/eel-2.0.mo share/locale/pl/LC_MESSAGES/eel-2.0.mo +share/locale/ps/LC_MESSAGES/eel-2.0.mo share/locale/pt/LC_MESSAGES/eel-2.0.mo share/locale/pt_BR/LC_MESSAGES/eel-2.0.mo share/locale/ro/LC_MESSAGES/eel-2.0.mo @@ -112,7 +112,7 @@ share/locale/sk/LC_MESSAGES/eel-2.0.mo share/locale/sl/LC_MESSAGES/eel-2.0.mo share/locale/sq/LC_MESSAGES/eel-2.0.mo share/locale/sr/LC_MESSAGES/eel-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/eel-2.0.mo +share/locale/sr@latin/LC_MESSAGES/eel-2.0.mo share/locale/sv/LC_MESSAGES/eel-2.0.mo share/locale/ta/LC_MESSAGES/eel-2.0.mo share/locale/th/LC_MESSAGES/eel-2.0.mo @@ -133,10 +133,14 @@ share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo @dirrmtry share/locale/xh @dirrmtry share/locale/ug/LC_MESSAGES @dirrmtry share/locale/ug +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile index 3506383ad7c3..70aed9a09a6d 100644 --- a/x11-toolkits/gdl/Makefile +++ b/x11-toolkits/gdl/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.15 2007/09/09 22:45:27 mezz Exp $ +# $MCom: ports/x11-toolkits/gdl/Makefile,v 1.18 2008/09/22 18:02:25 marcus Exp $ # PORTNAME= gdl -PORTREVISION= 2 -PORTVERSION= 0.7.11 +PORTVERSION= 2.24.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo index 389a3aa5b9c7..482befef9a78 100644 --- a/x11-toolkits/gdl/distinfo +++ b/x11-toolkits/gdl/distinfo @@ -1,3 +1,3 @@ -MD5 (gdl-0.7.11.tar.bz2) = 74f529cc2623376ee793be65439f54d6 -SHA256 (gdl-0.7.11.tar.bz2) = 98c97d185acec2b80769aaaa6e4bde938514e8cd5ff9df2956aab93b6584abde -SIZE (gdl-0.7.11.tar.bz2) = 521832 +MD5 (gdl-2.24.0.tar.bz2) = 1d5cd4af1f4041394169d643316646bf +SHA256 (gdl-2.24.0.tar.bz2) = c175ac5faa1c3e27464f71f80c632bb3a960aa03ccd748736aead20adc31a112 +SIZE (gdl-2.24.0.tar.bz2) = 551420 diff --git a/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c b/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c deleted file mode 100644 index bcfde3afce14..000000000000 --- a/x11-toolkits/gdl/files/patch-gdl__gdl-icons.c +++ /dev/null @@ -1,17 +0,0 @@ ---- gdl/gdl-icons.c.orig Tue May 24 16:37:14 2005 -+++ gdl/gdl-icons.c Tue May 24 16:37:38 2005 -@@ -202,12 +202,13 @@ - { - GdkPixbuf *pixbuf; - char *icon_name; -+ GdlIconsPrivate *priv; - - g_return_val_if_fail (icons != NULL, NULL); - g_return_val_if_fail (GDL_IS_ICONS (icons), NULL); - g_return_val_if_fail (mime_type != NULL, NULL); - -- GdlIconsPrivate *priv = GDL_ICONS_GET_PRIVATE (icons); -+ priv = GDL_ICONS_GET_PRIVATE (icons); - - pixbuf = g_hash_table_lookup (priv->icons, mime_type); - if (pixbuf != NULL) { diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist index 36561f399cb0..4411d89a5de2 100644 --- a/x11-toolkits/gdl/pkg-plist +++ b/x11-toolkits/gdl/pkg-plist @@ -9,7 +9,6 @@ include/libgdl-1.0/gdl/gdl-dock-paned.h include/libgdl-1.0/gdl/gdl-dock-placeholder.h include/libgdl-1.0/gdl/gdl-dock-tablabel.h include/libgdl-1.0/gdl/gdl-dock.h -include/libgdl-1.0/gdl/gdl-icons.h include/libgdl-1.0/gdl/gdl-stock-icons.h include/libgdl-1.0/gdl/gdl-stock.h include/libgdl-1.0/gdl/gdl-switcher.h @@ -19,11 +18,7 @@ include/libgdl-1.0/gdl/libgdltypebuiltins.h lib/libgdl-1.la lib/libgdl-1.so lib/libgdl-1.so.0 -lib/libgdl-gnome-1.la -lib/libgdl-gnome-1.so -lib/libgdl-gnome-1.so.0 libdata/pkgconfig/gdl-1.0.pc -libdata/pkgconfig/gdl-gnome-1.0.pc %%DOCSDIR%%/GdlComboButton.html %%DOCSDIR%%/GdlDock.html %%DOCSDIR%%/GdlDockBar.html @@ -35,7 +30,6 @@ libdata/pkgconfig/gdl-gnome-1.0.pc %%DOCSDIR%%/GdlDockPaned.html %%DOCSDIR%%/GdlDockPlaceholder.html %%DOCSDIR%%/GdlDockTablabel.html -%%DOCSDIR%%/GdlIcons.html %%DOCSDIR%%/GdlSwitcher.html %%DOCSDIR%%/gdl-gdl-stock.html %%DOCSDIR%%/gdl-gdl-tools.html @@ -63,11 +57,13 @@ share/locale/el/LC_MESSAGES/gdl-1.mo share/locale/en_CA/LC_MESSAGES/gdl-1.mo share/locale/en_GB/LC_MESSAGES/gdl-1.mo share/locale/es/LC_MESSAGES/gdl-1.mo +share/locale/et/LC_MESSAGES/gdl-1.mo share/locale/eu/LC_MESSAGES/gdl-1.mo share/locale/fi/LC_MESSAGES/gdl-1.mo share/locale/fr/LC_MESSAGES/gdl-1.mo share/locale/ga/LC_MESSAGES/gdl-1.mo share/locale/gl/LC_MESSAGES/gdl-1.mo +share/locale/he/LC_MESSAGES/gdl-1.mo share/locale/hi/LC_MESSAGES/gdl-1.mo share/locale/hr/LC_MESSAGES/gdl-1.mo share/locale/hu/LC_MESSAGES/gdl-1.mo @@ -78,12 +74,14 @@ share/locale/lt/LC_MESSAGES/gdl-1.mo share/locale/lv/LC_MESSAGES/gdl-1.mo share/locale/mk/LC_MESSAGES/gdl-1.mo share/locale/ml/LC_MESSAGES/gdl-1.mo +share/locale/mr/LC_MESSAGES/gdl-1.mo share/locale/nb/LC_MESSAGES/gdl-1.mo share/locale/ne/LC_MESSAGES/gdl-1.mo share/locale/nl/LC_MESSAGES/gdl-1.mo share/locale/oc/LC_MESSAGES/gdl-1.mo share/locale/pa/LC_MESSAGES/gdl-1.mo share/locale/pl/LC_MESSAGES/gdl-1.mo +share/locale/ps/LC_MESSAGES/gdl-1.mo share/locale/pt/LC_MESSAGES/gdl-1.mo share/locale/pt_BR/LC_MESSAGES/gdl-1.mo share/locale/ru/LC_MESSAGES/gdl-1.mo @@ -93,23 +91,33 @@ share/locale/sk/LC_MESSAGES/gdl-1.mo share/locale/sl/LC_MESSAGES/gdl-1.mo share/locale/sq/LC_MESSAGES/gdl-1.mo share/locale/sr/LC_MESSAGES/gdl-1.mo -share/locale/sr@Latn/LC_MESSAGES/gdl-1.mo +share/locale/sr@latin/LC_MESSAGES/gdl-1.mo share/locale/sv/LC_MESSAGES/gdl-1.mo share/locale/th/LC_MESSAGES/gdl-1.mo share/locale/tr/LC_MESSAGES/gdl-1.mo share/locale/uk/LC_MESSAGES/gdl-1.mo share/locale/vi/LC_MESSAGES/gdl-1.mo share/locale/zh_CN/LC_MESSAGES/gdl-1.mo +share/locale/zh_HK/LC_MESSAGES/gdl-1.mo +share/locale/zh_TW/LC_MESSAGES/gdl-1.mo @dirrm share/gdl/glade @dirrm share/gdl @dirrm %%DOCSDIR%% @dirrm include/libgdl-1.0/gdl @dirrm include/libgdl-1.0 +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 4d9eff1c82f0..b547bb10d663 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/gtk20/Makefile,v 1.11 2007/12/04 21:45:14 mezz Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.147 2009/01/08 17:38:06 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.12.11 -PORTREVISION?= 1 +PORTVERSION= 2.14.7 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -29,10 +29,11 @@ LATEST_LINK= gtk20 .if !defined(REFERENCE_PORT) -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg -RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + jasper.4:${PORTSDIR}/graphics/jasper +RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_GMAKE= yes @@ -76,8 +77,6 @@ post-patch: ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/gtk/xdgmime/xdgmime.c # GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser) @${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \ s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \ diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 69efc41c7e01..a7d8aa722018 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.12.11.tar.bz2) = f7aab88e856a813386f797aade5867ad -SHA256 (gnome2/gtk+-2.12.11.tar.bz2) = c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9 -SIZE (gnome2/gtk+-2.12.11.tar.bz2) = 16232428 +MD5 (gnome2/gtk+-2.14.7.tar.bz2) = fb1614d4b2adba7b078e2e799b5db604 +SHA256 (gnome2/gtk+-2.14.7.tar.bz2) = e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14 +SIZE (gnome2/gtk+-2.14.7.tar.bz2) = 17475873 diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai index a04d08ef58b3..a7c07057c598 100644 --- a/x11-toolkits/gtk20/files/patch-ai +++ b/x11-toolkits/gtk20/files/patch-ai @@ -1,11 +1,11 @@ ---- docs/reference/Makefile.in.orig Fri Oct 24 23:38:06 2003 -+++ docs/reference/Makefile.in Fri Oct 24 23:48:00 2003 -@@ -286,7 +286,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- docs/reference/Makefile.in.orig 2008-02-23 10:25:17.000000000 -0500 ++++ docs/reference/Makefile.in 2008-02-23 10:26:36.000000000 -0500 +@@ -372,7 +372,7 @@ + && DISPLAY=:$$XID && export DISPLAY --SUBDIRS = gdk-pixbuf gdk gtk -+SUBDIRS = #gdk-pixbuf gdk gtk + +-SUBDIRS = gdk-pixbuf gdk gtk libgail-util ++SUBDIRS = # gdk-pixbuf gdk gtk libgail-util subdir = docs/reference + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak index af39120b2088..7f8e0eb0c02d 100644 --- a/x11-toolkits/gtk20/files/patch-ak +++ b/x11-toolkits/gtk20/files/patch-ak @@ -1,7 +1,3 @@ - -$FreeBSD$ - $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.8 2007/12/01 05:56:33 marcus Exp $ - --- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002 +++ gdk/Makefile.in Thu Feb 14 12:45:37 2002 @@ -315,7 +315,7 @@ diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h new file mode 100644 index 000000000000..c687dec4009b --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h @@ -0,0 +1,13 @@ +--- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400 ++++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400 +@@ -29,7 +29,9 @@ + #ifndef __GTK_SIGNAL_H__ + #define __GTK_SIGNAL_H__ + +-#include <gtk/gtk.h> ++#include <gtk/gtkenums.h> ++#include <gtk/gtktypeutils.h> ++#include <gtk/gtkobject.h> + #include <gtk/gtkmarshal.h> + + G_BEGIN_DECLS diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c deleted file mode 100644 index e0fd02d4fbac..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 -+++ gtk/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 -@@ -204,7 +204,7 @@ - - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "/usr/local/share/"; - - ptr = xdg_data_dirs; - diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h deleted file mode 100644 index b64106809ef6..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h +++ /dev/null @@ -1,12 +0,0 @@ ---- gtk/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400 -+++ gtk/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400 -@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach - #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) - #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) - #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) -+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) - - #endif - diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 99b4f04150ac..f916fc6fda4f 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -7,6 +7,10 @@ bin/gtk-update-icon-cache etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules etc/gtk-2.0/im-multipress.conf +include/gail-1.0/gail/gailwidget.h +include/gail-1.0/libgail-util/gail-util.h +include/gail-1.0/libgail-util/gailmisc.h +include/gail-1.0/libgail-util/gailtextutil.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h @@ -21,7 +25,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h -include/gtk-2.0/gdk/gdkalias.h +include/gtk-2.0/gdk/gdkapplaunchcontext.h include/gtk-2.0/gdk/gdkcairo.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h @@ -48,6 +52,7 @@ include/gtk-2.0/gdk/gdkrgb.h include/gtk-2.0/gdk/gdkscreen.h include/gtk-2.0/gdk/gdkselection.h include/gtk-2.0/gdk/gdkspawn.h +include/gtk-2.0/gdk/gdktestutils.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h @@ -114,7 +119,6 @@ include/gtk-2.0/gtk/gtkfilechooserdialog.h include/gtk-2.0/gtk/gtkfilechooserwidget.h include/gtk-2.0/gtk/gtkfilefilter.h include/gtk-2.0/gtk/gtkfilesel.h -include/gtk-2.0/gtk/gtkfilesystem.h include/gtk-2.0/gtk/gtkfixed.h include/gtk-2.0/gtk/gtkfontbutton.h include/gtk-2.0/gtk/gtkfontsel.h @@ -129,6 +133,7 @@ include/gtk-2.0/gtk/gtkhruler.h include/gtk-2.0/gtk/gtkhscale.h include/gtk-2.0/gtk/gtkhscrollbar.h include/gtk-2.0/gtk/gtkhseparator.h +include/gtk-2.0/gtk/gtkhsv.h include/gtk-2.0/gtk/gtkiconfactory.h include/gtk-2.0/gtk/gtkicontheme.h include/gtk-2.0/gtk/gtkiconview.h @@ -158,6 +163,7 @@ include/gtk-2.0/gtk/gtkmenutoolbutton.h include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h include/gtk-2.0/gtk/gtkmodules.h +include/gtk-2.0/gtk/gtkmountoperation.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h @@ -198,6 +204,7 @@ include/gtk-2.0/gtk/gtkseparator.h include/gtk-2.0/gtk/gtkseparatormenuitem.h include/gtk-2.0/gtk/gtkseparatortoolitem.h include/gtk-2.0/gtk/gtksettings.h +include/gtk-2.0/gtk/gtkshow.h include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksizegroup.h include/gtk-2.0/gtk/gtksocket.h @@ -208,6 +215,7 @@ include/gtk-2.0/gtk/gtkstock.h include/gtk-2.0/gtk/gtkstyle.h include/gtk-2.0/gtk/gtktable.h include/gtk-2.0/gtk/gtktearoffmenuitem.h +include/gtk-2.0/gtk/gtktestutils.h include/gtk-2.0/gtk/gtktext.h include/gtk-2.0/gtk/gtktextbuffer.h include/gtk-2.0/gtk/gtktextbufferrichtext.h @@ -226,6 +234,7 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktoolbutton.h include/gtk-2.0/gtk/gtktoolitem.h +include/gtk-2.0/gtk/gtktoolshell.h include/gtk-2.0/gtk/gtktooltip.h include/gtk-2.0/gtk/gtktooltips.h include/gtk-2.0/gtk/gtktree.h @@ -258,6 +267,7 @@ include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h include/gtk-unix-print-2.0/gtk/gtkprinter.h include/gtk-unix-print-2.0/gtk/gtkprintjob.h include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h +include/gtk-unix-print-2.0/gtk/gtkunixprint.h lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so @@ -303,9 +313,15 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so @@ -345,6 +361,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so +lib/gtk-2.0/modules/libferret.a +lib/gtk-2.0/modules/libferret.la +lib/gtk-2.0/modules/libferret.so +lib/gtk-2.0/modules/libgail.a +lib/gtk-2.0/modules/libgail.la +lib/gtk-2.0/modules/libgail.so +lib/libgailutil.a +lib/libgailutil.la +lib/libgailutil.so +lib/libgailutil.so.18 lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.la lib/libgdk-x11-2.0.so @@ -361,6 +387,7 @@ lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.la lib/libgtk-x11-2.0.so lib/libgtk-x11-2.0.so.0 +libdata/pkgconfig/gail.pc libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -424,6 +451,8 @@ share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/as/LC_MESSAGES/gtk20-properties.mo share/locale/as/LC_MESSAGES/gtk20.mo +share/locale/ast/LC_MESSAGES/gtk20-properties.mo +share/locale/ast/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo share/locale/az/LC_MESSAGES/gtk20.mo share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo @@ -518,6 +547,8 @@ share/locale/lt/LC_MESSAGES/gtk20-properties.mo share/locale/lt/LC_MESSAGES/gtk20.mo share/locale/lv/LC_MESSAGES/gtk20-properties.mo share/locale/lv/LC_MESSAGES/gtk20.mo +share/locale/mai/LC_MESSAGES/gtk20-properties.mo +share/locale/mai/LC_MESSAGES/gtk20.mo share/locale/mi/LC_MESSAGES/gtk20-properties.mo share/locale/mi/LC_MESSAGES/gtk20.mo share/locale/mk/LC_MESSAGES/gtk20-properties.mo @@ -548,6 +579,8 @@ share/locale/pa/LC_MESSAGES/gtk20-properties.mo share/locale/pa/LC_MESSAGES/gtk20.mo share/locale/pl/LC_MESSAGES/gtk20-properties.mo share/locale/pl/LC_MESSAGES/gtk20.mo +share/locale/ps/LC_MESSAGES/gtk20-properties.mo +share/locale/ps/LC_MESSAGES/gtk20.mo share/locale/pt/LC_MESSAGES/gtk20-properties.mo share/locale/pt/LC_MESSAGES/gtk20.mo share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo @@ -568,10 +601,10 @@ share/locale/sq/LC_MESSAGES/gtk20-properties.mo share/locale/sq/LC_MESSAGES/gtk20.mo share/locale/sr/LC_MESSAGES/gtk20-properties.mo share/locale/sr/LC_MESSAGES/gtk20.mo -share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo -share/locale/sr@Latn/LC_MESSAGES/gtk20.mo share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo share/locale/sr@ije/LC_MESSAGES/gtk20.mo +share/locale/sr@latin/LC_MESSAGES/gtk20-properties.mo +share/locale/sr@latin/LC_MESSAGES/gtk20.mo share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/ta/LC_MESSAGES/gtk20-properties.mo @@ -627,6 +660,9 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrm include/gtk-2.0/gdk-pixbuf @dirrm include/gtk-2.0/gdk @dirrm include/gtk-2.0 +@dirrm include/gail-1.0/libgail-util +@dirrm include/gail-1.0/gail +@dirrm include/gail-1.0 @dirrm etc/gtk-2.0 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @@ -634,11 +670,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/themes @dirrmtry lib/gtk-2.0/modules @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/modules @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines @dirrmtry lib/gtk-2.0/%%GTK_VERSION%% @dirrmtry lib/gtk-2.0 +@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true +@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @@ -653,12 +692,16 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/locale/tt @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @@ -667,6 +710,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/io/LC_MESSAGES @@ -685,9 +730,9 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/locale/be@latin @dirrmtry share/locale/az_IR/LC_MESSAGES @dirrmtry share/locale/az_IR +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang -@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true -@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 4d9eff1c82f0..b547bb10d663 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/gtk20/Makefile,v 1.11 2007/12/04 21:45:14 mezz Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.147 2009/01/08 17:38:06 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.12.11 -PORTREVISION?= 1 +PORTVERSION= 2.14.7 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -29,10 +29,11 @@ LATEST_LINK= gtk20 .if !defined(REFERENCE_PORT) -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg -RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + jasper.4:${PORTSDIR}/graphics/jasper +RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme USE_GMAKE= yes @@ -76,8 +77,6 @@ post-patch: ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/gtk/xdgmime/xdgmime.c # GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser) @${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \ s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \ diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 69efc41c7e01..a7d8aa722018 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.12.11.tar.bz2) = f7aab88e856a813386f797aade5867ad -SHA256 (gnome2/gtk+-2.12.11.tar.bz2) = c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9 -SIZE (gnome2/gtk+-2.12.11.tar.bz2) = 16232428 +MD5 (gnome2/gtk+-2.14.7.tar.bz2) = fb1614d4b2adba7b078e2e799b5db604 +SHA256 (gnome2/gtk+-2.14.7.tar.bz2) = e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14 +SIZE (gnome2/gtk+-2.14.7.tar.bz2) = 17475873 diff --git a/x11-toolkits/gtk30/files/patch-ai b/x11-toolkits/gtk30/files/patch-ai index a04d08ef58b3..a7c07057c598 100644 --- a/x11-toolkits/gtk30/files/patch-ai +++ b/x11-toolkits/gtk30/files/patch-ai @@ -1,11 +1,11 @@ ---- docs/reference/Makefile.in.orig Fri Oct 24 23:38:06 2003 -+++ docs/reference/Makefile.in Fri Oct 24 23:48:00 2003 -@@ -286,7 +286,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- docs/reference/Makefile.in.orig 2008-02-23 10:25:17.000000000 -0500 ++++ docs/reference/Makefile.in 2008-02-23 10:26:36.000000000 -0500 +@@ -372,7 +372,7 @@ + && DISPLAY=:$$XID && export DISPLAY --SUBDIRS = gdk-pixbuf gdk gtk -+SUBDIRS = #gdk-pixbuf gdk gtk + +-SUBDIRS = gdk-pixbuf gdk gtk libgail-util ++SUBDIRS = # gdk-pixbuf gdk gtk libgail-util subdir = docs/reference + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak index af39120b2088..7f8e0eb0c02d 100644 --- a/x11-toolkits/gtk30/files/patch-ak +++ b/x11-toolkits/gtk30/files/patch-ak @@ -1,7 +1,3 @@ - -$FreeBSD$ - $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.8 2007/12/01 05:56:33 marcus Exp $ - --- gdk/Makefile.in.orig Thu Feb 14 12:38:26 2002 +++ gdk/Makefile.in Thu Feb 14 12:45:37 2002 @@ -315,7 +315,7 @@ diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk30/files/patch-gtk_gtksignal.h new file mode 100644 index 000000000000..c687dec4009b --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtksignal.h @@ -0,0 +1,13 @@ +--- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400 ++++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400 +@@ -29,7 +29,9 @@ + #ifndef __GTK_SIGNAL_H__ + #define __GTK_SIGNAL_H__ + +-#include <gtk/gtk.h> ++#include <gtk/gtkenums.h> ++#include <gtk/gtktypeutils.h> ++#include <gtk/gtkobject.h> + #include <gtk/gtkmarshal.h> + + G_BEGIN_DECLS diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c deleted file mode 100644 index e0fd02d4fbac..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 -+++ gtk/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 -@@ -204,7 +204,7 @@ - - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "/usr/local/share/"; - - ptr = xdg_data_dirs; - diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h deleted file mode 100644 index b64106809ef6..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmimecache.h +++ /dev/null @@ -1,12 +0,0 @@ ---- gtk/xdgmime/xdgmimecache.h.orig 2007-09-13 16:35:37.000000000 -0400 -+++ gtk/xdgmime/xdgmimecache.h 2007-09-14 00:59:43.000000000 -0400 -@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach - #define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) - #define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) - #define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) -+#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) -+#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) -+#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) - - #endif - diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 99b4f04150ac..f916fc6fda4f 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -7,6 +7,10 @@ bin/gtk-update-icon-cache etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules etc/gtk-2.0/im-multipress.conf +include/gail-1.0/gail/gailwidget.h +include/gail-1.0/libgail-util/gail-util.h +include/gail-1.0/libgail-util/gailmisc.h +include/gail-1.0/libgail-util/gailtextutil.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h @@ -21,7 +25,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h -include/gtk-2.0/gdk/gdkalias.h +include/gtk-2.0/gdk/gdkapplaunchcontext.h include/gtk-2.0/gdk/gdkcairo.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h @@ -48,6 +52,7 @@ include/gtk-2.0/gdk/gdkrgb.h include/gtk-2.0/gdk/gdkscreen.h include/gtk-2.0/gdk/gdkselection.h include/gtk-2.0/gdk/gdkspawn.h +include/gtk-2.0/gdk/gdktestutils.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h @@ -114,7 +119,6 @@ include/gtk-2.0/gtk/gtkfilechooserdialog.h include/gtk-2.0/gtk/gtkfilechooserwidget.h include/gtk-2.0/gtk/gtkfilefilter.h include/gtk-2.0/gtk/gtkfilesel.h -include/gtk-2.0/gtk/gtkfilesystem.h include/gtk-2.0/gtk/gtkfixed.h include/gtk-2.0/gtk/gtkfontbutton.h include/gtk-2.0/gtk/gtkfontsel.h @@ -129,6 +133,7 @@ include/gtk-2.0/gtk/gtkhruler.h include/gtk-2.0/gtk/gtkhscale.h include/gtk-2.0/gtk/gtkhscrollbar.h include/gtk-2.0/gtk/gtkhseparator.h +include/gtk-2.0/gtk/gtkhsv.h include/gtk-2.0/gtk/gtkiconfactory.h include/gtk-2.0/gtk/gtkicontheme.h include/gtk-2.0/gtk/gtkiconview.h @@ -158,6 +163,7 @@ include/gtk-2.0/gtk/gtkmenutoolbutton.h include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h include/gtk-2.0/gtk/gtkmodules.h +include/gtk-2.0/gtk/gtkmountoperation.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h @@ -198,6 +204,7 @@ include/gtk-2.0/gtk/gtkseparator.h include/gtk-2.0/gtk/gtkseparatormenuitem.h include/gtk-2.0/gtk/gtkseparatortoolitem.h include/gtk-2.0/gtk/gtksettings.h +include/gtk-2.0/gtk/gtkshow.h include/gtk-2.0/gtk/gtksignal.h include/gtk-2.0/gtk/gtksizegroup.h include/gtk-2.0/gtk/gtksocket.h @@ -208,6 +215,7 @@ include/gtk-2.0/gtk/gtkstock.h include/gtk-2.0/gtk/gtkstyle.h include/gtk-2.0/gtk/gtktable.h include/gtk-2.0/gtk/gtktearoffmenuitem.h +include/gtk-2.0/gtk/gtktestutils.h include/gtk-2.0/gtk/gtktext.h include/gtk-2.0/gtk/gtktextbuffer.h include/gtk-2.0/gtk/gtktextbufferrichtext.h @@ -226,6 +234,7 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h include/gtk-2.0/gtk/gtktoolbar.h include/gtk-2.0/gtk/gtktoolbutton.h include/gtk-2.0/gtk/gtktoolitem.h +include/gtk-2.0/gtk/gtktoolshell.h include/gtk-2.0/gtk/gtktooltip.h include/gtk-2.0/gtk/gtktooltips.h include/gtk-2.0/gtk/gtktree.h @@ -258,6 +267,7 @@ include/gtk-unix-print-2.0/gtk/gtkpagesetupunixdialog.h include/gtk-unix-print-2.0/gtk/gtkprinter.h include/gtk-unix-print-2.0/gtk/gtkprintjob.h include/gtk-unix-print-2.0/gtk/gtkprintunixdialog.h +include/gtk-unix-print-2.0/gtk/gtkunixprint.h lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so @@ -303,9 +313,15 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.la +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-icns.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.a +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.la +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jasper.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so @@ -345,6 +361,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-file.so lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.a lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.la lib/gtk-2.0/%%GTK_VERSION%%/printbackends/libprintbackend-lpr.so +lib/gtk-2.0/modules/libferret.a +lib/gtk-2.0/modules/libferret.la +lib/gtk-2.0/modules/libferret.so +lib/gtk-2.0/modules/libgail.a +lib/gtk-2.0/modules/libgail.la +lib/gtk-2.0/modules/libgail.so +lib/libgailutil.a +lib/libgailutil.la +lib/libgailutil.so +lib/libgailutil.so.18 lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.la lib/libgdk-x11-2.0.so @@ -361,6 +387,7 @@ lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.la lib/libgtk-x11-2.0.so lib/libgtk-x11-2.0.so.0 +libdata/pkgconfig/gail.pc libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -424,6 +451,8 @@ share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/as/LC_MESSAGES/gtk20-properties.mo share/locale/as/LC_MESSAGES/gtk20.mo +share/locale/ast/LC_MESSAGES/gtk20-properties.mo +share/locale/ast/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo share/locale/az/LC_MESSAGES/gtk20.mo share/locale/az_IR/LC_MESSAGES/gtk20-properties.mo @@ -518,6 +547,8 @@ share/locale/lt/LC_MESSAGES/gtk20-properties.mo share/locale/lt/LC_MESSAGES/gtk20.mo share/locale/lv/LC_MESSAGES/gtk20-properties.mo share/locale/lv/LC_MESSAGES/gtk20.mo +share/locale/mai/LC_MESSAGES/gtk20-properties.mo +share/locale/mai/LC_MESSAGES/gtk20.mo share/locale/mi/LC_MESSAGES/gtk20-properties.mo share/locale/mi/LC_MESSAGES/gtk20.mo share/locale/mk/LC_MESSAGES/gtk20-properties.mo @@ -548,6 +579,8 @@ share/locale/pa/LC_MESSAGES/gtk20-properties.mo share/locale/pa/LC_MESSAGES/gtk20.mo share/locale/pl/LC_MESSAGES/gtk20-properties.mo share/locale/pl/LC_MESSAGES/gtk20.mo +share/locale/ps/LC_MESSAGES/gtk20-properties.mo +share/locale/ps/LC_MESSAGES/gtk20.mo share/locale/pt/LC_MESSAGES/gtk20-properties.mo share/locale/pt/LC_MESSAGES/gtk20.mo share/locale/pt_BR/LC_MESSAGES/gtk20-properties.mo @@ -568,10 +601,10 @@ share/locale/sq/LC_MESSAGES/gtk20-properties.mo share/locale/sq/LC_MESSAGES/gtk20.mo share/locale/sr/LC_MESSAGES/gtk20-properties.mo share/locale/sr/LC_MESSAGES/gtk20.mo -share/locale/sr@Latn/LC_MESSAGES/gtk20-properties.mo -share/locale/sr@Latn/LC_MESSAGES/gtk20.mo share/locale/sr@ije/LC_MESSAGES/gtk20-properties.mo share/locale/sr@ije/LC_MESSAGES/gtk20.mo +share/locale/sr@latin/LC_MESSAGES/gtk20-properties.mo +share/locale/sr@latin/LC_MESSAGES/gtk20.mo share/locale/sv/LC_MESSAGES/gtk20-properties.mo share/locale/sv/LC_MESSAGES/gtk20.mo share/locale/ta/LC_MESSAGES/gtk20-properties.mo @@ -627,6 +660,9 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrm include/gtk-2.0/gdk-pixbuf @dirrm include/gtk-2.0/gdk @dirrm include/gtk-2.0 +@dirrm include/gail-1.0/libgail-util +@dirrm include/gail-1.0/gail +@dirrm include/gail-1.0 @dirrm etc/gtk-2.0 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @@ -634,11 +670,14 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/themes @dirrmtry lib/gtk-2.0/modules @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/printbackends +@dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/modules @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/loaders @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/immodules @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines @dirrmtry lib/gtk-2.0/%%GTK_VERSION%% @dirrmtry lib/gtk-2.0 +@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true +@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @@ -653,12 +692,16 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/locale/tt @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @@ -667,6 +710,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/io/LC_MESSAGES @@ -685,9 +730,9 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry share/locale/be@latin @dirrmtry share/locale/az_IR/LC_MESSAGES @dirrmtry share/locale/az_IR +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang -@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true -@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index 6ad017bce438..ef71ec3fbd37 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -3,15 +3,14 @@ # Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/gtkmm24/Makefile,v 1.1 2007/12/02 00:20:21 mezz Exp $ +# $MCom: ports/x11-toolkits/gtkmm24/Makefile,v 1.42 2008/11/18 06:51:19 marcus Exp $ # PORTNAME= gtkmm -PORTVERSION= 2.12.7 -PORTREVISION?= 1 +PORTVERSION= 2.14.3 +PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,7 +22,8 @@ LATEST_LINK= gtkmm24 .if !defined(REFERENCE_PORT) LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \ - cairomm-1.0.1:${PORTSDIR}/graphics/cairomm + cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \ + pangomm-1.4.1:${PORTSDIR}/x11-toolkits/pangomm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo index 75dd0b0d95cd..5c77592fc96f 100644 --- a/x11-toolkits/gtkmm24/distinfo +++ b/x11-toolkits/gtkmm24/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkmm-2.12.7.tar.bz2) = ad199f4a392799134c128deab48fee30 -SHA256 (gnome2/gtkmm-2.12.7.tar.bz2) = 4e58c9ad827759a2375b3c0d39952b5b2983111ab16ee329b10a34792fb1d9eb -SIZE (gnome2/gtkmm-2.12.7.tar.bz2) = 15198578 +MD5 (gnome2/gtkmm-2.14.3.tar.bz2) = 10039f35d7f815d47f926a13cefe65d6 +SHA256 (gnome2/gtkmm-2.14.3.tar.bz2) = 24b18105636cea1033658a0a5f7e86783d0e620590aa359a005ba64d055559a2 +SIZE (gnome2/gtkmm-2.14.3.tar.bz2) = 8667875 diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist index e405a27dcd87..fea6c20e19d0 100644 --- a/x11-toolkits/gtkmm24/pkg-plist +++ b/x11-toolkits/gtkmm24/pkg-plist @@ -340,6 +340,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/toggletoolbutton_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbar_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolbutton_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/toolitem_p.h +include/gtkmm-%%API_VERSION%%/gtkmm/private/toolshell_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltip_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/tooltips_p.h include/gtkmm-%%API_VERSION%%/gtkmm/private/treedragdest_p.h @@ -414,6 +415,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/toggletoolbutton.h include/gtkmm-%%API_VERSION%%/gtkmm/toolbar.h include/gtkmm-%%API_VERSION%%/gtkmm/toolbutton.h include/gtkmm-%%API_VERSION%%/gtkmm/toolitem.h +include/gtkmm-%%API_VERSION%%/gtkmm/toolshell.h include/gtkmm-%%API_VERSION%%/gtkmm/tooltip.h include/gtkmm-%%API_VERSION%%/gtkmm/tooltips.h include/gtkmm-%%API_VERSION%%/gtkmm/treedragdest.h @@ -437,60 +439,6 @@ include/gtkmm-%%API_VERSION%%/gtkmm/volumebutton.h include/gtkmm-%%API_VERSION%%/gtkmm/widget.h include/gtkmm-%%API_VERSION%%/gtkmm/window.h include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h -include/pangomm-1.4/pangomm.h -include/pangomm-1.4/pangomm/attributes.h -include/pangomm-1.4/pangomm/attriter.h -include/pangomm-1.4/pangomm/attrlist.h -include/pangomm-1.4/pangomm/cairofontmap.h -include/pangomm-1.4/pangomm/color.h -include/pangomm-1.4/pangomm/context.h -include/pangomm-1.4/pangomm/coverage.h -include/pangomm-1.4/pangomm/font.h -include/pangomm-1.4/pangomm/fontdescription.h -include/pangomm-1.4/pangomm/fontface.h -include/pangomm-1.4/pangomm/fontfamily.h -include/pangomm-1.4/pangomm/fontmap.h -include/pangomm-1.4/pangomm/fontmetrics.h -include/pangomm-1.4/pangomm/fontset.h -include/pangomm-1.4/pangomm/glyph.h -include/pangomm-1.4/pangomm/glyphstring.h -include/pangomm-1.4/pangomm/init.h -include/pangomm-1.4/pangomm/item.h -include/pangomm-1.4/pangomm/language.h -include/pangomm-1.4/pangomm/layout.h -include/pangomm-1.4/pangomm/layoutiter.h -include/pangomm-1.4/pangomm/layoutline.h -include/pangomm-1.4/pangomm/layoutrun.h -include/pangomm-1.4/pangomm/private/attributes_p.h -include/pangomm-1.4/pangomm/private/attriter_p.h -include/pangomm-1.4/pangomm/private/attrlist_p.h -include/pangomm-1.4/pangomm/private/cairofontmap_p.h -include/pangomm-1.4/pangomm/private/color_p.h -include/pangomm-1.4/pangomm/private/context_p.h -include/pangomm-1.4/pangomm/private/coverage_p.h -include/pangomm-1.4/pangomm/private/font_p.h -include/pangomm-1.4/pangomm/private/fontdescription_p.h -include/pangomm-1.4/pangomm/private/fontface_p.h -include/pangomm-1.4/pangomm/private/fontfamily_p.h -include/pangomm-1.4/pangomm/private/fontmap_p.h -include/pangomm-1.4/pangomm/private/fontmetrics_p.h -include/pangomm-1.4/pangomm/private/fontset_p.h -include/pangomm-1.4/pangomm/private/glyph_p.h -include/pangomm-1.4/pangomm/private/glyphstring_p.h -include/pangomm-1.4/pangomm/private/item_p.h -include/pangomm-1.4/pangomm/private/language_p.h -include/pangomm-1.4/pangomm/private/layout_p.h -include/pangomm-1.4/pangomm/private/layoutiter_p.h -include/pangomm-1.4/pangomm/private/layoutline_p.h -include/pangomm-1.4/pangomm/private/layoutrun_p.h -include/pangomm-1.4/pangomm/private/rectangle_p.h -include/pangomm-1.4/pangomm/private/renderer_p.h -include/pangomm-1.4/pangomm/private/tabarray_p.h -include/pangomm-1.4/pangomm/rectangle.h -include/pangomm-1.4/pangomm/renderer.h -include/pangomm-1.4/pangomm/tabarray.h -include/pangomm-1.4/pangomm/types.h -include/pangomm-1.4/pangomm/wrap_init.h lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4 @@ -511,23 +459,15 @@ lib/libgtkmm-%%VERSION%%.a lib/libgtkmm-%%VERSION%%.la lib/libgtkmm-%%VERSION%%.so lib/libgtkmm-%%VERSION%%.so.1 -lib/libpangomm-1.4.a -lib/libpangomm-1.4.la -lib/libpangomm-1.4.so -lib/libpangomm-1.4.so.1 libdata/pkgconfig/atkmm-1.6.pc libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc -libdata/pkgconfig/pangomm-1.4.pc @dirrm lib/gtkmm-%%API_VERSION%%/proc/m4 @dirrm lib/gtkmm-%%API_VERSION%%/proc @dirrm lib/gtkmm-%%API_VERSION%%/include @dirrm lib/gtkmm-%%API_VERSION%% @dirrm lib/gdkmm-%%API_VERSION%%/include @dirrm lib/gdkmm-%%API_VERSION%% -@dirrm include/pangomm-1.4/pangomm/private -@dirrm include/pangomm-1.4/pangomm -@dirrm include/pangomm-1.4 @dirrm include/gtkmm-%%API_VERSION%%/gtkmm/private @dirrm include/gtkmm-%%API_VERSION%%/gtkmm @dirrm include/gtkmm-%%API_VERSION%% diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index 1b085e189032..1806369b7d15 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.60 2008/03/10 13:49:44 ahze Exp $ +# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.67 2008/11/02 18:21:19 marcus Exp $ # PORTNAME= gtksourceview2 -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.1 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -18,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget -#USE_BZIP2= yes +USE_BZIP2= yes .if !defined(REFERENCE_PORT) diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo index 33ce3c6dc88e..c53e9d4ef907 100644 --- a/x11-toolkits/gtksourceview2/distinfo +++ b/x11-toolkits/gtksourceview2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtksourceview-2.2.2.tar.gz) = 91f8743c73eeb3a4f49b96ce4a0ac42d -SHA256 (gnome2/gtksourceview-2.2.2.tar.gz) = 9330de25198b1d22ca005f8571a8eb22a7074cdd039e63fcbe5b6900ec2acd64 -SIZE (gnome2/gtksourceview-2.2.2.tar.gz) = 1542932 +MD5 (gnome2/gtksourceview-2.4.1.tar.bz2) = 7b5902e00aafc573e56f1bac244b2673 +SHA256 (gnome2/gtksourceview-2.4.1.tar.bz2) = da955516b40ff8e9e6ca85731aca5a95fe4814d4d6815ec7924dbf2d9d4937f7 +SIZE (gnome2/gtksourceview-2.4.1.tar.bz2) = 948426 diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist index ef181eb9f2b4..9a0140320448 100644 --- a/x11-toolkits/gtksourceview2/pkg-plist +++ b/x11-toolkits/gtksourceview2/pkg-plist @@ -31,6 +31,7 @@ share/gtksourceview-2.0/language-specs/def.lang share/gtksourceview-2.0/language-specs/desktop.lang share/gtksourceview-2.0/language-specs/diff.lang share/gtksourceview-2.0/language-specs/docbook.lang +share/gtksourceview-2.0/language-specs/dot.lang share/gtksourceview-2.0/language-specs/dpatch.lang share/gtksourceview-2.0/language-specs/dtd.lang share/gtksourceview-2.0/language-specs/eiffel.lang @@ -81,6 +82,7 @@ share/gtksourceview-2.0/language-specs/vbnet.lang share/gtksourceview-2.0/language-specs/verilog.lang share/gtksourceview-2.0/language-specs/vhdl.lang share/gtksourceview-2.0/language-specs/xml.lang +share/gtksourceview-2.0/language-specs/xslt.lang share/gtksourceview-2.0/language-specs/yacc.lang share/gtksourceview-2.0/styles/classic.xml share/gtksourceview-2.0/styles/kate.xml @@ -119,6 +121,7 @@ share/locale/hu/LC_MESSAGES/gtksourceview-2.0.mo share/locale/id/LC_MESSAGES/gtksourceview-2.0.mo share/locale/it/LC_MESSAGES/gtksourceview-2.0.mo share/locale/ja/LC_MESSAGES/gtksourceview-2.0.mo +share/locale/kn/LC_MESSAGES/gtksourceview-2.0.mo share/locale/ko/LC_MESSAGES/gtksourceview-2.0.mo share/locale/lt/LC_MESSAGES/gtksourceview-2.0.mo share/locale/lv/LC_MESSAGES/gtksourceview-2.0.mo @@ -146,9 +149,10 @@ share/locale/sk/LC_MESSAGES/gtksourceview-2.0.mo share/locale/sl/LC_MESSAGES/gtksourceview-2.0.mo share/locale/sq/LC_MESSAGES/gtksourceview-2.0.mo share/locale/sr/LC_MESSAGES/gtksourceview-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gtksourceview-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gtksourceview-2.0.mo share/locale/sv/LC_MESSAGES/gtksourceview-2.0.mo share/locale/ta/LC_MESSAGES/gtksourceview-2.0.mo +share/locale/te/LC_MESSAGES/gtksourceview-2.0.mo share/locale/th/LC_MESSAGES/gtksourceview-2.0.mo share/locale/tr/LC_MESSAGES/gtksourceview-2.0.mo share/locale/uk/LC_MESSAGES/gtksourceview-2.0.mo @@ -166,6 +170,10 @@ share/locale/zh_TW/LC_MESSAGES/gtksourceview-2.0.mo @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 7c359e19baa0..0d2ef1f50b22 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.64 2008/03/10 16:41:24 ahze Exp $ +# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.68 2008/09/22 12:44:50 kwm Exp $ # PORTNAME= libbonoboui -PORTVERSION= 2.22.0 -PORTREVISION?= 2 +PORTVERSION= 2.24.0 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index 6ba8647ba852..73dd82d79fa9 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/libbonoboui-2.22.0.tar.bz2) = e4e4d74c9387d08c956574f981cf91f2 -SHA256 (gnome/libbonoboui-2.22.0.tar.bz2) = a1f2cc830a67cf02ea66812624d92f369b7d9e0231dc05ee1d0a0374b7706926 -SIZE (gnome/libbonoboui-2.22.0.tar.bz2) = 1006030 +MD5 (gnome/libbonoboui-2.24.0.tar.bz2) = 2076638f9aa9565c12b2bc264ecc4f18 +SHA256 (gnome/libbonoboui-2.24.0.tar.bz2) = 1274822cc0cc519755b35148bedeacd969504393a5003ca4d99977a92518f61b +SIZE (gnome/libbonoboui-2.24.0.tar.bz2) = 988715 diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index 589cb347ceb7..c7648291f0a0 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -90,6 +90,7 @@ share/locale/ku/LC_MESSAGES/libbonoboui-2.0.mo share/locale/li/LC_MESSAGES/libbonoboui-2.0.mo share/locale/lt/LC_MESSAGES/libbonoboui-2.0.mo share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/mai/LC_MESSAGES/libbonoboui-2.0.mo share/locale/mg/LC_MESSAGES/libbonoboui-2.0.mo share/locale/mk/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo @@ -105,6 +106,7 @@ share/locale/oc/LC_MESSAGES/libbonoboui-2.0.mo share/locale/or/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/ps/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pt/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ro/LC_MESSAGES/libbonoboui-2.0.mo @@ -115,10 +117,11 @@ share/locale/sk/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sl/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sq/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sr/LC_MESSAGES/libbonoboui-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/sr@latin/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sr@ije/LC_MESSAGES/libbonoboui-2.0.mo share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/te/LC_MESSAGES/libbonoboui-2.0.mo share/locale/th/LC_MESSAGES/libbonoboui-2.0.mo share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo @@ -143,12 +146,18 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @@ -157,6 +166,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.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 diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 92cefc13c685..4447b49a9ada 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.69 2007/10/17 21:36:14 mezz Exp $ +# $MCom: ports/x11-toolkits/libgnomeprintui/Makefile,v 1.71 2008/09/22 14:00:52 kwm Exp $ # PORTNAME= libgnomeprintui -PORTVERSION= 2.18.2 -PORTREVISION= 2 +PORTVERSION= 2.18.3 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index af2dcde754d4..f6a019ff616b 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeprintui-2.18.2.tar.bz2) = 88b404e7b62bb9ad96b25908c1315dcd -SHA256 (gnome2/libgnomeprintui-2.18.2.tar.bz2) = 38400994984c0d0bd86fff3b17cca89ea5c3a23f43d9db5840eb32b0b34d084e -SIZE (gnome2/libgnomeprintui-2.18.2.tar.bz2) = 697697 +MD5 (gnome2/libgnomeprintui-2.18.3.tar.bz2) = f2c5796f15d6b6701bfa224d856098ce +SHA256 (gnome2/libgnomeprintui-2.18.3.tar.bz2) = 4f7c75e54474a76eff41b6e3da15afadd2d5207a04bc82d85b728395563cf747 +SIZE (gnome2/libgnomeprintui-2.18.3.tar.bz2) = 711876 diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index f93fadfc7359..0bbf04b7860c 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -56,6 +56,7 @@ share/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/fa/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/fi/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/fr/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/fur/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ga/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/gl/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/gu/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -86,6 +87,7 @@ share/locale/oc/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/or/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pa/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ps/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -96,7 +98,7 @@ share/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sq/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo -share/locale/sr@Latn/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/sr@latin/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/te/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -120,14 +122,20 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 16a8afb51c39..8a23c20c90a8 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.116 2008/03/10 15:46:28 ahze Exp $ +# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.122 2008/09/22 12:50:50 kwm Exp $ # PORTNAME= libgnomeui -PORTVERSION= 2.22.1 -PORTREVISION?= 2 +PORTVERSION= 2.24.0 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index da69cf608f40..836de795290d 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeui-2.22.1.tar.bz2) = 5a60405f006e873ba7bc97ec9c8e4c5d -SHA256 (gnome2/libgnomeui-2.22.1.tar.bz2) = 7631bc19eab79412ec621e3bc98e94185d79ae59946990f54a09b80940385ad7 -SIZE (gnome2/libgnomeui-2.22.1.tar.bz2) = 1450063 +MD5 (gnome2/libgnomeui-2.24.0.tar.bz2) = 7d50e1fc4c1ee3c268b26e8dfe7e677b +SHA256 (gnome2/libgnomeui-2.24.0.tar.bz2) = 9ecf81d3ad2e1ec0b371d720b37154e8b716af1cd464dbeb06232f8fa4c5e07d +SIZE (gnome2/libgnomeui-2.24.0.tar.bz2) = 1468372 diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index 8a8f7d0e4b26..424ae344f36f 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -49,12 +49,6 @@ include/libgnomeui-2.0/libgnomeui/gnome-window-icon.h include/libgnomeui-2.0/libgnomeui/gnome-window.h include/libgnomeui-2.0/libgnomeui/gnometypebuiltins.h include/libgnomeui-2.0/libgnomeui/libgnomeui.h -lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgio.a -lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgio.la -lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgio.so -lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.a -lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.la -lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.so lib/libglade/2.0/libgnome.a lib/libglade/2.0/libgnome.la lib/libglade/2.0/libgnome.so @@ -76,6 +70,7 @@ share/locale/bn_IN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/br/LC_MESSAGES/libgnomeui-2.0.mo share/locale/bs/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/crh/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cs/LC_MESSAGES/libgnomeui-2.0.mo share/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo share/locale/da/LC_MESSAGES/libgnomeui-2.0.mo @@ -111,6 +106,7 @@ share/locale/ku/LC_MESSAGES/libgnomeui-2.0.mo share/locale/li/LC_MESSAGES/libgnomeui-2.0.mo share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/mai/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mg/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo @@ -138,7 +134,7 @@ share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sr/LC_MESSAGES/libgnomeui-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/sr@latin/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sr@ije/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo @@ -157,7 +153,6 @@ share/locale/zh_HK/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo share/pixmaps/gnome-about-logo.png -@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/filesystems @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0 @dirrmtry share/locale/zu/LC_MESSAGES @@ -172,6 +167,8 @@ share/pixmaps/gnome-about-logo.png @dirrmtry share/locale/tt @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @@ -190,6 +187,8 @@ share/pixmaps/gnome-about-logo.png @dirrmtry share/locale/mi @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/hy/LC_MESSAGES @@ -198,6 +197,8 @@ share/pixmaps/gnome-about-logo.png @dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/crh/LC_MESSAGES +@dirrmtry share/locale/crh @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile index 36b82e0d28c1..a04438039e09 100644 --- a/x11-toolkits/libgnomeuimm26/Makefile +++ b/x11-toolkits/libgnomeuimm26/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.14 2008/03/08 16:56:56 marcus Exp $ +# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.16 2008/09/22 11:36:49 kwm Exp $ # PORTNAME= libgnomeuimm -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.24.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/libgnomeuimm26/distinfo b/x11-toolkits/libgnomeuimm26/distinfo index 4692cdf98bc8..2c1080fc7656 100644 --- a/x11-toolkits/libgnomeuimm26/distinfo +++ b/x11-toolkits/libgnomeuimm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeuimm-2.22.0.tar.bz2) = 74b22fd00133e683ffa23b060d1862e7 -SHA256 (gnome2/libgnomeuimm-2.22.0.tar.bz2) = 493fdc8b31461edbfc3e65b09c29d61670e67706d3b9d2ee3f8a1d9a5303447e -SIZE (gnome2/libgnomeuimm-2.22.0.tar.bz2) = 325394 +MD5 (gnome2/libgnomeuimm-2.24.0.tar.bz2) = e4caf43ee829200bef9ad87415ae39a5 +SHA256 (gnome2/libgnomeuimm-2.24.0.tar.bz2) = 7715ce5648ef7cdf231077fd4e9d8953b30ab70d31dec2efdaa6accd98a2e732 +SIZE (gnome2/libgnomeuimm-2.24.0.tar.bz2) = 381746 diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile index d10506755e20..48332043f615 100644 --- a/x11-toolkits/libgtksourceviewmm/Makefile +++ b/x11-toolkits/libgtksourceviewmm/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgtksourceviewmm/Makefile,v 1.2 2006/12/06 00:54:45 ahze Exp $ +# $MCom: ports/x11-toolkits/libgtksourceviewmm/Makefile,v 1.4 2008/08/08 21:59:44 kwm Exp $ PORTNAME= libgtksourceviewmm -PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTVERSION= 1.9.5 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME @@ -19,11 +18,10 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 USE_LDCONFIG= yes USE_BZIP2= yes USE_GNOME= gtksourceview gnomeprefix gnomehack +USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${WRKSRC}/gtksourceview/ \ - `pkg-config --cflags gtkmm-2.4 gtksourceview-1.0`" \ - LDFLAGS="-L${LOCALBAS}/lib \ - `pkg-config --libs gtkmm-2.4 gtksourceview-1.0`" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBAS}/lib" +CONFIGURE_ARGS= --disable-docs -.include <bsd.port.pre.mk> -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/libgtksourceviewmm/distinfo b/x11-toolkits/libgtksourceviewmm/distinfo index 346393322f75..4fa18c8ec435 100644 --- a/x11-toolkits/libgtksourceviewmm/distinfo +++ b/x11-toolkits/libgtksourceviewmm/distinfo @@ -1,3 +1,3 @@ -MD5 (libgtksourceviewmm-0.2.0.tar.bz2) = cf035031aeeaa3437ce814efa92a3bd6 -SHA256 (libgtksourceviewmm-0.2.0.tar.bz2) = 706c1831847fe619c67ebc2b71586923e89b11692ecf821c0339276744edeb2f -SIZE (libgtksourceviewmm-0.2.0.tar.bz2) = 270578 +MD5 (libgtksourceviewmm-1.9.5.tar.bz2) = 5b907e66e08d913e700135cf3f968ecb +SHA256 (libgtksourceviewmm-1.9.5.tar.bz2) = 10713d063844fdd735cd5e2db2d67bfb341160886e4bdd5f5e1c9eba03378072 +SIZE (libgtksourceviewmm-1.9.5.tar.bz2) = 419054 diff --git a/x11-toolkits/libgtksourceviewmm/pkg-plist b/x11-toolkits/libgtksourceviewmm/pkg-plist index 52ef235c26f7..3c0e75581b39 100644 --- a/x11-toolkits/libgtksourceviewmm/pkg-plist +++ b/x11-toolkits/libgtksourceviewmm/pkg-plist @@ -1,34 +1,33 @@ -include/gtksourceviewmm-1.0/gtksourceviewmm/init.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcebuffer_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcelanguage_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcelanguagesmanager_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcemarker_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcestylescheme_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetag_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetagstyle_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourcetagtable_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/private/sourceview_p.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourcebuffer.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourcelanguage.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourcelanguagesmanager.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourcemarker.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourcestylescheme.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetag.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetagstyle.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourcetagtable.h -include/gtksourceviewmm-1.0/gtksourceviewmm/sourceview.h -include/gtksourceviewmm-1.0/gtksourceviewmm/wrap_init.h -lib/gtksourceviewmm-1.0/include/gtksourceviewmmconfig.h -lib/gtksourceviewmm-1.0/proc/m4/convert.m4 -lib/gtksourceviewmm-1.0/proc/m4/convert_gtksourceviewmm.m4 -lib/libgtksourceviewmm-1.0.la -lib/libgtksourceviewmm-1.0.so -lib/libgtksourceviewmm-1.0.so.1 -libdata/pkgconfig/libgtksourceviewmm-1.0.pc -@dirrm lib/gtksourceviewmm-1.0/proc/m4 -@dirrm lib/gtksourceviewmm-1.0/proc -@dirrm lib/gtksourceviewmm-1.0/include -@dirrm lib/gtksourceviewmm-1.0 -@dirrm include/gtksourceviewmm-1.0/gtksourceviewmm/private -@dirrm include/gtksourceviewmm-1.0/gtksourceviewmm -@dirrm include/gtksourceviewmm-1.0 +include/gtksourceviewmm-2.0/gtksourceviewmm.h +include/gtksourceviewmm-2.0/gtksourceviewmm/init.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcebuffer_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourceiter_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcelanguage_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcelanguagemanager_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcemark_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcestyle_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcestylescheme_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourcestyleschememanager_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/private/sourceview_p.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourcebuffer.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourceiter.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourcelanguage.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourcelanguagemanager.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourcemark.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourcestyle.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourcestylescheme.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourcestyleschememanager.h +include/gtksourceviewmm-2.0/gtksourceviewmm/sourceview.h +include/gtksourceviewmm-2.0/gtksourceviewmm/wrap_init.h +lib/gtksourceviewmm-2.0/include/gtksourceviewmmconfig.h +lib/gtksourceviewmm-2.0/proc/m4/convert.m4 +lib/gtksourceviewmm-2.0/proc/m4/convert_gtksourceviewmm.m4 +lib/libgtksourceviewmm-2.0.la +lib/libgtksourceviewmm-2.0.so +lib/libgtksourceviewmm-2.0.so.2 +libdata/pkgconfig/gtksourceviewmm-2.0.pc +@dirrm lib/gtksourceviewmm-2.0/proc/m4 +@dirrm lib/gtksourceviewmm-2.0/proc +@dirrm lib/gtksourceviewmm-2.0/include +@dirrm include/gtksourceviewmm-2.0/gtksourceviewmm/private +@dirrm include/gtksourceviewmm-2.0/gtksourceviewmm diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 20a3282e63a2..dd74382215a3 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.106 2008/03/10 23:48:53 ahze Exp $ +# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.114 2008/11/25 17:24:09 mezz Exp $ # PORTNAME= libwnck -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index e11fdcef8432..6306502f25d3 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libwnck-2.22.3.tar.bz2) = 12cf787efa0b9d95bc53613bcc7d958e -SHA256 (gnome2/libwnck-2.22.3.tar.bz2) = b013fb5f702b4e182399ffb714451307822cad2ba310e0e7565761319f33d436 -SIZE (gnome2/libwnck-2.22.3.tar.bz2) = 687875 +MD5 (gnome2/libwnck-2.24.2.tar.bz2) = 1c939b1722579e5b7adc37068e77d72a +SHA256 (gnome2/libwnck-2.24.2.tar.bz2) = 35c12f983e64c88c37c261eb6b55b7c59a5ef4dbb04525162f0753ea8e9127f2 +SIZE (gnome2/libwnck-2.24.2.tar.bz2) = 693227 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 2b85d43521af..bcc92275f72a 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -26,6 +26,7 @@ share/locale/bn/LC_MESSAGES/libwnck.mo share/locale/bn_IN/LC_MESSAGES/libwnck.mo share/locale/bs/LC_MESSAGES/libwnck.mo share/locale/ca/LC_MESSAGES/libwnck.mo +share/locale/ca@valencia/LC_MESSAGES/libwnck.mo share/locale/cs/LC_MESSAGES/libwnck.mo share/locale/cy/LC_MESSAGES/libwnck.mo share/locale/da/LC_MESSAGES/libwnck.mo @@ -84,7 +85,7 @@ share/locale/sk/LC_MESSAGES/libwnck.mo share/locale/sl/LC_MESSAGES/libwnck.mo share/locale/sq/LC_MESSAGES/libwnck.mo share/locale/sr/LC_MESSAGES/libwnck.mo -share/locale/sr@Latn/LC_MESSAGES/libwnck.mo +share/locale/sr@latin/LC_MESSAGES/libwnck.mo share/locale/sv/LC_MESSAGES/libwnck.mo share/locale/ta/LC_MESSAGES/libwnck.mo share/locale/te/LC_MESSAGES/libwnck.mo @@ -105,6 +106,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -121,6 +124,8 @@ share/locale/zh_TW/LC_MESSAGES/libwnck.mo @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/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 7ba96a6ccdb9..8cf3b149f472 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.118 2008/03/10 17:44:38 ahze Exp $ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.133 2008/12/18 02:44:05 mezz Exp $ # PORTNAME= pango -PORTVERSION= 1.20.5 +PORTVERSION= 1.22.4 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME \ diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 6fcf712eca6a..45e017171aff 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pango-1.20.5.tar.bz2) = 052b60a12f6b2eb4f251ab961f2b2b84 -SHA256 (gnome2/pango-1.20.5.tar.bz2) = 86f5a94bad18a24c32d6c95f4aad0de643189471825d07e1c1bcaf7cc5a8fab2 -SIZE (gnome2/pango-1.20.5.tar.bz2) = 1420306 +MD5 (gnome2/pango-1.22.4.tar.bz2) = 7c3f3748052799746d73c6d3a0cc1205 +SHA256 (gnome2/pango-1.22.4.tar.bz2) = ff47d7ed8360ebef5fa4b8d3ccf45e014bc8793743bca2a96635a3c34eeaa534 +SIZE (gnome2/pango-1.22.4.tar.bz2) = 1496168 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 86ba73dc53f8..83c249c736ee 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -3,6 +3,7 @@ bin/pango-querymodules etc/pango/pango.modules %%X11%%etc/pango/pangox.aliases include/pango-1.0/pango/pango-attributes.h +include/pango-1.0/pango/pango-bidi-type.h include/pango-1.0/pango/pango-break.h include/pango-1.0/pango/pango-context.h include/pango-1.0/pango/pango-coverage.h diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile new file mode 100644 index 000000000000..d1ddb461a5e6 --- /dev/null +++ b/x11-toolkits/pangomm/Makefile @@ -0,0 +1,48 @@ +# New ports collection makefile for: pangomm +# Date created: 23 July 2008 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.7 2008/11/10 19:57:21 kwm Exp $ +# + +PORTNAME= pangomm +PORTVERSION= 2.14.1 +PORTREVISION?= 0 +CATEGORIES= x11-toolkits +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= C++ wrapper for Pango + +USE_BZIP2= yes + +.if !defined(REFERENCE_PORT) + +LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \ + cairomm-1.0.1:${PORTSDIR}/graphics/cairomm +BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 + +USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +USE_GNOME= gnomehack pango +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --disable-demos \ + --disable-docs \ + --disable-examples \ + --enable-static=yes \ + --with-sigc-prefix=${LOCALBASE} + +PLIST_SUB= VERSION="2.4" API_VERSION="1.4" + +post-patch: + @${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \ + ${WRKSRC}/Makefile.in + +.include <bsd.port.mk> + +.endif diff --git a/x11-toolkits/pangomm/distinfo b/x11-toolkits/pangomm/distinfo new file mode 100644 index 000000000000..650cc75a9861 --- /dev/null +++ b/x11-toolkits/pangomm/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/pangomm-2.14.1.tar.bz2) = c67228ea93dd977394d2872b61754b53 +SHA256 (gnome2/pangomm-2.14.1.tar.bz2) = d7724d878242f7313086e23f774f5ae021f6ff8d0bd393d6c704ad89362c3557 +SIZE (gnome2/pangomm-2.14.1.tar.bz2) = 984848 diff --git a/x11-toolkits/pangomm/pkg-descr b/x11-toolkits/pangomm/pkg-descr new file mode 100644 index 000000000000..1fec3f2b76be --- /dev/null +++ b/x11-toolkits/pangomm/pkg-descr @@ -0,0 +1,3 @@ +C++ wrapper for Pango. + +WWW: http://gtkmm.sourceforge.net/ diff --git a/x11-toolkits/pangomm/pkg-plist b/x11-toolkits/pangomm/pkg-plist new file mode 100644 index 000000000000..08c681f69138 --- /dev/null +++ b/x11-toolkits/pangomm/pkg-plist @@ -0,0 +1,67 @@ +include/pangomm-%%API_VERSION%%/pangomm.h +include/pangomm-%%API_VERSION%%/pangomm/attributes.h +include/pangomm-%%API_VERSION%%/pangomm/attriter.h +include/pangomm-%%API_VERSION%%/pangomm/attrlist.h +include/pangomm-%%API_VERSION%%/pangomm/cairofontmap.h +include/pangomm-%%API_VERSION%%/pangomm/color.h +include/pangomm-%%API_VERSION%%/pangomm/context.h +include/pangomm-%%API_VERSION%%/pangomm/coverage.h +include/pangomm-%%API_VERSION%%/pangomm/font.h +include/pangomm-%%API_VERSION%%/pangomm/fontdescription.h +include/pangomm-%%API_VERSION%%/pangomm/fontface.h +include/pangomm-%%API_VERSION%%/pangomm/fontfamily.h +include/pangomm-%%API_VERSION%%/pangomm/fontmap.h +include/pangomm-%%API_VERSION%%/pangomm/fontmetrics.h +include/pangomm-%%API_VERSION%%/pangomm/fontset.h +include/pangomm-%%API_VERSION%%/pangomm/glyph.h +include/pangomm-%%API_VERSION%%/pangomm/glyphstring.h +include/pangomm-%%API_VERSION%%/pangomm/init.h +include/pangomm-%%API_VERSION%%/pangomm/item.h +include/pangomm-%%API_VERSION%%/pangomm/language.h +include/pangomm-%%API_VERSION%%/pangomm/layout.h +include/pangomm-%%API_VERSION%%/pangomm/layoutiter.h +include/pangomm-%%API_VERSION%%/pangomm/layoutline.h +include/pangomm-%%API_VERSION%%/pangomm/layoutrun.h +include/pangomm-%%API_VERSION%%/pangomm/private/attributes_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/attriter_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/attrlist_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/cairofontmap_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/color_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/context_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/coverage_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/font_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/fontdescription_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/fontface_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/fontfamily_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/fontmap_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/fontmetrics_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/fontset_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/glyph_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/glyphstring_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/item_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/language_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/layout_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/layoutiter_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/layoutline_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/layoutrun_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/rectangle_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/renderer_p.h +include/pangomm-%%API_VERSION%%/pangomm/private/tabarray_p.h +include/pangomm-%%API_VERSION%%/pangomm/rectangle.h +include/pangomm-%%API_VERSION%%/pangomm/renderer.h +include/pangomm-%%API_VERSION%%/pangomm/tabarray.h +include/pangomm-%%API_VERSION%%/pangomm/types.h +include/pangomm-%%API_VERSION%%/pangomm/wrap_init.h +lib/libpangomm-%%API_VERSION%%.a +lib/libpangomm-%%API_VERSION%%.la +lib/libpangomm-%%API_VERSION%%.so +lib/libpangomm-%%API_VERSION%%.so.1 +lib/pangomm-%%API_VERSION%%/proc/m4/convert.m4 +lib/pangomm-%%API_VERSION%%/proc/m4/convert_pango.m4 +libdata/pkgconfig/pangomm-%%API_VERSION%%.pc +@dirrm lib/pangomm-%%API_VERSION%%/proc/m4 +@dirrm lib/pangomm-%%API_VERSION%%/proc +@dirrm lib/pangomm-%%API_VERSION%% +@dirrm include/pangomm-%%API_VERSION%%/pangomm/private +@dirrm include/pangomm-%%API_VERSION%%/pangomm +@dirrm include/pangomm-%%API_VERSION%% diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index 154b38e0fe41..f2de7e8508c8 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.72 2008/03/09 21:58:25 mezz Exp $ +# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.79 2008/12/20 05:39:21 marcus Exp $ # PORTNAME= gnome -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.24.1 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,7 +21,7 @@ COMMENT= A set of Python bindings used by modules in the GNOME Desktop BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser \ + totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ gnome-keyring:${PORTSDIR}/security/gnome-keyring RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo index ccb42e48dd79..42b6dc6c2fea 100644 --- a/x11-toolkits/py-gnome-desktop/distinfo +++ b/x11-toolkits/py-gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-desktop-2.22.0.tar.bz2) = 504877a973f6abc0788283232cd703cb -SHA256 (gnome2/gnome-python-desktop-2.22.0.tar.bz2) = 116213b0b0fc3f1fa6771589eab86ccdf5d5024c30a987f3b912da0902be9d37 -SIZE (gnome2/gnome-python-desktop-2.22.0.tar.bz2) = 571816 +MD5 (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 3eac6b859bff98148b021c9d11224ca5 +SHA256 (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 2f10ec51126493b88f5c2e3336a9cacca740bc25fc9b8b2d871a21b21b5e8748 +SIZE (gnome2/gnome-python-desktop-2.24.1.tar.bz2) = 621325 diff --git a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c index 05db58a4c083..de4572f7febf 100644 --- a/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c +++ b/x11-toolkits/py-gnome-desktop/files/patch-gtop_gtop.c @@ -8,13 +8,3 @@ #include <arpa/inet.h> -@@ -1316,8 +1317,8 @@ build_siglist(void) - - for(i = 0; i < len; ++i) - { -- p = &glibtop_sys_siglist[i]; - PyObject* d; -+ p = &glibtop_sys_siglist[i]; - - d = PyDict_New(); - my_dict_add_and_decref(d, "number", PyI_L(p->number)); diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index 917df6d24666..655c04591ba7 100644 --- a/x11-toolkits/py-gnome-extras/Makefile +++ b/x11-toolkits/py-gnome-extras/Makefile @@ -3,12 +3,12 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.43 2008/02/05 13:25:18 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.45 2008/10/21 14:16:43 kwm Exp $ # PORTNAME= gnome PORTVERSION= 2.19.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//} diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs new file mode 100644 index 000000000000..b0b5dae6237e --- /dev/null +++ b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs @@ -0,0 +1,67 @@ +--- gdl/gdl.defs.orig 2007-06-05 14:52:30.000000000 +0000 ++++ gdl/gdl.defs 2008-10-21 15:47:07.000000000 +0000 +@@ -81,17 +81,6 @@ + (gtype-id "GDL_TYPE_DOCK_TABLABEL") + ) + +-(ifdef HAVE_GDL_0_7 +- +-(define-object Icons +- (in-module "Gdl") +- (parent "GObject") +- (c-name "GdlIcons") +- (gtype-id "GDL_TYPE_ICONS") +-) +- +-) ; ifdef HAVE_GDL_0_7 +- + ;; Enumerations and flags ... + + (ifdef HAVE_GDL_0_7 +@@ -924,46 +913,3 @@ + (return-type "none") + ) + +-;; From gdl-icons.h +- +-(ifdef HAVE_GDL_0_7 +- +-(define-function gdl_icons_new +- (is-constructor-of "GdlIcons") +- (c-name "gdl_icons_new") +- (return-type "GdlIcons*") +- (parameters +- '("int" "icon_size") +- ) +-) +- +-(define-function gdl_icons_get_type +- (c-name "gdl_icons_get_type") +- (return-type "GType") +-) +- +-(define-method get_folder_icon +- (of-object "GdlIcons") +- (c-name "gdl_icons_get_folder_icon") +- (return-type "GdkPixbuf*") +-) +- +-(define-method get_uri_icon +- (of-object "GdlIcons") +- (c-name "gdl_icons_get_uri_icon") +- (return-type "GdkPixbuf*") +- (parameters +- '("const-char*" "uri") +- ) +-) +- +-(define-method get_mime_icon +- (of-object "GdlIcons") +- (c-name "gdl_icons_get_mime_icon") +- (return-type "GdkPixbuf*") +- (parameters +- '("const-char*" "mime_type") +- ) +-) +- +-) ; ifdef HAVE_GDL_0_7 diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override new file mode 100644 index 000000000000..16e67fe1efc5 --- /dev/null +++ b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override @@ -0,0 +1,10 @@ +--- gdl/gdl.override.orig 2007-06-05 14:52:30.000000000 +0000 ++++ gdl/gdl.override 2008-10-21 15:47:07.000000000 +0000 +@@ -6,7 +6,6 @@ headers + #include <pygtk/pygtk.h> + #include <gdl/gdl-dock.h> + #include <gdl/libgdltypebuiltins.h> +-#include <gdl/gdl-icons.h> + #ifndef HAVE_GDL_0_7 + # include <gdl/gdl-dock-bar.h> + #endif diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index f9d3a7786eef..c65979fa2da9 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.49 2008/03/09 21:47:30 mezz Exp $ +# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.52 2008/09/22 12:16:45 kwm Exp $ # PORTNAME= gnome -PORTVERSION= 2.22.1 +PORTVERSION= 2.22.3 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo index 13244d959b1b..f93a875bb83a 100644 --- a/x11-toolkits/py-gnome2/distinfo +++ b/x11-toolkits/py-gnome2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-2.22.1.tar.bz2) = 02054115dc86617da2a80eb87a1f988b -SHA256 (gnome2/gnome-python-2.22.1.tar.bz2) = 559b5d857b4fbc31418bc677f3391182ba1c357cabb8dfee04a1e709a7a63d01 -SIZE (gnome2/gnome-python-2.22.1.tar.bz2) = 552363 +MD5 (gnome2/gnome-python-2.22.3.tar.bz2) = ab12d94954a57de39b25eb7903d8429c +SHA256 (gnome2/gnome-python-2.22.3.tar.bz2) = a1763ef40aa0fc152e1afe6be6b01d69ba305273bd4bd44cad018da42d1bb559 +SIZE (gnome2/gnome-python-2.22.3.tar.bz2) = 588459 diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index 94267b33cb03..8660cd385cab 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -3,14 +3,14 @@ # Whom: marc@informatik.uni-bremen.de # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.54 2007/09/16 17:26:18 ahze Exp $ +# $MCom: ports/x11-toolkits/py-gtk2/Makefile,v 1.58 2008/09/27 01:53:01 mezz Exp $ # PORTNAME= gtk -PORTVERSION= 2.12.1 +PORTVERSION= 2.13.0 PORTREVISION= 1 CATEGORIES= x11-toolkits python -MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pygtk-${PORTVERSION} @@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYNUMERIC} \ USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnometarget libglade2 +USE_GNOME= gnomehack libglade2 USE_PYTHON= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/py-gtk2/distinfo b/x11-toolkits/py-gtk2/distinfo index 68bb84b1c509..f866dc2bb7b2 100644 --- a/x11-toolkits/py-gtk2/distinfo +++ b/x11-toolkits/py-gtk2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pygtk-2.12.1.tar.bz2) = a816346d750d61e3fa67a200e4292694 -SHA256 (gnome2/pygtk-2.12.1.tar.bz2) = 4100ed4bf295b03106308f1cfb9931cc22910401dab785f8bd3af9935f1fe13d -SIZE (gnome2/pygtk-2.12.1.tar.bz2) = 2175955 +MD5 (gnome2/pygtk-2.13.0.tar.bz2) = e1513921bfd3790b456899c483fceaea +SHA256 (gnome2/pygtk-2.13.0.tar.bz2) = 80c5b788a4e7a92349ebfa6494848fcb81f57099609df1ace313458808a58418 +SIZE (gnome2/pygtk-2.13.0.tar.bz2) = 2130260 diff --git a/x11-toolkits/py-gtk2/files/patch-Makefile.in b/x11-toolkits/py-gtk2/files/patch-Makefile.in index b9cedaf23921..1ddb1d6b990b 100644 --- a/x11-toolkits/py-gtk2/files/patch-Makefile.in +++ b/x11-toolkits/py-gtk2/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Tue Sep 5 02:02:53 2006 -+++ Makefile.in Tue Sep 5 02:06:11 2006 -@@ -292,7 +292,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = 1.7 - @BUILD_GTK_TRUE@GTK_SUBDIR = gtk --SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs -+SUBDIRS = codegen . $(GTK_SUBDIR) examples - PLATFORM_VERSION = 2.0 - CLEANFILES = atk.c pango.c pangocairo.c - EXTRA_DIST = \ +--- Makefile.in.orig 2008-09-01 08:50:06.000000000 +0000 ++++ Makefile.in 2008-09-01 08:51:03.000000000 +0000 +@@ -124,7 +124,7 @@ + DATA = $(defs_DATA) $(pkgconfig_DATA) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = . gtk examples tests docs ++DIST_SUBDIRS = . gtk examples + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) diff --git a/x11-toolkits/py-gtk2/files/patch-doc_Makefile.in b/x11-toolkits/py-gtk2/files/patch-doc_Makefile.in new file mode 100644 index 000000000000..857b4fa66e7a --- /dev/null +++ b/x11-toolkits/py-gtk2/files/patch-doc_Makefile.in @@ -0,0 +1,11 @@ +--- docs/Makefile.in.orig 2008-09-03 16:07:35.000000000 +0000 ++++ docs/Makefile.in 2008-09-03 16:07:55.000000000 +0000 +@@ -812,7 +812,7 @@ + html/unixprint-functions.html + + CSS_FILES = $(PYGOBJECT_PYGDOCS)/style.css +-TARGET_DIR = $(datadir)/gtk-doc/html/pygtk ++TARGET_DIR = $(datadir)/doc/py-gtk + CSSdir = $(TARGET_DIR) + EXTRA_DIST = \ + cursors icons \ diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist index 05099ad5b9bf..9dffd29cb82d 100644 --- a/x11-toolkits/py-gtk2/pkg-plist +++ b/x11-toolkits/py-gtk2/pkg-plist @@ -76,9 +76,15 @@ lib/pygtk/2.0/demos/statusicon.pyo lib/pygtk/2.0/demos/stock_browser.py lib/pygtk/2.0/demos/stock_browser.pyc lib/pygtk/2.0/demos/stock_browser.pyo +lib/pygtk/2.0/demos/textscroll.py +lib/pygtk/2.0/demos/textscroll.pyc +lib/pygtk/2.0/demos/textscroll.pyo lib/pygtk/2.0/demos/textview.py lib/pygtk/2.0/demos/textview.pyc lib/pygtk/2.0/demos/textview.pyo +lib/pygtk/2.0/demos/tooltip.py +lib/pygtk/2.0/demos/tooltip.pyc +lib/pygtk/2.0/demos/tooltip.pyo lib/pygtk/2.0/demos/tree_store.py lib/pygtk/2.0/demos/tree_store.pyc lib/pygtk/2.0/demos/tree_store.pyo @@ -121,6 +127,467 @@ lib/pygtk/2.0/pygtk-demo.pyo libdata/pkgconfig/pygtk-2.0.pc %%PORTDOCS%%%%DOCSDIR%%/MAPPING %%PORTDOCS%%%%DOCSDIR%%/THREADS +%%PORTDOCS%%%%DOCSDIR%%/atk-class-reference.html +%%PORTDOCS%%%%DOCSDIR%%/atk-constants.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkaction.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkcomponent.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkdocument.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkeditabletext.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkgobjectaccessible.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkhyperlink.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkhypertext.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkimage.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkimplementor.html +%%PORTDOCS%%%%DOCSDIR%%/class-atknoopobject.html +%%PORTDOCS%%%%DOCSDIR%%/class-atknoopobjectfactory.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkobject.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkobjectfactory.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkrectangle.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkregistry.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkrelation.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkrelationset.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkselection.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkstateset.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkstreamablecontent.html +%%PORTDOCS%%%%DOCSDIR%%/class-atktable.html +%%PORTDOCS%%%%DOCSDIR%%/class-atktext.html +%%PORTDOCS%%%%DOCSDIR%%/class-atkvalue.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkatom.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkcairocontext.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkcolor.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkcolormap.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkcursor.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkdevice.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkdisplay.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkdisplaymanager.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkdragcontext.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkdrawable.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkevent.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkgc.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkimage.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkkeymap.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkpangorenderer.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixbuf.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixbufanimation.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixbufanimationiter.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixbufloader.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkpixmap.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkrectangle.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkregion.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkscreen.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkvisual.html +%%PORTDOCS%%%%DOCSDIR%%/class-gdkwindow.html +%%PORTDOCS%%%%DOCSDIR%%/class-gladexml.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkaboutdialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkaccelgroup.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkaccellabel.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkaccelmap.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkaccessible.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkaction.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkactiongroup.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkadjustment.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkalignment.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkarrow.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkaspectframe.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkassistant.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkbin.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkborder.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkbox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkbuildable.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkbuilder.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkbuttonbox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcalendar.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcelleditable.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcelllayout.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrenderer.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrendereraccel.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrenderercombo.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrendererpixbuf.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrendererprogress.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrendererspin.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrenderertext.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellrenderertoggle.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcellview.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcheckbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcheckmenuitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkclipboard.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcolorbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcolorselection.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcolorselectiondialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcombo.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcombobox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcomboboxentry.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcontainer.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkcurve.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkdialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkdrawingarea.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkeditable.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkentry.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkentrycompletion.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkeventbox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkexpander.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilechooser.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilechooserbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilechooserdialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilechooserwidget.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfilefilter.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfileselection.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfixed.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfontbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfontselection.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkfontselectiondialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkframe.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkgammacurve.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkhandlebox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkhbox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkhbuttonbox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkhpaned.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkhruler.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkhscale.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkhscrollbar.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkhseparator.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconfactory.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconinfo.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconset.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconsource.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkicontheme.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkiconview.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkimage.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkimagemenuitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkimcontext.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkimcontextsimple.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkimmulticontext.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkinputdialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkinvisible.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkitemfactory.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtklabel.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtklayout.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtklinkbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkliststore.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenu.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenubar.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenuitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenushell.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkmenutoolbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkmessagedialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkmisc.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtknotebook.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkobject.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkoptionmenu.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkpagesetup.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkpagesetupunixdialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkpaned.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkpapersize.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkplug.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintcontext.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkprinter.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintjob.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintoperation.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintoperationpreview.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintsettings.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkprintunixdialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkprogressbar.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkradioaction.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkradiobutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkradiomenuitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkradiotoolbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrange.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrcstyle.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentaction.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentchooser.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentchooserdialog.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentchoosermenu.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentchooserwidget.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentfilter.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentinfo.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrecentmanager.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkrequisition.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkruler.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkscale.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkscalebutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkscrollbar.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkscrolledwindow.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkselectiondata.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkseparator.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkseparatormenuitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkseparatortoolitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtksettings.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtksizegroup.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtksocket.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkspinbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkstatusbar.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkstatusicon.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkstyle.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktable.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktearoffmenuitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktextattributes.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktextbuffer.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktextchildanchor.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktextiter.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktextmark.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktexttag.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktexttagtable.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktextview.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktoggleaction.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktogglebutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktoggletoolbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktoolbar.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktoolbutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktoolitem.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktooltip.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktooltips.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreedragdest.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreedragsource.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreeiter.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreemodel.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreemodelfilter.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreemodelsort.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreerowreference.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreeselection.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreesortable.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreestore.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreeview.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtktreeviewcolumn.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkuimanager.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkvbox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkvbuttonbox.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkviewport.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkvolumebutton.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkvpaned.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkvruler.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkvscale.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkvscrollbar.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkvseparator.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkwidget.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkwindow.html +%%PORTDOCS%%%%DOCSDIR%%/class-gtkwindowgroup.html +%%PORTDOCS%%%%DOCSDIR%%/class-hierarchy.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangoattribute.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangoattriterator.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangoattrlist.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangocairocairocontext.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangocairocairofontmap.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangocolor.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangocontext.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangofont.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangofontdescription.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangofontface.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangofontfamily.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangofontmap.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangofontmetrics.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangofontset.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangofontsetsimple.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangoglyphstring.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangolanguage.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangolayout.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangolayoutiter.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangolayoutline.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangorenderer.html +%%PORTDOCS%%%%DOCSDIR%%/class-pangotabarray.html +%%PORTDOCS%%%%DOCSDIR%%/class-pygtkgenericcellrenderer.html +%%PORTDOCS%%%%DOCSDIR%%/class-pygtkgenerictreemodel.html +%%PORTDOCS%%%%DOCSDIR%%/class-pygtktreemodelrow.html +%%PORTDOCS%%%%DOCSDIR%%/class-pygtktreemodelrowiter.html +%%PORTDOCS%%%%DOCSDIR%%/cursors/X_cursor.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/based_arrow_down.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/based_arrow_up.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/boat.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/bogosity.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/bottom_left_corner.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/bottom_right_corner.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/bottom_side.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/bottom_tee.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/box_spiral.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/center_ptr.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/circle.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/clock.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/coffee_mug.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/cross.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/cross_reverse.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/crosshair.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/diamond_cross.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/dot.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/dotbox.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/double_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/draft_large.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/draft_small.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/draped_box.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/exchange.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/fleur.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/gobbler.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/gumby.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/hand1.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/hand2.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/heart.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/icon.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/iron_cross.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/left_ptr.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/left_side.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/left_tee.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/leftbutton.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/ll_angle.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/lr_angle.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/man.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/middlebutton.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/mouse.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/pencil.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/pirate.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/plus.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/question_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/right_ptr.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/right_side.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/right_tee.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/rightbutton.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/rtl_logo.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/sailboat.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_down_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_h_double_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_left_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_right_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_up_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/sb_v_double_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/shuttle.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/sizing.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/spider.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/spraycan.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/star.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/target.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/tcross.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/top_left_arrow.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/top_left_corner.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/top_right_corner.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/top_side.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/top_tee.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/trek.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/ul_angle.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/umbrella.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/ur_angle.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/watch.png +%%PORTDOCS%%%%DOCSDIR%%/cursors/xterm.png +%%PORTDOCS%%%%DOCSDIR%%/gdk-class-reference.html +%%PORTDOCS%%%%DOCSDIR%%/gdk-constants.html +%%PORTDOCS%%%%DOCSDIR%%/gdk-functions.html +%%PORTDOCS%%%%DOCSDIR%%/glade-class-reference.html +%%PORTDOCS%%%%DOCSDIR%%/gtk-class-reference.html +%%PORTDOCS%%%%DOCSDIR%%/gtk-constants.html +%%PORTDOCS%%%%DOCSDIR%%/gtk-functions.html +%%PORTDOCS%%%%DOCSDIR%%/gtk-stock-items.html +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_about_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_add_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_align_center_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_align_justify_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_align_left_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_align_right_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_apply_20.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_bottom_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_broken_image_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_cancel_20.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_cdrom_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_clear_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_close_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_color_picker_25.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_colorselector_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_connect_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_convert_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_copy_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_cut_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_authentication_48.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_error_48.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_info_48.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_question_48.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dialog_warning_48.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_directory_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_disconnect_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dnd_32.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_dnd_multiple_32.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_down_arrow_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_edit_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_exec_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_exit_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_file_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_first_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_font_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_fullscreen_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_harddisk_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_help_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_home_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_index_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_info_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_jump_to_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_jump_to_rtl_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_last_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_leave_fullscreen_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_left_arrow_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_forward_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_next_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_pause_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_play_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_play_rtl_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_previous_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_record_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_rewind_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_media_stop_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_network_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_new_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_no_20.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_ok_20.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_open_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_paste_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_preferences_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_print_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_print_preview_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_properties_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_redo_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_redo_rtl_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_refresh_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_remove_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_revert_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_revert_rtl_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_right_arrow_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_save_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_save_as_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_search_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_search_replace_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_sort_ascending_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_sort_descending_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_spellcheck_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_stop_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_bold_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_indent_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_italic_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_strikethrough_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_underline_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_text_unindent_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_top_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_trash_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_undelete_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_undelete_rtl_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_undo_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_undo_rtl_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_up_arrow_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_yes_20.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_zoom_1_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_zoom_fit_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_zoom_in_24.png +%%PORTDOCS%%%%DOCSDIR%%/icons/stock_zoom_out_24.png +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/index.sgml +%%PORTDOCS%%%%DOCSDIR%%/pango-class-reference.html +%%PORTDOCS%%%%DOCSDIR%%/pango-constants.html +%%PORTDOCS%%%%DOCSDIR%%/pango-functions.html +%%PORTDOCS%%%%DOCSDIR%%/pango-markup-language.html +%%PORTDOCS%%%%DOCSDIR%%/pangocairo-class-reference.html +%%PORTDOCS%%%%DOCSDIR%%/pangocairo-constants.html +%%PORTDOCS%%%%DOCSDIR%%/pangocairo-functions.html +%%PORTDOCS%%%%DOCSDIR%%/pygtk-introduction.html +%%PORTDOCS%%%%DOCSDIR%%/pygtk-reference-format.html +%%PORTDOCS%%%%DOCSDIR%%/pygtk.devhelp +%%PORTDOCS%%%%DOCSDIR%%/unixprint-class-reference.html +%%PORTDOCS%%%%DOCSDIR%%/unixprint-constants.html +%%PORTDOCS%%%%DOCSDIR%%/unixprint-functions.html %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in @@ -134,6 +601,7 @@ libdata/pkgconfig/pygtk-2.0.pc %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/editable-interface.py %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/properties.py %%PORTDOCS%%%%EXAMPLESDIR%%/gobject/signal.py +%%PORTDOCS%%%%EXAMPLESDIR%%/gtk/application.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/bin.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/customtreemodel.py %%PORTDOCS%%%%EXAMPLESDIR%%/gtk/filechooser.py @@ -195,7 +663,9 @@ libdata/pkgconfig/pygtk-2.0.pc %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/sizegroup.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/statusicon.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/stock_browser.py +%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/textscroll.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/textview.py +%%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/tooltip.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/tree_store.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/treemodel.py %%PORTDOCS%%%%EXAMPLESDIR%%/pygtk-demo/demos/ui_manager.py @@ -209,52 +679,11 @@ libdata/pkgconfig/pygtk-2.0.pc %%PORTDOCS%%%%EXAMPLESDIR%%/simple/scribble.py %%PORTDOCS%%%%EXAMPLESDIR%%/simple/simple.py %%PORTDOCS%%%%EXAMPLESDIR%%/simple/tooltip.py -share/pygtk/2.0/codegen/__init__.py -share/pygtk/2.0/codegen/__init__.pyc -share/pygtk/2.0/codegen/__init__.pyo -share/pygtk/2.0/codegen/argtypes.py -share/pygtk/2.0/codegen/argtypes.pyc -share/pygtk/2.0/codegen/argtypes.pyo -share/pygtk/2.0/codegen/codegen.py -share/pygtk/2.0/codegen/codegen.pyc -share/pygtk/2.0/codegen/codegen.pyo -share/pygtk/2.0/codegen/createdefs.py -share/pygtk/2.0/codegen/createdefs.pyc -share/pygtk/2.0/codegen/createdefs.pyo -share/pygtk/2.0/codegen/definitions.py -share/pygtk/2.0/codegen/definitions.pyc -share/pygtk/2.0/codegen/definitions.pyo -share/pygtk/2.0/codegen/defsparser.py -share/pygtk/2.0/codegen/defsparser.pyc -share/pygtk/2.0/codegen/defsparser.pyo -share/pygtk/2.0/codegen/docextract.py -share/pygtk/2.0/codegen/docextract.pyc -share/pygtk/2.0/codegen/docextract.pyo -share/pygtk/2.0/codegen/docgen.py -share/pygtk/2.0/codegen/docgen.pyc -share/pygtk/2.0/codegen/docgen.pyo -share/pygtk/2.0/codegen/h2def.py -share/pygtk/2.0/codegen/h2def.pyc -share/pygtk/2.0/codegen/h2def.pyo -share/pygtk/2.0/codegen/mergedefs.py -share/pygtk/2.0/codegen/mergedefs.pyc -share/pygtk/2.0/codegen/mergedefs.pyo -share/pygtk/2.0/codegen/mkskel.py -share/pygtk/2.0/codegen/mkskel.pyc -share/pygtk/2.0/codegen/mkskel.pyo -share/pygtk/2.0/codegen/override.py -share/pygtk/2.0/codegen/override.pyc -share/pygtk/2.0/codegen/override.pyo -share/pygtk/2.0/codegen/reversewrapper.py -share/pygtk/2.0/codegen/reversewrapper.pyc -share/pygtk/2.0/codegen/reversewrapper.pyo -share/pygtk/2.0/codegen/scmexpr.py -share/pygtk/2.0/codegen/scmexpr.pyc -share/pygtk/2.0/codegen/scmexpr.pyo share/pygtk/2.0/defs/atk-types.defs share/pygtk/2.0/defs/atk.defs share/pygtk/2.0/defs/gdk-2.10.defs share/pygtk/2.0/defs/gdk-2.12.defs +share/pygtk/2.0/defs/gdk-2.14.defs share/pygtk/2.0/defs/gdk-base-types.defs share/pygtk/2.0/defs/gdk-base.defs share/pygtk/2.0/defs/gdk-types.defs @@ -263,6 +692,8 @@ share/pygtk/2.0/defs/gtk-2.10-types.defs share/pygtk/2.0/defs/gtk-2.10.defs share/pygtk/2.0/defs/gtk-2.12-types.defs share/pygtk/2.0/defs/gtk-2.12.defs +share/pygtk/2.0/defs/gtk-2.14-types.defs +share/pygtk/2.0/defs/gtk-2.14.defs share/pygtk/2.0/defs/gtk-base-types.defs share/pygtk/2.0/defs/gtk-base.defs share/pygtk/2.0/defs/gtk-extrafuncs.defs @@ -275,7 +706,6 @@ share/pygtk/2.0/defs/pango.defs share/pygtk/2.0/defs/pangocairo.defs share/pygtk/2.0/defs/pangocairo.override @dirrm share/pygtk/2.0/defs -@dirrm share/pygtk/2.0/codegen @dirrm share/pygtk/2.0 @dirrm share/pygtk %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/simple @@ -289,10 +719,14 @@ share/pygtk/2.0/defs/pangocairo.override %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/glade %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/atk %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/icons +%%PORTDOCS%%@dirrm %%DOCSDIR%%/cursors +%%PORTDOCS%%@dirrm %%DOCSDIR%%/ @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gtk +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0 @dirrm lib/pygtk/2.0/demos/images @dirrm lib/pygtk/2.0/demos @dirrm lib/pygtk/2.0 @dirrm lib/pygtk @dirrm include/pygtk-2.0/pygtk +@dirrm include/pygtk-2.0 diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile index 188908e646b1..0606876c2ea6 100644 --- a/x11-toolkits/py-gtksourceview/Makefile +++ b/x11-toolkits/py-gtksourceview/Makefile @@ -3,13 +3,12 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.10 2008/03/10 15:18:35 ahze Exp $ +# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.14 2008/09/21 06:34:35 kwm Exp $ # PORTNAME= gtksourceview -PORTVERSION= 2.2.0 -PORTREVISION= 1 -CATEGORIES= x11-toolkits gnome python +PORTVERSION= 2.4.0 +CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +19,7 @@ COMMENT= A python bindings for the version 2 of the GtkSourceView library USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnometarget gtksourceview2 pygtk2 +USE_GNOME= gnomehack gnomeprefix gtksourceview2 pygtk2 USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo index f96d4b90fe41..daf8d55238f3 100644 --- a/x11-toolkits/py-gtksourceview/distinfo +++ b/x11-toolkits/py-gtksourceview/distinfo @@ -1,3 +1,3 @@ -MD5 (pygtksourceview-2.2.0.tar.bz2) = 5dd0a9aa99168f989ed04123a65077e4 -SHA256 (pygtksourceview-2.2.0.tar.bz2) = 457484cf4b6c5c18ba4bcd9d35d5879f3a85e6dbf37f07ba4cfa6c20e6271963 -SIZE (pygtksourceview-2.2.0.tar.bz2) = 267402 +MD5 (pygtksourceview-2.4.0.tar.bz2) = 436e2ec467035a8cd174b794932e4cdc +SHA256 (pygtksourceview-2.4.0.tar.bz2) = 437fb779bc0bd9a43806ee7b3a406a1329800e54489cd9579ea0a101870df791 +SIZE (pygtksourceview-2.4.0.tar.bz2) = 271360 diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 469f7389f798..3eb38350af11 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.86 2008/03/10 23:44:02 ahze Exp $ +# $MCom: ports/x11-toolkits/vte/Makefile,v 1.91 2008/09/22 23:42:39 kwm Exp $ # PORTNAME= vte -PORTVERSION= 0.16.14 -PORTREVISION?= 1 +PORTVERSION= 0.17.4 +PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER?= gnome@FreeBSD.org diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index 6bcdda3b1978..f703509a9b03 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vte-0.16.14.tar.bz2) = 9df3e35b81b209952ac1cf7904f7b620 -SHA256 (gnome2/vte-0.16.14.tar.bz2) = 40cf321980d3139c8f084e818504e1366be81bed817eeeec9021257e04c1c0db -SIZE (gnome2/vte-0.16.14.tar.bz2) = 1120379 +MD5 (gnome2/vte-0.17.4.tar.bz2) = ec6cb2668db7146eae7cfc48af98f3ed +SHA256 (gnome2/vte-0.17.4.tar.bz2) = 50ae10aea7fa99c9ae296031782c18ac15663e84eb6ecd94cd0a18c7843987d2 +SIZE (gnome2/vte-0.17.4.tar.bz2) = 1084847 diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure index ec700b9c90f7..70091c3aa2f7 100644 --- a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure +++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure @@ -1,14 +1,22 @@ ---- gnome-pty-helper/configure.orig 2007-07-29 17:28:10.000000000 -0400 -+++ gnome-pty-helper/configure 2007-07-29 17:29:30.000000000 -0400 -@@ -8408,6 +8408,7 @@ ECHO_C!$ECHO_C$ac_delim - ECHO_N!$ECHO_N$ac_delim - ECHO_T!$ECHO_T$ac_delim - LIBS!$LIBS$ac_delim +--- gnome-pty-helper/configure.orig 2008-09-08 19:30:02.000000000 -0400 ++++ gnome-pty-helper/configure 2008-09-08 19:31:21.000000000 -0400 +@@ -673,6 +673,7 @@ AMTAR + am__tar + am__untar + CC ++BSD_PTHREAD_LIBS + CFLAGS + LDFLAGS + CPPFLAGS +@@ -8434,6 +8435,7 @@ AMTAR!$AMTAR$ac_delim + am__tar!$am__tar$ac_delim + am__untar!$am__untar$ac_delim + CC!$CC$ac_delim +BSD_PTHREAD_LIBS!$BSD_PTHREAD_LIBS$ac_delim - build_alias!$build_alias$ac_delim - host_alias!$host_alias$ac_delim - target_alias!$target_alias$ac_delim -@@ -8470,7 +8471,7 @@ LIBOBJS!$LIBOBJS$ac_delim + CFLAGS!$CFLAGS$ac_delim + LDFLAGS!$LDFLAGS$ac_delim + CPPFLAGS!$CPPFLAGS$ac_delim +@@ -8470,7 +8472,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c deleted file mode 100644 index d903dbbee059..000000000000 --- a/x11-toolkits/vte/files/patch-src_keymap.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/keymap.c.orig Tue Oct 22 17:42:20 2002 -+++ src/keymap.c Tue Oct 22 17:42:33 2002 -@@ -18,6 +18,7 @@ - - #ident "$Id: patch-src_keymap.c,v 1.5 2004/11/01 04:45:09 marcus Exp $" - #include "../config.h" -+#include <sys/types.h> - #include <stdlib.h> - #include <string.h> - #include <glib.h> diff --git a/x11-toolkits/vte/files/patch-src_pty.c b/x11-toolkits/vte/files/patch-src_pty.c deleted file mode 100644 index da0f42b81a3c..000000000000 --- a/x11-toolkits/vte/files/patch-src_pty.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/pty.c.orig Tue Feb 13 16:24:15 2007 -+++ src/pty.c Tue Feb 13 16:29:15 2007 -@@ -271,6 +271,7 @@ _vte_pty_run_on_pty (struct vte_pty_chil - GPid *pid, GError **error) - { - gboolean ret = TRUE; -+ extern char **environ; - GError *local_error = NULL; - - if (command != NULL) { diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index 5d20e62c2262..15cb7dfbb283 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -3,6 +3,8 @@ include/vte/pty.h include/vte/reaper.h include/vte/vte.h include/vte/vteaccess.h +include/vte/vtetypebuiltins.h +include/vte/vteversion.h lib/libvte.a lib/libvte.la lib/libvte.so @@ -87,7 +89,7 @@ share/locale/sk/LC_MESSAGES/vte.mo share/locale/sl/LC_MESSAGES/vte.mo share/locale/sq/LC_MESSAGES/vte.mo share/locale/sr/LC_MESSAGES/vte.mo -share/locale/sr@Latn/LC_MESSAGES/vte.mo +share/locale/sr@latin/LC_MESSAGES/vte.mo share/locale/sv/LC_MESSAGES/vte.mo share/locale/ta/LC_MESSAGES/vte.mo share/locale/te/LC_MESSAGES/vte.mo @@ -114,6 +116,8 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index cef8a3fc3825..f81ad05c167d 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,15 +3,14 @@ # Whom: Garrett Rooney <rooneg@electricjellyfish.net> # # $FreeBSD$ -# $MCom: ports/x11-wm/metacity/Makefile,v 1.124 2008/03/09 23:56:13 marcus Exp $ +# $MCom: ports/x11-wm/metacity/Makefile,v 1.140 2008/10/08 04:21:46 marcus Exp $ # PORTNAME= metacity -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.24.0 +PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,13 +20,12 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification CONFLICTS= expocity-[0-9]* USE_BZIP2= yes -USE_GETTEXT= yes USE_XORG= x11 xcomposite xdamage +USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20 USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-render CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index 06c7549488cf..a6116af821aa 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/metacity-2.22.0.tar.bz2) = 8cb6d02cf66a1003532b4f5d2754d696 -SHA256 (gnome2/metacity-2.22.0.tar.bz2) = 3c670b41a214311006dc05f9a005696b9d3fdcb5c80f1275367416600103b3bf -SIZE (gnome2/metacity-2.22.0.tar.bz2) = 2071931 +MD5 (gnome2/metacity-2.24.0.tar.bz2) = d4aa782d5f71b6c42514b239684a4aa3 +SHA256 (gnome2/metacity-2.24.0.tar.bz2) = 90eed0a36aae302db52af12220c4cf863c9cccebd233015104f2d88cb17ec076 +SIZE (gnome2/metacity-2.24.0.tar.bz2) = 2160557 diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure index bbb9c5e9b0a5..155c6ecfc4a7 100644 --- a/x11-wm/metacity/files/patch-configure +++ b/x11-wm/metacity/files/patch-configure @@ -1,17 +1,9 @@ ---- configure.orig 2008-03-09 19:48:04.000000000 -0400 -+++ configure 2008-03-09 19:48:24.000000000 -0400 -@@ -26539,7 +26539,6 @@ echo "${ECHO_T}$have_xrender" >&6; } - - if test x$have_xrender = xyes; then - echo "Building with Render" -- METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION" - fi - fi ## have_composite - -@@ -31011,7 +31010,7 @@ metacity-$VERSION: +--- configure.orig 2008-09-23 00:55:36.000000000 -0400 ++++ configure 2008-09-23 00:55:52.000000000 -0400 +@@ -31530,7 +31530,7 @@ metacity-$VERSION: " - METACITY_MINOR_VERSION=22 + METACITY_MINOR_VERSION=24 -if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then +if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2)) diff --git a/x11-wm/metacity/files/patch-src_core_main.c b/x11-wm/metacity/files/patch-src_core_main.c new file mode 100644 index 000000000000..db73c224f1bd --- /dev/null +++ b/x11-wm/metacity/files/patch-src_core_main.c @@ -0,0 +1,51 @@ +--- src/core/main.c.orig 2008-10-08 00:10:39.000000000 -0400 ++++ src/core/main.c 2008-10-08 00:18:44.000000000 -0400 +@@ -312,6 +312,23 @@ void meta_select_display (gchar *display + /* DO NOT FREE envVar, putenv() sucks */ + putenv (envVar); + } ++ ++static ++void meta_finalize (void) ++{ ++ meta_display_close (meta_get_display (), ++ CurrentTime); /* I doubt correct timestamps matter here */ ++ ++ meta_session_shutdown (); ++} ++ ++static ++void sigterm_handler (int signum) ++{ ++ meta_finalize (); ++ ++ exit (meta_exit_code); ++} + + /** + * This is where the story begins. It parses commandline options and +@@ -352,6 +369,11 @@ main (int argc, char **argv) + g_strerror (errno)); + #endif + ++ act.sa_handler = &sigterm_handler; ++ if (sigaction (SIGTERM, &act, NULL) < 0) ++ g_printerr ("Failed to register SIGTERM handler: %s\n", ++ g_strerror (errno)); ++ + if (g_getenv ("METACITY_VERBOSE")) + meta_set_verbose (TRUE); + if (g_getenv ("METACITY_DEBUG")) +@@ -478,11 +500,8 @@ main (int argc, char **argv) + + g_main_loop_run (meta_main_loop); + +- meta_display_close (meta_get_display (), +- CurrentTime); /* I doubt correct timestamps matter here */ ++ meta_finalize (); + +- meta_session_shutdown (); +- + if (meta_restart_after_quit) + { + GError *err; diff --git a/x11-wm/metacity/files/patch-src_core_util.c b/x11-wm/metacity/files/patch-src_core_util.c new file mode 100644 index 000000000000..b1799e3516d5 --- /dev/null +++ b/x11-wm/metacity/files/patch-src_core_util.c @@ -0,0 +1,11 @@ +--- src/core/util.c.orig 2008-02-27 05:42:51.000000000 +0100 ++++ src/core/util.c 2008-03-21 21:16:14.000000000 +0100 +@@ -23,7 +23,7 @@ + */ + + #define _GNU_SOURCE +-#define _POSIX_C_SOURCE /* for fdopen() */ ++#define _POSIX_C_SOURCE 1 /* for fdopen() */ + + #include <config.h> + #include "util.h" diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index 0b66d8b5ab3f..9ea1d2734b78 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -15,9 +15,10 @@ lib/libmetacity-private.so lib/libmetacity-private.so.0 libdata/pkgconfig/libmetacity-private.pc libexec/metacity-dialog +share/applications/metacity.desktop share/gnome-control-center/keybindings/50-metacity-desktop-key.xml share/gnome-control-center/keybindings/50-metacity-key.xml -share/gnome/wm-properties/metacity.desktop +share/gnome/wm-properties/metacity-wm.desktop share/locale/am/LC_MESSAGES/metacity.mo share/locale/ar/LC_MESSAGES/metacity.mo share/locale/as/LC_MESSAGES/metacity.mo @@ -56,6 +57,7 @@ share/locale/is/LC_MESSAGES/metacity.mo share/locale/it/LC_MESSAGES/metacity.mo share/locale/ja/LC_MESSAGES/metacity.mo share/locale/ka/LC_MESSAGES/metacity.mo +share/locale/kn/LC_MESSAGES/metacity.mo share/locale/ko/LC_MESSAGES/metacity.mo share/locale/ku/LC_MESSAGES/metacity.mo share/locale/lt/LC_MESSAGES/metacity.mo @@ -84,7 +86,7 @@ share/locale/sk/LC_MESSAGES/metacity.mo share/locale/sl/LC_MESSAGES/metacity.mo share/locale/sq/LC_MESSAGES/metacity.mo share/locale/sr/LC_MESSAGES/metacity.mo -share/locale/sr@Latn/LC_MESSAGES/metacity.mo +share/locale/sr@latin/LC_MESSAGES/metacity.mo share/locale/sv/LC_MESSAGES/metacity.mo share/locale/ta/LC_MESSAGES/metacity.mo share/locale/th/LC_MESSAGES/metacity.mo @@ -218,10 +220,13 @@ share/themes/Simple/metacity-1/minimize.png @dirrm %%DATADIR%% @dirrm include/metacity-1/metacity-private @dirrm include/metacity-1 +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES diff --git a/x11/Makefile b/x11/Makefile index 87bf80acb198..488b0064729e 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -92,6 +92,7 @@ SUBDIR += gdesklets-tasklist SUBDIR += gdkxft SUBDIR += gdm + SUBDIR += gegl SUBDIR += ggiterm SUBDIR += glproto SUBDIR += gmessage diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 2daced2d3639..42a182d4b50d 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.117 2008/03/22 04:21:52 mezz Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.142 2009/01/10 01:59:22 mezz Exp $ # PORTNAME= gdm -PORTVERSION= 2.20.8 +PORTVERSION= 2.24.1 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,27 +17,27 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 version of xdm display manager BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - ck-connector.0:${PORTSDIR}/sysutils/consolekit +LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ + execinfo:${PORTSDIR}/devel/libexecinfo RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ - xrdb:${PORTSDIR}/x11/xrdb + ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_XORG= dmx dmxproto -INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_RC_SUBR= gdm USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_GNOME= gnomehack intlhack gnomehier librsvg2 gnomedocutils \ - gnomeprefix +USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \ + gnomeprefix gnomepanel +GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" -CONFIGURE_ARGS=--with-console-kit=yes SUB_FILES+= gdm.pam @@ -45,11 +46,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message GNOME_LOCALSTATEDIR= /var -MAN1= gdm.1 - -OPTIONS= IPV6 "Enable IPv6 support" off \ - KEYRING "Enable GnomeKeyring/PAM integration" on \ - LOG_LIMIT "Limit ~/.xsession-errors size" on +OPTIONS= IPV6 "Enable IPv6 support" on \ + KEYRING "Enable GnomeKeyring/PAM integration" on .include <bsd.port.pre.mk> @@ -66,25 +64,28 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(WITHOUT_LOG_LIMIT) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-daemon_slave.c -.endif - post-patch: @${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \ - ${WRKSRC}/config/Makefile.in + ${WRKSRC}/data/Makefile.in + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/daemon/gdm-session-worker.c \ + ${WRKSRC}/data/gconf.path + @${REINPLACE_CMD} -e 's|/bin/true|/usr/bin/true|g' \ + ${WRKSRC}/data/session-setup.entries @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/configure ${WRKSRC}/po/*.po ${WRKSRC}/gui/*.glade \ - ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.* - @${REINPLACE_CMD} -e 's|/etc/gdm/gdm.conf|${PREFIX}/etc/gdm/gdm.conf|' \ - ${WRKSRC}/docs/gdm.1 + ${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po post-install: + ${INSTALL_DATA} ${WRKSRC}/data/gconf.path \ + ${PREFIX}/share/gdm/gconf.path + ${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \ + ${PREFIX}/share/gdm/session-setup.entries .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - ${INSTALL_DATA} ${WRKSRC}/config/gdm.conf-custom \ + ${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \ ${PREFIX}/etc/gdm/custom.conf.default + ${MKDIR} ${PREFIX}/share/xsessions ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm @${MKDIR} ${PREFIX}/etc/gdm/Sessions @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \ diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index e1471686b775..70511a9d1f11 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.20.8.tar.bz2) = c183b017280e6ef25ad38d618aac2271 -SHA256 (gnome2/gdm-2.20.8.tar.bz2) = cef608d263866003f573a9b80d29c635a74ee73343d3f45bb381cf50b5c52894 -SIZE (gnome2/gdm-2.20.8.tar.bz2) = 3932232 +MD5 (gnome2/gdm-2.24.1.tar.bz2) = 31139d7a79096463b127b4790058b056 +SHA256 (gnome2/gdm-2.24.1.tar.bz2) = 8869f464818a1626e481bba5c562bdb972ffb74f1a9da91d01199fa860ee040f +SIZE (gnome2/gdm-2.24.1.tar.bz2) = 2579979 diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c deleted file mode 100644 index b493dcd80ad9..000000000000 --- a/x11/gdm/files/extra-patch-daemon_slave.c +++ /dev/null @@ -1,26 +0,0 @@ ---- daemon/slave.c.orig 2007-09-17 10:45:50.000000000 -0400 -+++ daemon/slave.c 2007-09-25 13:42:06.000000000 -0400 -@@ -373,8 +373,7 @@ - break; - } - -- if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES || -- got_xfsz_signal) -+ if G_UNLIKELY (got_xfsz_signal) - continue; - - /* write until we succeed in writing something */ -@@ -397,13 +396,6 @@ - - d->xsession_errors_bytes += r; - -- if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES && -- ! got_xfsz_signal) { -- VE_IGNORE_EINTR (write (d->xsession_errors_fd, -- "\n...Too much output, ignoring rest...\n", -- strlen ("\n...Too much output, ignoring rest...\n"))); -- } -- - /* there wasn't more then buf available, so no need to try reading - * again, unless we really want to */ - if (r < sizeof (buf) && ! read_until_eof) diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index 370a40fa1c02..ecb043cd5041 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,6 +1,6 @@ #!/bin/sh # $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.in,v 1.28 2008/03/11 04:21:47 mezz Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.32 2008/08/17 17:31:43 marcus Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused syscons dbus @@ -18,7 +18,7 @@ gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO} export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin -name=gdm +name="gdm" rcvar=`set_rcvar` command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" diff --git a/x11/gdm/files/patch-common_Makefile.in b/x11/gdm/files/patch-common_Makefile.in new file mode 100644 index 000000000000..2ab0a50015ea --- /dev/null +++ b/x11/gdm/files/patch-common_Makefile.in @@ -0,0 +1,20 @@ +--- common/Makefile.in.orig 2008-08-20 14:34:16.000000000 -0400 ++++ common/Makefile.in 2008-08-20 14:36:50.000000000 -0400 +@@ -428,7 +428,8 @@ gdm_crash_logger_CPPFLAGS = \ + -DLOCALSTATEDIR=\"$(localstatedir)\" \ + $(NULL) + +-gdm_crash_logger_LDADD = $(GTHREAD_LIBS) ++gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \ ++ -lexecinfo + @MKDTEMP_MISSING_FALSE@MKDTEMP_FILES = + @MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h + libgdmcommon_la_SOURCES = \ +@@ -473,6 +474,7 @@ libgdmcommon_la_CFLAGS = \ + $(NULL) + + libgdmcommon_la_LIBADD = \ ++ -lexecinfo \ + $(NULL) + + libgdmcommon_la_LDFLAGS = \ diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c new file mode 100644 index 000000000000..4c38474cb637 --- /dev/null +++ b/x11/gdm/files/patch-common_gdm-address.c @@ -0,0 +1,27 @@ +--- common/gdm-address.c.orig 2008-04-17 23:29:27.000000000 -0400 ++++ common/gdm-address.c 2008-05-02 14:36:15.000000000 -0400 +@@ -29,6 +29,8 @@ + #include <stropts.h> + #endif + #include <string.h> ++#include <sys/types.h> ++#include <sys/param.h> + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif +@@ -37,7 +39,6 @@ + #endif + #include <netdb.h> + #include <sys/ioctl.h> +-#include <net/if.h> + + #ifndef G_OS_WIN32 + #include <sys/select.h> +@@ -47,6 +48,7 @@ + #include <winsock2.h> + #include <ws2tcpip.h> + #endif ++#include <net/if.h> + + #include <glib-object.h> + diff --git a/x11/gdm/files/patch-common_gdm-common.c b/x11/gdm/files/patch-common_gdm-common.c new file mode 100644 index 000000000000..9fa4acafa6c8 --- /dev/null +++ b/x11/gdm/files/patch-common_gdm-common.c @@ -0,0 +1,13 @@ +--- common/gdm-common.c.orig 2007-12-23 10:29:20.000000000 +0100 ++++ common/gdm-common.c 2007-12-23 10:29:34.000000000 +0100 +@@ -33,6 +33,10 @@ + + #include "gdm-common.h" + ++#ifndef ENODATA ++#define ENODATA EAGAIN ++#endif ++ + void + gdm_set_fatal_warnings_if_unstable (void) + { diff --git a/x11/gdm/files/patch-common_gdm-settings-keys.h b/x11/gdm/files/patch-common_gdm-settings-keys.h new file mode 100644 index 000000000000..06ebc0800e18 --- /dev/null +++ b/x11/gdm/files/patch-common_gdm-settings-keys.h @@ -0,0 +1,10 @@ +--- common/gdm-settings-keys.h.orig 2008-02-20 16:27:34.000000000 -0500 ++++ common/gdm-settings-keys.h 2008-02-25 22:23:35.000000000 -0500 +@@ -30,6 +30,7 @@ G_BEGIN_DECLS + #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable" + #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin" + #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay" ++#define GDM_KEY_VT "daemon/VT" + + #define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable" + #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending" diff --git a/x11/gdm/files/patch-config.h.in b/x11/gdm/files/patch-config.h.in new file mode 100644 index 000000000000..d17901da1124 --- /dev/null +++ b/x11/gdm/files/patch-config.h.in @@ -0,0 +1,12 @@ +--- config.h.in.orig 2007-11-02 20:48:28.000000000 -0400 ++++ config.h.in 2007-11-02 20:49:39.000000000 -0400 +@@ -23,6 +23,9 @@ + #undef HAVE_LC_MESSAGES + #undef HAVE_LIBSM + #undef HAVE_LIBXDMCP ++#undef HAVE_LOGIN ++#undef HAVE_LOGOUT ++#undef HAVE_LOGWTMP + #undef HAVE_LOGINCAP + #undef HAVE_LOGINDEVPERM + #undef HAVE_LOGINRESTRICTIONS diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in deleted file mode 100644 index 6382bd445fd8..000000000000 --- a/x11/gdm/files/patch-config_gdm.conf.in +++ /dev/null @@ -1,17 +0,0 @@ ---- config/gdm.conf.in.orig Mon Apr 9 01:15:16 2007 -+++ config/gdm.conf.in Mon Apr 9 09:38:08 2007 -@@ -174,11 +174,11 @@ - # using this Xnest, the value should be true. - XnestUnscaledFontPath=@X_XNEST_UNSCALED_FONTPATH@ - --# Automatic VT allocation. Right now only works on Linux. This way we force -+# Automatic VT allocation. This way we force - # X to use specific vts. Turn VTAllocation to false if this is causing - # problems. --#FirstVT=7 --#VTAllocation=true -+FirstVT=9 -+VTAllocation=true - # Should double login be treated with a warning (and possibility to change VT's - # on Linux and FreeBSD systems for console logins) - #DoubleLoginWarning=true diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias deleted file mode 100644 index eb004366166d..000000000000 --- a/x11/gdm/files/patch-config_locale.alias +++ /dev/null @@ -1,191 +0,0 @@ ---- config/locale.alias.orig 2008-03-10 21:53:02.000000000 -0500 -+++ config/locale.alias 2008-03-10 21:53:37.000000000 -0500 -@@ -14,134 +14,57 @@ - # - # - George - --C(POSIX) C,POSIX --Afrikaans af_ZA.UTF-8,af_ZA --Albanian sq_AL.UTF-8,sq_AL --Amharic am_ET.UTF-8,am_ET --Arabic(Egypt) ar_EG.UTF-8,ar_EG --Arabic(Lebanon) ar_LB.UTF-8,ar_LB --Arabic(SaudiArabia) ar_SA.UTF-8,ar_SA --Armenian hy_AM.UTF-8,hy_AM --Azerbaijani az_AZ.UTF-8,az_AZ --Azerbaijani(Iran) az_IR.UTF-8,az_IR --Basque eu_ES.UTF-8,eu_ES --Belarusian be_BY.UTF-8,be_BY --Belarusian(Latin) be_BY.UTF-8@latin,be_BY@latin --Bengali bn_BD.UTF-8,bn_BD --Bengali(India) bn_IN.UTF-8,bn_IN --Bosnian bs_BA.UTF-8,bs_BA --Breton br_FR.UTF-8,br_FR --Bulgarian bg_BG.UTF-8,bg_BG --Catalan ca_ES.UTF-8,ca_ES --Chinese(ChinaMainland) zh_CN.UTF-8,zh_CN --Chinese(GB18030) zh_CN.GB18030 --Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK --Chinese(Singapore) zh_SG.UTF-8,zh_SG --Chinese(Taiwan) zh_TW.UTF-8,zh_TW --Croatian hr_HR.UTF-8,hr_HR --Czech cs_CZ.UTF-8,cs_CZ --Danish da_DK.UTF-8,da_DK --Dutch nl_NL.UTF-8,nl_NL --Dutch(Belgium) nl_BE.UTF-8,nl_BE --English(Australia) en_AU.UTF-8,en_AU --English(Canada) en_CA.UTF-8,en_CA --English(Ireland) en_IE.UTF-8,en_IE --English(Malta) en_MT.UTF-8,en_MT --English(NewZealand) en_NZ.UTF-8,en_NZ --English(SouthAfrica) en_ZA.UTF-8,en_ZA --English(UK) en_GB.UTF-8,en_GB --English(USA) en_US.UTF-8,en_US --Esperanto eo.UTF-8,eo --Estonian et_EE.UTF-8,et_EE --Finnish fi_FI.UTF-8,fi_FI --French fr_FR.UTF-8,fr_FR --French(Belgium) fr_BE.UTF-8,fr_BE --French(Canada) fr_CA.UTF-8,fr_CA --French(Luxembourg) fr_LU.UTF-8,fr_LU --French(Switzerland) fr_CH.UTF-8,fr_CH --Galician gl_ES.UTF-8,gl_ES --German de_DE.UTF-8,de_DE --German(Austria) de_AT.UTF-8,de_AT --German(Switzerland) de_CH.UTF-8,de_CH --German(Luxembourg) de_LU.UTF-8,de_LU --Greek el_GR.UTF-8,el_GR --Greek(Cyprus) el_CY.UTF-8,el_CY --Gujarati gu_IN.UTF-8,gu_IN --Hebrew he_IL.UTF-8,he_IL --Hindi hi_IN.UTF-8,hi_IN --Hungarian hu_HU.UTF-8,hu_HU --Icelandic is_IS.UTF-8,is_IS --Indonesian id_ID.UTF-8,id_ID --Interlingua ia.UTF-8,ia --Irish ga_IE.UTF-8,ga_IE --Italian it_IT.UTF-8,it_IT --Japanese ja_JP.UTF-8,ja_JP --Kannada kn_IN.UTF-8,kn_IN --Kazakh kk_KZ.UTF-8,kk_KZ --Kinyarwanda rw_RW.UTF-8,rw_RW --Korean ko_KR.UTF-8,ko_KR --Latvian lv_LV.UTF-8,lv_LV --Limburgish li_NL.UTF-8,li_NL --Limburgish(Belgium) li_BE.UTF-8,li_BE --Limburgish(Germany) li_DE.UTF-8,li_DE --Lithuanian lt_LT.UTF-8,lt_LT --Macedonian mk_MK.UTF-8,mk_MK --Malayalam ml_IN.UTF-8,ml_IN --Malay ms_MY.UTF-8,ms_MY --Maltese mt_MT.UTF-8,mt_MT --Maori mi_NZ.UTF-8,mi_NZ --Marathi mr_IN.UTF-8,mr_IN --Mongolian mn_MN.UTF-8,mn_MN --Nepali ne_NP.UTF-8,ne_NP --NorthernSotho nso_ZA.UTF-8,nso_ZA --Norwegian(bokmal) nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO --Norwegian(nynorsk) nn_NO.UTF-8,nn_NO --Oriya or_IN.UTF-8,or_IN --Persian fa_IR.UTF-8,fa_IR --Polish pl_PL.UTF-8,pl_PL --Portuguese(Brazilian) pt_BR.UTF-8,pt_BR --Portuguese pt_PT.UTF-8,pt_PT --Punjabi pa_IN.UTF-8,pa_IN --Romanian ro_RO.UTF-8,ro_RO --Russian ru_RU.UTF-8,ru_RU --Serbian sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU --Serbian(Montenegro) sr_ME.UTF-8
--Serbian(Serbia) sr_RS.UTF-8
--Serbian(Bosnia) sh_BA.UTF-8,sh_BA --Serbian(Latin) sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn --Serbian(Jekavian) sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije --Slovak sk_SK.UTF-8,sk_SK --Slovenian sl_SI.UTF-8,sl_SI --Spanish es_ES.UTF-8,es_ES --Spanish(Argentina) es_AR.UTF-8,es_AR --Spanish(Bolivia) es_BO.UTF-8,es_BO --Spanish(Chile) es_CL.UTF-8,es_CL --Spanish(Colombia) es_CO.UTF-8,es_CO --Spanish(CostaRica) es_CR.UTF-8,es_CR --Spanish(Ecuador) es_EC.UTF-8,es_EC --Spanish(Guatemala) es_GT.UTF-8,es_GT --Spanish(Mexico) es_MX.UTF-8,es_MX --Spanish(Nicaragua) es_NI.UTF-8,es_NI --Spanish(Panama) es_PA.UTF-8,es_PA --Spanish(Peru) es_PE.UTF-8,es_PE --Spanish(Paraguay) es_PY.UTF-8,es_PY --Spanish(ElSalvador) es_SV.UTF-8,es_SV --Spanish(Uruguay) es_UY.UTF-8,es_UY --Spanish(Venezuela) es_VE.UTF-8,es_VE --Swedish(Finland) sv_FI.UTF-8,sv_FI --Swedish sv_SE.UTF-8,sv_SE --Tagalog tl_PH.UTF-8,tl_PH --Tajik tg_TJ.UTF-8,tg_TJ --Tamil ta_IN.UTF-8,ta_IN --Telugu te_IN.UTF-8,te_IN --Thai th_TH.UTF-8,th_TH --Turkish tr_TR.UTF-8,tr_TR --Ukrainian uk_UA.UTF-8,uk_UA --Uzbek uz_UZ.UTF-8,uz_UZ --Uzbek(Latin) uz_UZ.UTF-8@Latn,uz_UZ@Latn --Vietnamese vi_VN.UTF-8,vi_VN --Walloon wa_BE.UTF-8,wa_BE --Welsh cy_GB.UTF-8,cy_GB --Xhosa xh_ZA.UTF-8,xh_ZA --Yiddish yi.UTF-8,yi --Zulu zu_ZA.UTF-8,zu_ZA -+C(POSIX) C,POSIX -+Afrikaans af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1 -+Amharic am_ET.UTF-8 -+Armenian hy_AM.UTF-8 -+Basque eu_ES.UTF-8,eu_ES.ISO8859-15,eu_ES.ISO8859-1 -+Byelorussian be_BY.UTF-8,be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5 -+Bulgarian bg_BG.UTF-8,bg_BG.CP1251 -+Catalan ca_ES.UTF-8,ca_ES.ISO8859-15,ca_ES.ISO8859-1 -+Chinese(simplified) zh_CN.UTF-8,zh_CN.EUC,zh_CN.eucCN -+Chinese(traditional) zh_TW.UTF-8,zh_TW.Big5 -+Chinese(Hong-Kong) zh_HK.UTF-8,zh_HK.Big5HKSCS -+Croatian hr_HR.UTF-8,hr_HR.ISO8859-2 -+Czech cs_CZ.UTF-8,cs_CZ.ISO8859-2 -+Danish da_DK.UTF-8,da_DK.ISO8859-15,da_DK.ISO8859-1 -+Dutch nl_NL.UTF-8,nl_NL.ISO8859-15,nl_NL.ISO8859-1 -+Dutch(Belgian) nl_BE.UTF-8,nl_BE.ISO8859-15,nl_BE.ISO8859-1 -+English(American) en_US.UTF-8,en_US.ISO8859-1,en_US.ISO8859-15 -+English(Australian) en_AU.UTF-8,en_AU.ISO8859-1,en_AU.ISO8859-15 -+English(British) en_GB.UTF-8,en_GB.ISO8859-1,en_GB.ISO8859-15 -+English(Canadian) en_CA.UTF-8,en_CA.ISO8859-1,en_CA.ISO8859-15 -+English(Irish) en_IE.UTF-8,en_IE.ISO8859-1,en_IE.ISO8859-15 -+English(New-Zealand) en_NZ.UTF-8,en_NZ.ISO8859-1,en_NZ.ISO8859-15 -+Estonian et_EE.UTF-8,et_EE.ISO8859-15 -+Finnish fi_FI.UTF-8,fi_FI.ISO8859-15,fi_FI.ISO8859-1 -+French fr_FR.UTF-8,fr_FR.ISO8859-15,fr_FR.ISO8859-1 -+French(Belgium) fr_BE.UTF-8,fr_BE.ISO8859-15,fr_BE.ISO8859-1 -+French(Canadian) fr_CA.UTF-8,fr_CA.ISO8859-1,fr_CA.ISO8859-15 -+French(Swiss) fr_CH.UTF-8,fr_CH.ISO8859-15,fr_CH.ISO8859-1 -+German de_DE.UTF-8,de_DE.ISO8859-15,de_DE.ISO8859-1 -+German(Austria) de_AT.UTF-8,de_AT.ISO8859-15,de_AT.ISO8859-1 -+German(Switzerland) de_CH.UTF-8,de_CH.ISO8859-15,de_CH.ISO8859-1 -+Greek el_GR.UTF-8,el_GR.ISO8859-7 -+Hebrew he_IL.UTF-8 -+Hindi hi_IN.ISCII-DEV -+Hungarian hu_HU.UTF-8,hu_HU.ISO8859-2 -+Icelandic is_IS.UTF-8,is_IS.ISO8859-1,is_IS.ISO8859-15 -+Italian it_IT.UTF-8,it_IT.ISO8859-15,it_IT.ISO8859-1 -+Italian(Swiss) it_CH.UTF-8,it_CH.ISO8859-15,it_CH.ISO8859-1 -+Japanese ja_JP.UTF-8,ja_JP.EUC,ja_JP.eucJP -+Korean ko_KR.UTF-8,ko_KR.EUC,ko_KR.eucKR -+Lithuanian lt_LT.UTF-8,lt_LT.ISO8859-4,lt_LT.ISO8859-13 -+Norwegian(bokmal) nb_NO.UTF-8,nb_NO.ISO8859-1,nb_NO.ISO8859-15,no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15 -+Polish pl_PL.UTF-8,pl_PL.ISO8859-2 -+Portuguese pt_PT.UTF-8,pt_PT.ISO8859-15,pt_PT.ISO8859-1 -+Portuguese(Brazilian) pt_BR.UTF-8,pt_BR.ISO8859-1 -+Romanian ro_RO.UTF-8,ro_RO.ISO8859-2 -+Russian ru_RU.UTF-8,ru_RU.ISO8859-5 -+Serbian sr_YU.UTF-8,sr_YU.ISO8859-2,sr_YU.ISO8859-5 -+Slovak sk_SK.UTF-8,sk_SK.ISO8859-2 -+Slovenian sl_SI.UTF-8,sl_SI.ISO8859-2 -+Spanish es_ES.UTF-8,es_ES.ISO8859-15,es_ES.ISO8859-1 -+Swedish sv_SV.UTF-8,sv_SE.ISO8859-1 -+Turkish tr_TR.UTF-8,tr_TR.ISO8859-9 -+Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5 diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure deleted file mode 100644 index 18b1e2742f57..000000000000 --- a/x11/gdm/files/patch-configure +++ /dev/null @@ -1,137 +0,0 @@ ---- configure.orig 2007-10-22 00:31:04.000000000 -0400 -+++ configure 2007-10-22 00:34:52.000000000 -0400 -@@ -29593,15 +29592,13 @@ fi - { echo "$as_me:$LINENO: result: $ac_cv_lib_util_login" >&5 - echo "${ECHO_T}$ac_cv_lib_util_login" >&6; } - if test $ac_cv_lib_util_login = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBUTIL 1 -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_LOGIN 1 - _ACEOF -- -- LIBS="-lutil $LIBS" -- -+ -+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" - fi - -- - { echo "$as_me:$LINENO: checking for logout in -lutil" >&5 - echo $ECHO_N "checking for logout in -lutil... $ECHO_C" >&6; } - if test "${ac_cv_lib_util_logout+set}" = set; then -@@ -29664,12 +29661,80 @@ fi - { echo "$as_me:$LINENO: result: $ac_cv_lib_util_logout" >&5 - echo "${ECHO_T}$ac_cv_lib_util_logout" >&6; } - if test $ac_cv_lib_util_logout = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBUTIL 1 -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_LOGOUT 1 -+_ACEOF -+ -+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" -+fi -+ -+{ echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5 -+echo $ECHO_N "checking for logwtmp in -lutil... $ECHO_C" >&6; } -+if test "${ac_cv_lib_util_logwtmp+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lutil $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char logwtmp (); -+int -+main () -+{ -+return logwtmp (); -+ ; -+ return 0; -+} - _ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $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 -+ (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 -+ ac_cv_lib_util_logwtmp=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- LIBS="-lutil $LIBS" -+ ac_cv_lib_util_logwtmp=no -+fi - -+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_util_logwtmp" >&5 -+echo "${ECHO_T}$ac_cv_lib_util_logwtmp" >&6; } -+if test $ac_cv_lib_util_logwtmp = yes; then -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_LOGWTMP 1 -+_ACEOF -+ -+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" - fi - - -@@ -33472,18 +33537,18 @@ esac - - # allow user to override the host-specific default - --test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH} --test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND} --test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND} --test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND} --test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND} --test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL} --test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM} --test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD} --test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED} --test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE} --test "x$UTMP_PSEUDO_DEVICE" == x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE} --test "x$GDM_RBAC_SYSCMD_KEYS" == x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS} -+test "x$GDM_USER_PATH" = x && GDM_USER_PATH=${HOST_GDM_USER_PATH} -+test "x$GDM_HALT_COMMAND" = x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND} -+test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND} -+test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND} -+test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND} -+test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL} -+test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM} -+test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD} -+test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED} -+test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE} -+test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE} -+test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS} - - # On Solaris, the /usr/bin/Xserver script is used to decide whether to - # use Xsun or Xorg, so this is used on Solaris. diff --git a/x11/gdm/files/patch-daemon-gdm-server.c b/x11/gdm/files/patch-daemon-gdm-server.c new file mode 100644 index 000000000000..079c62c66b6a --- /dev/null +++ b/x11/gdm/files/patch-daemon-gdm-server.c @@ -0,0 +1,73 @@ +--- daemon/gdm-server.c.orig 2008-03-17 19:11:00.000000000 -0400 ++++ daemon/gdm-server.c 2008-08-25 16:11:10.000000000 -0400 +@@ -44,6 +44,10 @@ + #include "gdm-common.h" + #include "gdm-signal-handler.h" + ++#include "gdm-settings.h" ++#include "gdm-settings-direct.h" ++#include "gdm-settings-keys.h" ++ + #include "gdm-server.h" + + extern char **environ; +@@ -77,6 +81,7 @@ struct GdmServerPrivate + char *parent_display_name; + char *parent_auth_file; + char *chosen_hostname; ++ char *vt; + + guint child_watch_id; + }; +@@ -306,7 +311,7 @@ gdm_server_resolve_command_line (GdmServ + argv[len++] = g_strdup ("tcp"); + } + +- if (vtarg != NULL && ! gotvtarg) { ++ if (vtarg != NULL && ! gotvtarg && strncmp (server->priv->display_name, ":0", 2) == 0) { + argv[len++] = g_strdup (vtarg); + } + +@@ -673,7 +678,7 @@ gdm_server_start (GdmServer *server) + gboolean res; + + /* fork X server process */ +- res = gdm_server_spawn (server, NULL); ++ res = gdm_server_spawn (server, server->priv->vt); + + return res; + } +@@ -925,12 +930,33 @@ static void + gdm_server_init (GdmServer *server) + { + ++ int vt; ++ gboolean has_vt; ++ GdmSettings *settings = NULL; + server->priv = GDM_SERVER_GET_PRIVATE (server); + ++ ++ settings = gdm_settings_new(); ++ if (settings == NULL) { ++ g_assert ("Unable to initialize settings"); ++ } ++ ++ if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) { ++ g_assert ("Unable to initialize settings"); ++ } ++ ++ has_vt = gdm_settings_direct_get_int (GDM_KEY_VT, &vt); ++ ++ g_object_unref (settings); ++ + server->priv->pid = -1; + server->priv->command = g_strdup (X_SERVER " -br -verbose"); + server->priv->log_dir = g_strdup (LOGDIR); + ++ if (has_vt) { ++ server->priv->vt = g_strdup_printf ("vt %d", vt); ++ } ++ + add_ready_handler (server); + } + diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c new file mode 100644 index 000000000000..e3062eeeaa89 --- /dev/null +++ b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c @@ -0,0 +1,10 @@ +--- daemon/gdm-xdmcp-display-factory.c.orig 2007-11-01 10:15:58.269325570 -0400 ++++ daemon/gdm-xdmcp-display-factory.c 2007-11-01 10:20:19.093220785 -0400 +@@ -35,6 +35,7 @@ + #include <netdb.h> + #include <arpa/inet.h> + #include <net/if.h> ++#include <netinet/in.h> + #ifdef HAVE_SYS_SOCKIO_H + #include <sys/sockio.h> + #endif diff --git a/x11/gdm/files/patch-daemon_Makefile.in b/x11/gdm/files/patch-daemon_Makefile.in new file mode 100644 index 000000000000..9186a23e387f --- /dev/null +++ b/x11/gdm/files/patch-daemon_Makefile.in @@ -0,0 +1,10 @@ +--- daemon/Makefile.in.orig 2007-11-02 20:54:53.000000000 -0400 ++++ daemon/Makefile.in 2007-11-02 20:55:08.000000000 -0400 +@@ -451,6 +451,7 @@ test_session_SOURCES = \ + + test_session_LDADD = \ + $(DAEMON_LIBS) \ ++ $(EXTRA_DAEMON_LIBS) \ + $(PAM_LIBS) \ + $(top_builddir)/common/libgdmcommon.la \ + $(NULL) diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c new file mode 100644 index 000000000000..5f3a1b9ee2f0 --- /dev/null +++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c @@ -0,0 +1,11 @@ +--- daemon/gdm-session-worker.c.orig 2008-07-30 19:15:47.000000000 -0400 ++++ daemon/gdm-session-worker.c 2008-08-25 12:50:00.000000000 -0400 +@@ -332,7 +332,7 @@ gdm_session_execute (const char *file, + * what to search if PATH is unset. POSIX may, dunno. + */ + +- path = "/bin:/usr/bin:."; ++ path = "/bin:/usr/bin:/usr/local/bin:."; + } + + len = strlen (file) + 1; diff --git a/x11/gdm/files/patch-daemon_gdmconsolekit.c b/x11/gdm/files/patch-daemon_gdmconsolekit.c deleted file mode 100644 index b07647071d08..000000000000 --- a/x11/gdm/files/patch-daemon_gdmconsolekit.c +++ /dev/null @@ -1,11 +0,0 @@ ---- daemon/gdmconsolekit.c.orig 2007-08-30 22:57:18.000000000 -0400 -+++ daemon/gdmconsolekit.c 2007-08-30 22:57:35.000000000 -0400 -@@ -457,7 +457,7 @@ open_ck_session (struct passwd *pwent, - char *device; - - /* FIXME: how does xorg construct this */ -- device = g_strdup_printf ("/dev/tty%d", d->vt); -+ device = g_strdup_printf ("/dev/ttyv%d", d->vt - 1); - add_param_string (&iter_struct, "x11-display-device", device); - g_free (device); - } diff --git a/x11/gdm/files/patch-config_Xsession.in b/x11/gdm/files/patch-data_Xsession.in index c2f25be0e9dd..894c97d1620c 100644 --- a/x11/gdm/files/patch-config_Xsession.in +++ b/x11/gdm/files/patch-data_Xsession.in @@ -1,5 +1,5 @@ ---- config/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400 -+++ config/Xsession.in 2008-06-09 01:29:59.000000000 -0400 +--- data/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400 ++++ data/Xsession.in 2008-06-09 01:29:59.000000000 -0400 @@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then fi fi diff --git a/x11/gdm/files/patch-data_gconf.path b/x11/gdm/files/patch-data_gconf.path new file mode 100644 index 000000000000..2efdb3cc975d --- /dev/null +++ b/x11/gdm/files/patch-data_gconf.path @@ -0,0 +1,9 @@ +--- data/gconf.path.orig 2008-12-26 17:04:03.000000000 -0500 ++++ data/gconf.path 2008-12-26 17:04:13.000000000 -0500 +@@ -1,5 +1,5 @@ + # treat system-wide settings as mandatory +-xml:readonly:/etc/gconf/gconf.xml.system ++xml:readonly:%%LOCALBASE%%/etc/gconf/gconf.xml.system + + # override some settings + # we treat settings in this location as diff --git a/x11/gdm/files/patch-data_gdm.schemas.in.in b/x11/gdm/files/patch-data_gdm.schemas.in.in new file mode 100644 index 000000000000..ae5572ddde3e --- /dev/null +++ b/x11/gdm/files/patch-data_gdm.schemas.in.in @@ -0,0 +1,14 @@ +--- data/gdm.schemas.in.in.orig 2007-12-13 12:14:19.000000000 -0500 ++++ data/gdm.schemas.in.in 2007-12-13 12:15:05.000000000 -0500 +@@ -11,6 +11,11 @@ + <signature>s</signature> + <default>gdm</default> + </schema> ++ <schema> ++ <key>daemon/VT</key> ++ <signature>i</signature> ++ <default>9</default> ++ </schema> + + <schema> + <key>xdmcp/Enable</key> diff --git a/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in new file mode 100644 index 000000000000..7febf5165bdd --- /dev/null +++ b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in @@ -0,0 +1,7 @@ +--- data/greeter-autostart/gdm-simple-greeter.desktop.in.in.orig 2008-11-23 22:22:04.000000000 -0500 ++++ data/greeter-autostart/gdm-simple-greeter.desktop.in.in 2008-11-23 22:22:09.000000000 -0500 +@@ -5,4 +5,3 @@ Exec=@LIBEXECDIR@/gdm-simple-greeter + OnlyShowIn=GNOME; + X-GNOME-Autostart-Phase=Application + X-GNOME-Autostart-Notify=true +-X-GNOME-AutoRestart=true diff --git a/x11/gdm/files/patch-gui_gdmchooser.c b/x11/gdm/files/patch-gui_gdmchooser.c deleted file mode 100644 index 42ce461e242e..000000000000 --- a/x11/gdm/files/patch-gui_gdmchooser.c +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- gui/gdmchooser.c.orig -+++ gui/gdmchooser.c -@@ -1123,6 +1123,12 @@ - have_ipv6 = FALSE; - else - have_ipv6 = TRUE; -+ /* Net- & FreeBSD default to V6ONLY */ -+ { -+ int no = 0; -+ setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no)); -+ } -+ - #endif - if ( ! have_ipv6) { - if ((sockfd = socket (AF_INET, SOCK_DGRAM, 0)) == -1) { diff --git a/x11/gdm/files/patch-gui_gdmsetup.c b/x11/gdm/files/patch-gui_gdmsetup.c deleted file mode 100644 index 423000cb6fec..000000000000 --- a/x11/gdm/files/patch-gui_gdmsetup.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gui/gdmsetup.c.orig Thu Jun 30 16:47:06 2005 -+++ gui/gdmsetup.c Mon Jul 4 02:53:12 2005 -@@ -3270,7 +3271,7 @@ theme_install_response (GtkWidget *choos - /* HACK! */ - argv[0] = chown; - argv[1] = "-R"; -- argv[2] = "root:root"; -+ argv[2] = "root:wheel"; - argv[3] = quoted; - argv[4] = NULL; - simple_spawn_sync (argv); diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c new file mode 100644 index 000000000000..6f0c08d8a00a --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c @@ -0,0 +1,20 @@ +--- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2008-03-04 14:42:37.000000000 -0500 ++++ gui/simple-chooser/gdm-host-chooser-widget.c 2008-08-03 01:48:49.000000000 -0400 +@@ -442,7 +442,7 @@ find_broadcast_addresses (GdmHostChooser + /* paranoia */ + ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0'; + +- if (ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) { ++ if ((ioctl (sock, SIOCGIFFLAGS, &ifreq) < 0) && (errno != ENXIO)) { + g_warning ("Could not get SIOCGIFFLAGS for %s", ifr[i].ifr_name); + } + +@@ -542,6 +542,8 @@ xdmcp_init (GdmHostChooserWidget *widget + #ifdef ENABLE_IPV6 + widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0); + if (widget->priv->socket_fd != -1) { ++ int no = 0; ++ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(no)); + widget->priv->have_ipv6 = TRUE; + } + #endif diff --git a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in new file mode 100644 index 000000000000..56d49b99bf92 --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in @@ -0,0 +1,11 @@ +--- gui/simple-greeter/Makefile.in.orig 2008-02-13 01:57:37.000000000 -0500 ++++ gui/simple-greeter/Makefile.in 2008-02-13 01:57:44.000000000 -0500 +@@ -445,7 +445,7 @@ INCLUDES = \ + -DGDMCONFDIR=\"$(gdmconfdir)\" \ + -DDATADIR=\""$(datadir)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ +- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ ++ -DLIBLOCALEDIR=\""$(prefix)/share/locale"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGLADEDIR=\""$(pkgdatadir)"\" \ + -DLIBEXECDIR=\""$(libexecdir)"\" \ diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c new file mode 100644 index 000000000000..9116dc917a64 --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c @@ -0,0 +1,45 @@ +--- gui/simple-greeter/gdm-languages.c.orig 2008-11-22 17:16:42.000000000 -0500 ++++ gui/simple-greeter/gdm-languages.c 2008-11-22 17:29:05.000000000 -0500 +@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam + *codesetp = NULL; + } + +- if (*codesetp != NULL) { ++/* if (*codesetp != NULL) { + char *codeset; + + codeset = normalize_codeset (*codesetp); + g_free (*codesetp); + *codesetp = codeset; +- } ++ }*/ + } + + if (modifierp != NULL) { +@@ -353,7 +353,7 @@ add_locale (const char *language_name) + if (language_name_is_utf8 (language_name)) { + name = g_strdup (language_name); + } else { +- name = g_strdup_printf ("%s.utf8", language_name); ++ name = g_strdup_printf ("%s.UTF-8", language_name); + + if (!language_name_is_utf8 (name)) { + g_free (name); +@@ -482,7 +482,7 @@ select_dirs (const struct dirent *dirent + struct stat st; + char *path; + +- path = g_build_filename (GNOMELOCALEDIR, dirent->d_name, NULL); ++ path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL); + if (g_stat (path, &st) == 0) { + mode = st.st_mode; + } +@@ -502,7 +502,7 @@ collect_locales_from_directory (void) + int ndirents; + int cnt; + +- ndirents = scandir (GNOMELOCALEDIR, &dirents, select_dirs, alphasort); ++ ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort); + + for (cnt = 0; cnt < ndirents; ++cnt) { + add_locale (dirents[cnt]->d_name); diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c new file mode 100644 index 000000000000..059d72cf456b --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c @@ -0,0 +1,10 @@ +--- gui/simple-greeter/gdm-remote-login-window.c.orig 2008-03-24 11:27:13.000000000 +0100 ++++ gui/simple-greeter/gdm-remote-login-window.c 2008-03-24 11:27:31.000000000 +0100 +@@ -25,6 +25,7 @@ + #include <unistd.h> + #include <sys/types.h> + #include <sys/wait.h> ++#include <sys/signal.h> + #include <errno.h> + + #include <glib.h> diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c new file mode 100644 index 000000000000..d666bc1fd826 --- /dev/null +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c @@ -0,0 +1,51 @@ +--- gui/simple-greeter/gdm-user-manager.c.orig 2008-04-29 13:38:43.000000000 -0400 ++++ gui/simple-greeter/gdm-user-manager.c 2008-05-03 13:27:52.000000000 -0400 +@@ -1269,17 +1269,23 @@ reload_passwd (GdmUserManager *manager) + GSList *old_users; + GSList *new_users; + GSList *list; +- FILE *fp; ++#ifndef __FreeBSD__ ++ FILE *fp; ++#endif + + old_users = NULL; + new_users = NULL; + ++#ifdef __FreeBSD__ ++ setpwent (); ++#else + errno = 0; + fp = fopen (PATH_PASSWD, "r"); + if (fp == NULL) { + g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno)); + goto out; + } ++#endif + + g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users); + g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); +@@ -1292,7 +1298,11 @@ reload_passwd (GdmUserManager *manager) + } + } + ++#ifdef __FreeBSD__ ++ for (pwent = getpwent (); pwent != NULL; pwent = getpwent ()) { ++#else + for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) { ++#endif + GdmUser *user; + + user = NULL; +@@ -1355,7 +1365,11 @@ reload_passwd (GdmUserManager *manager) + out: + /* Cleanup */ + ++#ifdef __FreeBSD__ ++ endpwent (); ++#else + fclose (fp); ++#endif + + g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL); + g_slist_foreach (new_users, (GFunc) g_object_unref, NULL); diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index b775c107227c..788a1a610c81 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/pkg-install @@ -24,9 +24,13 @@ POST-INSTALL) if ${PW} user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." + uhome=`${PW} user show ${USER} | awk -F: '{print $9}'` + if [ x"${uhome}" = x"/nonexistent" -o x"${uhome}" = x"/var/gdm" ]; then + ${PW} usermod ${USER} -d "${PKG_PREFIX}/etc/gdm/home" + fi else if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/nonexistent" -s /sbin/nologin -c "GNOME Display Manager" + -d "${PKG_PREFIX}/etc/gdm/home" -s /sbin/nologin -c "GNOME Display Manager" then echo "Added user \"${USER}\"." else @@ -36,10 +40,24 @@ POST-INSTALL) fi ${MKDIR} -p /var/gdm ${MKDIR} -p /var/log/gdm + ${CHMOD} 0755 /var/log/gdm + ${CHOWN} root:wheel /var/log/gdm ${CHOWN} -R root:${GROUP} /var/gdm ${CHMOD} 1770 /var/gdm + ${MKDIR} -p /var/run/gdm + ${CHOWN} root:${GROUP} /var/run/gdm + ${CHMOD} 1777 /var/run/gdm ${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm ${CHMOD} 0755 ${PKG_PREFIX}/share/gdm + ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home + ${CHOWN} root:${GROUP} ${PKG_PREFIX}/etc/gdm/home + ${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home + install -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path + gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset / + gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries + ${CHOWN} -R root:gdm ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory + ${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory + ${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml ${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions exit 0 diff --git a/x11/gdm/pkg-message b/x11/gdm/pkg-message index 9131c3eb44c6..03810155292d 100644 --- a/x11/gdm/pkg-message +++ b/x11/gdm/pkg-message @@ -1,12 +1,6 @@ GDM is installed. -Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm -hanging or restarting constantly. Instead, add gdm_enable="YES" to +Do _NOT_ use /etc/ttys to start gdm at boot time. This will result in gdm +hanging or restarting constantly. Instead, add gdm_enable="YES" to /etc/rc.conf. GDM will be started automatic on the next reboot. -GDM uses its own locale.alias file to determine its language and especially -the GNOME 2 fontencoding. This file is located in -%%PREFIX%%/etc/gdm/locale.alias. By default, the character set for every -country using the EURO currency is set to ISO8859-15 in order to enable the -EURO sign. If you do not feel comfortable with this, edit this file according -to your preferences. diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index ea47c5c3a2e9..d56a2a2073f7 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -1,68 +1,45 @@ -bin/gdm-dmx-reconnect-proxy -bin/gdmXnest -bin/gdmXnestchooser -bin/gdmdynamic +bin/gdm-screenshot bin/gdmflexiserver -bin/gdmphotosetup -bin/gdmthemetester +etc/dbus-1/system.d/gdm.conf etc/gdm/Init/Default etc/gdm/PostLogin/Default.sample etc/gdm/PostSession/Default etc/gdm/PreSession/Default -etc/gdm/XKeepsCrashing etc/gdm/Xsession @unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi etc/gdm/custom.conf.default @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf -etc/gdm/locale.alias -@unexec if cmp -s %D/etc/gdm/modules/AccessDwellMouseEvents %D/etc/gdm/modules/factory-AccessDwellMouseEvents; then rm -f %D/etc/gdm/modules/AccessDwellMouseEvents; fi -etc/gdm/modules/factory-AccessDwellMouseEvents -@exec [ -f %B/AccessDwellMouseEvents ] || cp %B/%f %B/AccessDwellMouseEvents -@unexec if cmp -s %D/etc/gdm/modules/AccessKeyMouseEvents %D/etc/gdm/modules/factory-AccessKeyMouseEvents; then rm -f %D/etc/gdm/modules/AccessKeyMouseEvents; fi -etc/gdm/modules/factory-AccessKeyMouseEvents -@exec [ -f %B/AccessKeyMouseEvents ] || cp %B/%f %B/AccessKeyMouseEvents +etc/gdm/gdm.schemas etc/pam.d/gdm -lib/gtk-2.0/modules/libdwellmouselistener.a -lib/gtk-2.0/modules/libdwellmouselistener.la -lib/gtk-2.0/modules/libdwellmouselistener.so -lib/gtk-2.0/modules/libkeymouselistener.a -lib/gtk-2.0/modules/libkeymouselistener.la -lib/gtk-2.0/modules/libkeymouselistener.so -libexec/gdmchooser -libexec/gdmgreeter -libexec/gdmlogin -libexec/gdmtranslate +libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server +libexec/gdm-crash-logger +libexec/gdm-factory-slave +libexec/gdm-host-chooser +libexec/gdm-product-slave +libexec/gdm-session-worker +libexec/gdm-simple-chooser +libexec/gdm-simple-greeter +libexec/gdm-simple-slave +libexec/gdm-user-switch-applet +libexec/gdm-xdmcp-chooser-slave sbin/gdm sbin/gdm-binary sbin/gdm-restart sbin/gdm-safe-restart sbin/gdm-stop -sbin/gdmsetup -%%DATADIR%%/BuiltInSessions/default.desktop -%%DATADIR%%/applications/gdmflexiserver-xnest.desktop -%%DATADIR%%/applications/gdmflexiserver.desktop -%%DATADIR%%/applications/gdmphotosetup.desktop -%%DATADIR%%/applications/gdmsetup.desktop -%%DATADIR%%/defaults.conf -%%DATADIR%%/factory-defaults.conf -%%DATADIR%%/gdmchooser.glade -%%DATADIR%%/gdmphotosetup.glade -%%DATADIR%%/gdmsetup.glade -%%DATADIR%%/themes/circles/GdmGreeterTheme.desktop -%%DATADIR%%/themes/circles/background.svg -%%DATADIR%%/themes/circles/circles.xml -%%DATADIR%%/themes/circles/flower.png -%%DATADIR%%/themes/circles/screenshot.png -%%DATADIR%%/themes/happygnome-list/GdmGreeterTheme.desktop -%%DATADIR%%/themes/happygnome-list/background.svg -%%DATADIR%%/themes/happygnome-list/gnome-logo.svg -%%DATADIR%%/themes/happygnome-list/happygnome-list.xml -%%DATADIR%%/themes/happygnome-list/screenshot.png -%%DATADIR%%/themes/happygnome/GdmGreeterTheme.desktop -%%DATADIR%%/themes/happygnome/background.svg -%%DATADIR%%/themes/happygnome/gnome-logo.svg -%%DATADIR%%/themes/happygnome/happygnome.xml -%%DATADIR%%/themes/happygnome/screenshot.png +%%DATADIR%%/autostart/LoginWindow/at-spi-registryd-wrapper.desktop +%%DATADIR%%/autostart/LoginWindow/gdm-simple-greeter.desktop +%%DATADIR%%/autostart/LoginWindow/gnome-mag.desktop +%%DATADIR%%/autostart/LoginWindow/gnome-power-manager.desktop +%%DATADIR%%/autostart/LoginWindow/gnome-settings-daemon.desktop +%%DATADIR%%/autostart/LoginWindow/gok.desktop +%%DATADIR%%/autostart/LoginWindow/metacity.desktop +%%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop +%%DATADIR%%/gconf.path +%%DATADIR%%/gdb-cmd +%%DATADIR%%/gdm-greeter-login-window.glade +%%DATADIR%%/session-setup.entries +share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml share/gnome/help/gdm/C/gdm.xml share/gnome/help/gdm/C/legal.xml share/gnome/help/gdm/de/gdm.xml @@ -71,25 +48,12 @@ share/gnome/help/gdm/es/gdm.xml share/gnome/help/gdm/fr/gdm.xml share/gnome/help/gdm/ko/gdm.xml share/gnome/help/gdm/oc/gdm.xml +share/gnome/help/gdm/ru/gdm.xml share/gnome/help/gdm/sv/gdm.xml share/gnome/help/gdm/uk/gdm.xml share/icons/hicolor/16x16/apps/gdm-xnest.png -share/icons/hicolor/16x16/apps/gdmflexiserver.png -share/icons/hicolor/16x16/apps/gdmsetup.png -share/icons/hicolor/22x22/apps/gdmflexiserver.png -share/icons/hicolor/22x22/apps/gdmsetup.png -share/icons/hicolor/24x24/apps/gdmflexiserver.png -share/icons/hicolor/24x24/apps/gdmsetup.png +share/icons/hicolor/32x32/apps/gdm-setup.png share/icons/hicolor/32x32/apps/gdm-xnest.png -share/icons/hicolor/32x32/apps/gdmflexiserver.png -share/icons/hicolor/32x32/apps/gdmsetup.png -share/icons/hicolor/48x48/apps/gdm-login-photo.png -share/icons/hicolor/48x48/apps/gdm-xnest.png -share/icons/hicolor/48x48/apps/gdm.png -share/icons/hicolor/48x48/apps/gdmflexiserver.png -share/icons/hicolor/48x48/apps/gdmsetup.png -share/icons/hicolor/scalable/apps/gdmflexiserver.svg -share/icons/hicolor/scalable/apps/gdmsetup.svg share/locale/af/LC_MESSAGES/gdm.mo share/locale/am/LC_MESSAGES/gdm.mo share/locale/ar/LC_MESSAGES/gdm.mo @@ -115,6 +79,7 @@ share/locale/eu/LC_MESSAGES/gdm.mo share/locale/fa/LC_MESSAGES/gdm.mo share/locale/fi/LC_MESSAGES/gdm.mo share/locale/fr/LC_MESSAGES/gdm.mo +share/locale/fur/LC_MESSAGES/gdm.mo share/locale/ga/LC_MESSAGES/gdm.mo share/locale/gl/LC_MESSAGES/gdm.mo share/locale/gu/LC_MESSAGES/gdm.mo @@ -131,8 +96,10 @@ share/locale/ka/LC_MESSAGES/gdm.mo share/locale/kn/LC_MESSAGES/gdm.mo share/locale/ko/LC_MESSAGES/gdm.mo share/locale/ku/LC_MESSAGES/gdm.mo +share/locale/la/LC_MESSAGES/gdm.mo share/locale/lt/LC_MESSAGES/gdm.mo share/locale/lv/LC_MESSAGES/gdm.mo +share/locale/mai/LC_MESSAGES/gdm.mo share/locale/mg/LC_MESSAGES/gdm.mo share/locale/mi/LC_MESSAGES/gdm.mo share/locale/mk/LC_MESSAGES/gdm.mo @@ -149,6 +116,7 @@ share/locale/oc/LC_MESSAGES/gdm.mo share/locale/or/LC_MESSAGES/gdm.mo share/locale/pa/LC_MESSAGES/gdm.mo share/locale/pl/LC_MESSAGES/gdm.mo +share/locale/ps/LC_MESSAGES/gdm.mo share/locale/pt/LC_MESSAGES/gdm.mo share/locale/pt_BR/LC_MESSAGES/gdm.mo share/locale/ro/LC_MESSAGES/gdm.mo @@ -159,15 +127,13 @@ share/locale/sk/LC_MESSAGES/gdm.mo share/locale/sl/LC_MESSAGES/gdm.mo share/locale/sq/LC_MESSAGES/gdm.mo share/locale/sr/LC_MESSAGES/gdm.mo -share/locale/sr@Latn/LC_MESSAGES/gdm.mo +share/locale/sr@latin/LC_MESSAGES/gdm.mo share/locale/sv/LC_MESSAGES/gdm.mo share/locale/ta/LC_MESSAGES/gdm.mo share/locale/te/LC_MESSAGES/gdm.mo share/locale/th/LC_MESSAGES/gdm.mo share/locale/tr/LC_MESSAGES/gdm.mo share/locale/uk/LC_MESSAGES/gdm.mo -share/locale/uz/LC_MESSAGES/gdm.mo -share/locale/uz@cyrillic/LC_MESSAGES/gdm.mo share/locale/vi/LC_MESSAGES/gdm.mo share/locale/wa/LC_MESSAGES/gdm.mo share/locale/xh/LC_MESSAGES/gdm.mo @@ -175,15 +141,6 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo share/locale/zh_HK/LC_MESSAGES/gdm.mo share/locale/zh_TW/LC_MESSAGES/gdm.mo share/locale/zu/LC_MESSAGES/gdm.mo -share/omf/gdm/gdm-C.omf -share/omf/gdm/gdm-de.omf -share/omf/gdm/gdm-en_GB.omf -share/omf/gdm/gdm-es.omf -share/omf/gdm/gdm-fr.omf -share/omf/gdm/gdm-ko.omf -share/omf/gdm/gdm-oc.omf -share/omf/gdm/gdm-sv.omf -share/omf/gdm/gdm-uk.omf share/pixmaps/faces/astronaut.jpg share/pixmaps/faces/baseball.png share/pixmaps/faces/butterfly.png @@ -209,14 +166,17 @@ share/pixmaps/faces/sunset.jpg share/pixmaps/faces/tennis-ball.png share/pixmaps/faces/yellow-rose.jpg share/pixmaps/gdm-foot-logo.png +share/pixmaps/gdm-setup.png +share/pixmaps/gdm-xnest.png +share/pixmaps/gdm.png share/pixmaps/nobody.png share/pixmaps/nohost.png -share/xsessions/gnome.desktop -@dirrm share/xsessions +@exec mkdir -p %D/share/xsessions +@dirrmtry share/xsessions @dirrm share/pixmaps/faces -@dirrm share/omf/gdm @dirrm share/gnome/help/gdm/uk @dirrm share/gnome/help/gdm/sv +@dirrm share/gnome/help/gdm/ru @dirrm share/gnome/help/gdm/oc @dirrm share/gnome/help/gdm/ko @dirrm share/gnome/help/gdm/fr @@ -225,40 +185,40 @@ share/xsessions/gnome.desktop @dirrm share/gnome/help/gdm/de @dirrm share/gnome/help/gdm/C @dirrm share/gnome/help/gdm -@dirrm %%DATADIR%%/themes/happygnome-list -@dirrm %%DATADIR%%/themes/happygnome -@dirrm %%DATADIR%%/themes/circles -@dirrm %%DATADIR%%/themes -@dirrm %%DATADIR%%/applications -@dirrm %%DATADIR%%/BuiltInSessions +@dirrm %%DATADIR%%/autostart/LoginWindow +@dirrm %%DATADIR%%/autostart @dirrm %%DATADIR%% -@dirrm etc/gdm/modules @dirrm etc/gdm/Sessions @dirrm etc/gdm/PreSession @dirrm etc/gdm/PostSession @dirrm etc/gdm/PostLogin @dirrm etc/gdm/Init -@dirrm etc/gdm +@dirrmtry etc/gdm/home +@dirrmtry etc/gdm @dirrmtry etc/dm/Sessions @dirrmtry etc/dm +@dirrmtry sbin @dirrmtry share/log/gdm @dirrmtry share/log @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true +@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh -@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES -@dirrmtry share/locale/uz@cyrillic @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @@ -269,10 +229,16 @@ share/xsessions/gnome.desktop @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai +@dirrmtry share/locale/la/LC_MESSAGES +@dirrmtry share/locale/la @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/x11/gegl/Makefile b/x11/gegl/Makefile new file mode 100644 index 000000000000..7832d09173ba --- /dev/null +++ b/x11/gegl/Makefile @@ -0,0 +1,39 @@ +# New ports collection makefile for: gegl +# Date created: 2008-04-14 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/x11/gegl/Makefile,v 1.3 2008/07/26 15:50:04 ahze Exp $ + +PORTNAME= gegl +PORTVERSION= 0.0.18 +CATEGORIES= x11 +MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ + http://gimp.mirrors.hoobly.com/%SUBDIR%/ \ + http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \ + ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \ + ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \ + http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \ + ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,} +MASTER_SITE_SUBDIR= gegl/${PORTVERSION:R} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Generic Graphics Library: graph based image processing framework + +LIB_DEPENDS= babl-0.0.0:${PORTSDIR}/x11/babl \ + avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ + IlmImf.6:${PORTSDIR}/graphics/OpenEXR +# cdt.4:${PORTSDIR}/graphics/graphviz + +USE_BZIP2= yes +USE_LDCONFIG= yes +USE_GNOME= gnomehack pkgconfig gtk20 librsvg2 ltverhack +#USE_LUA= 5.1+ +USE_SDL= yes +USE_AUTOTOOLS= libtool:15 +USE_GMAKE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> +.include <bsd.port.post.mk> diff --git a/x11/gegl/distinfo b/x11/gegl/distinfo new file mode 100644 index 000000000000..5da41802dafd --- /dev/null +++ b/x11/gegl/distinfo @@ -0,0 +1,3 @@ +MD5 (gegl-0.0.18.tar.bz2) = e458409440a7b51f446df321c3657e4d +SHA256 (gegl-0.0.18.tar.bz2) = 58d5c2c415684f5744dd8dec80a1c230fc4b02ecea6c9edf3b5ef3ed4046ef93 +SIZE (gegl-0.0.18.tar.bz2) = 1204867 diff --git a/x11/gegl/pkg-descr b/x11/gegl/pkg-descr new file mode 100644 index 000000000000..148fd5b50bc0 --- /dev/null +++ b/x11/gegl/pkg-descr @@ -0,0 +1,8 @@ +GEGL (Generic Graphics Library) is a graph based image processing +framework. + +GEGL's original design was made to scratch GIMP's itches for a new +compositing and processing core. This core is being designed to have +minimal dependencies. and a simple well defined API. + +WWW: http://www.gegl.org/ diff --git a/x11/gegl/pkg-plist b/x11/gegl/pkg-plist new file mode 100644 index 000000000000..6814ea550969 --- /dev/null +++ b/x11/gegl/pkg-plist @@ -0,0 +1,299 @@ +bin/gegl +include/gegl-0.0/gegl-buffer.h +include/gegl-0.0/gegl-chant.h +include/gegl-0.0/gegl-color.h +include/gegl-0.0/gegl-config.c +include/gegl-0.0/gegl-curve.h +include/gegl-0.0/gegl-paramspecs.h +include/gegl-0.0/gegl-plugin.h +include/gegl-0.0/gegl-utils.h +include/gegl-0.0/gegl.h +include/gegl-0.0/operation/gegl-operation-area-filter.h +include/gegl-0.0/operation/gegl-operation-composer.h +include/gegl-0.0/operation/gegl-operation-filter.h +include/gegl-0.0/operation/gegl-operation-meta.h +include/gegl-0.0/operation/gegl-operation-point-composer.h +include/gegl-0.0/operation/gegl-operation-point-filter.h +include/gegl-0.0/operation/gegl-operation-point-render.h +include/gegl-0.0/operation/gegl-operation-sink.h +include/gegl-0.0/operation/gegl-operation-source.h +include/gegl-0.0/operation/gegl-operation-temporal.h +include/gegl-0.0/operation/gegl-operation.h +lib/gegl-0.0/add.a +lib/gegl-0.0/add.la +lib/gegl-0.0/add.so +lib/gegl-0.0/affine.a +lib/gegl-0.0/affine.la +lib/gegl-0.0/affine.so +lib/gegl-0.0/bilateral-filter.a +lib/gegl-0.0/bilateral-filter.la +lib/gegl-0.0/bilateral-filter.so +lib/gegl-0.0/box-blur.a +lib/gegl-0.0/box-blur.la +lib/gegl-0.0/box-blur.so +lib/gegl-0.0/brightness-contrast.a +lib/gegl-0.0/brightness-contrast.la +lib/gegl-0.0/brightness-contrast.so +lib/gegl-0.0/c2g.a +lib/gegl-0.0/c2g.la +lib/gegl-0.0/c2g.so +lib/gegl-0.0/checkerboard.a +lib/gegl-0.0/checkerboard.la +lib/gegl-0.0/checkerboard.so +lib/gegl-0.0/clear.a +lib/gegl-0.0/clear.la +lib/gegl-0.0/clear.so +lib/gegl-0.0/clone.a +lib/gegl-0.0/clone.la +lib/gegl-0.0/clone.so +lib/gegl-0.0/color-burn.a +lib/gegl-0.0/color-burn.la +lib/gegl-0.0/color-burn.so +lib/gegl-0.0/color-dodge.a +lib/gegl-0.0/color-dodge.la +lib/gegl-0.0/color-dodge.so +lib/gegl-0.0/color-temperature.a +lib/gegl-0.0/color-temperature.la +lib/gegl-0.0/color-temperature.so +lib/gegl-0.0/color.a +lib/gegl-0.0/color.la +lib/gegl-0.0/color.so +lib/gegl-0.0/contrast-curve.a +lib/gegl-0.0/contrast-curve.la +lib/gegl-0.0/contrast-curve.so +lib/gegl-0.0/convert-format.a +lib/gegl-0.0/convert-format.la +lib/gegl-0.0/convert-format.so +lib/gegl-0.0/crop.a +lib/gegl-0.0/crop.la +lib/gegl-0.0/crop.so +lib/gegl-0.0/darken.a +lib/gegl-0.0/darken.la +lib/gegl-0.0/darken.so +lib/gegl-0.0/difference-of-gaussians.a +lib/gegl-0.0/difference-of-gaussians.la +lib/gegl-0.0/difference-of-gaussians.so +lib/gegl-0.0/difference.a +lib/gegl-0.0/difference.la +lib/gegl-0.0/difference.so +lib/gegl-0.0/display.a +lib/gegl-0.0/display.la +lib/gegl-0.0/display.so +lib/gegl-0.0/divide.a +lib/gegl-0.0/divide.la +lib/gegl-0.0/divide.so +lib/gegl-0.0/dropshadow.a +lib/gegl-0.0/dropshadow.la +lib/gegl-0.0/dropshadow.so +lib/gegl-0.0/dst-atop.a +lib/gegl-0.0/dst-atop.la +lib/gegl-0.0/dst-atop.so +lib/gegl-0.0/dst-in.a +lib/gegl-0.0/dst-in.la +lib/gegl-0.0/dst-in.so +lib/gegl-0.0/dst-out.a +lib/gegl-0.0/dst-out.la +lib/gegl-0.0/dst-out.so +lib/gegl-0.0/dst-over.a +lib/gegl-0.0/dst-over.la +lib/gegl-0.0/dst-over.so +lib/gegl-0.0/dst.a +lib/gegl-0.0/dst.la +lib/gegl-0.0/dst.so +lib/gegl-0.0/exclusion.a +lib/gegl-0.0/exclusion.la +lib/gegl-0.0/exclusion.so +lib/gegl-0.0/exr-load.a +lib/gegl-0.0/exr-load.la +lib/gegl-0.0/exr-load.so +lib/gegl-0.0/ff-load.a +lib/gegl-0.0/ff-load.la +lib/gegl-0.0/ff-load.so +lib/gegl-0.0/fractal-explorer.a +lib/gegl-0.0/fractal-explorer.la +lib/gegl-0.0/fractal-explorer.so +lib/gegl-0.0/gamma.a +lib/gegl-0.0/gamma.la +lib/gegl-0.0/gamma.so +lib/gegl-0.0/gaussian-blur.a +lib/gegl-0.0/gaussian-blur.la +lib/gegl-0.0/gaussian-blur.so +lib/gegl-0.0/grey.a +lib/gegl-0.0/grey.la +lib/gegl-0.0/grey.so +lib/gegl-0.0/hard-light.a +lib/gegl-0.0/hard-light.la +lib/gegl-0.0/hard-light.so +lib/gegl-0.0/introspect.a +lib/gegl-0.0/introspect.la +lib/gegl-0.0/introspect.so +lib/gegl-0.0/invert.a +lib/gegl-0.0/invert.la +lib/gegl-0.0/invert.so +lib/gegl-0.0/jpg-load.a +lib/gegl-0.0/jpg-load.la +lib/gegl-0.0/jpg-load.so +lib/gegl-0.0/layer.a +lib/gegl-0.0/layer.la +lib/gegl-0.0/layer.so +lib/gegl-0.0/levels.a +lib/gegl-0.0/levels.la +lib/gegl-0.0/levels.so +lib/gegl-0.0/lighten.a +lib/gegl-0.0/lighten.la +lib/gegl-0.0/lighten.so +lib/gegl-0.0/load-buffer.a +lib/gegl-0.0/load-buffer.la +lib/gegl-0.0/load-buffer.so +lib/gegl-0.0/load.a +lib/gegl-0.0/load.la +lib/gegl-0.0/load.so +lib/gegl-0.0/magick-load.a +lib/gegl-0.0/magick-load.la +lib/gegl-0.0/magick-load.so +lib/gegl-0.0/mblur.a +lib/gegl-0.0/mblur.la +lib/gegl-0.0/mblur.so +lib/gegl-0.0/mono-mixer.a +lib/gegl-0.0/mono-mixer.la +lib/gegl-0.0/mono-mixer.so +lib/gegl-0.0/multiply.a +lib/gegl-0.0/multiply.la +lib/gegl-0.0/multiply.so +lib/gegl-0.0/noise.a +lib/gegl-0.0/noise.la +lib/gegl-0.0/noise.so +lib/gegl-0.0/nop.a +lib/gegl-0.0/nop.la +lib/gegl-0.0/nop.so +lib/gegl-0.0/normal.a +lib/gegl-0.0/normal.la +lib/gegl-0.0/normal.so +lib/gegl-0.0/opacity.a +lib/gegl-0.0/opacity.la +lib/gegl-0.0/opacity.so +lib/gegl-0.0/open-buffer.a +lib/gegl-0.0/open-buffer.la +lib/gegl-0.0/open-buffer.so +lib/gegl-0.0/over.a +lib/gegl-0.0/over.la +lib/gegl-0.0/over.so +lib/gegl-0.0/overlay.a +lib/gegl-0.0/overlay.la +lib/gegl-0.0/overlay.so +lib/gegl-0.0/pixbuf.a +lib/gegl-0.0/pixbuf.la +lib/gegl-0.0/pixbuf.so +lib/gegl-0.0/plus.a +lib/gegl-0.0/plus.la +lib/gegl-0.0/plus.so +lib/gegl-0.0/png-load.a +lib/gegl-0.0/png-load.la +lib/gegl-0.0/png-load.so +lib/gegl-0.0/png-save.a +lib/gegl-0.0/png-save.la +lib/gegl-0.0/png-save.so +lib/gegl-0.0/raw-load.a +lib/gegl-0.0/raw-load.la +lib/gegl-0.0/raw-load.so +lib/gegl-0.0/rectangle.a +lib/gegl-0.0/rectangle.la +lib/gegl-0.0/rectangle.so +lib/gegl-0.0/remap.a +lib/gegl-0.0/remap.la +lib/gegl-0.0/remap.so +lib/gegl-0.0/save-buffer.a +lib/gegl-0.0/save-buffer.la +lib/gegl-0.0/save-buffer.so +lib/gegl-0.0/save-pixbuf.a +lib/gegl-0.0/save-pixbuf.la +lib/gegl-0.0/save-pixbuf.so +lib/gegl-0.0/screen.a +lib/gegl-0.0/screen.la +lib/gegl-0.0/screen.so +lib/gegl-0.0/shift.a +lib/gegl-0.0/shift.la +lib/gegl-0.0/shift.so +lib/gegl-0.0/snn-mean.a +lib/gegl-0.0/snn-mean.la +lib/gegl-0.0/snn-mean.so +lib/gegl-0.0/soft-light.a +lib/gegl-0.0/soft-light.la +lib/gegl-0.0/soft-light.so +lib/gegl-0.0/src-atop.a +lib/gegl-0.0/src-atop.la +lib/gegl-0.0/src-atop.so +lib/gegl-0.0/src-in.a +lib/gegl-0.0/src-in.la +lib/gegl-0.0/src-in.so +lib/gegl-0.0/src-out.a +lib/gegl-0.0/src-out.la +lib/gegl-0.0/src-out.so +lib/gegl-0.0/src-over.a +lib/gegl-0.0/src-over.la +lib/gegl-0.0/src-over.so +lib/gegl-0.0/src.a +lib/gegl-0.0/src.la +lib/gegl-0.0/src.so +lib/gegl-0.0/stress.a +lib/gegl-0.0/stress.la +lib/gegl-0.0/stress.so +lib/gegl-0.0/stretch-contrast.a +lib/gegl-0.0/stretch-contrast.la +lib/gegl-0.0/stretch-contrast.so +lib/gegl-0.0/subtract.a +lib/gegl-0.0/subtract.la +lib/gegl-0.0/subtract.so +lib/gegl-0.0/svg-huerotate.a +lib/gegl-0.0/svg-huerotate.la +lib/gegl-0.0/svg-huerotate.so +lib/gegl-0.0/svg-load.a +lib/gegl-0.0/svg-load.la +lib/gegl-0.0/svg-load.so +lib/gegl-0.0/svg-luminancetoalpha.a +lib/gegl-0.0/svg-luminancetoalpha.la +lib/gegl-0.0/svg-luminancetoalpha.so +lib/gegl-0.0/svg-matrix.a +lib/gegl-0.0/svg-matrix.la +lib/gegl-0.0/svg-matrix.so +lib/gegl-0.0/svg-multiply.a +lib/gegl-0.0/svg-multiply.la +lib/gegl-0.0/svg-multiply.so +lib/gegl-0.0/svg-saturate.a +lib/gegl-0.0/svg-saturate.la +lib/gegl-0.0/svg-saturate.so +lib/gegl-0.0/text.a +lib/gegl-0.0/text.la +lib/gegl-0.0/text.so +lib/gegl-0.0/threshold.a +lib/gegl-0.0/threshold.la +lib/gegl-0.0/threshold.so +lib/gegl-0.0/tonemap.a +lib/gegl-0.0/tonemap.la +lib/gegl-0.0/tonemap.so +lib/gegl-0.0/unsharp-mask.a +lib/gegl-0.0/unsharp-mask.la +lib/gegl-0.0/unsharp-mask.so +lib/gegl-0.0/v4l.a +lib/gegl-0.0/v4l.la +lib/gegl-0.0/v4l.so +lib/gegl-0.0/value-invert.a +lib/gegl-0.0/value-invert.la +lib/gegl-0.0/value-invert.so +lib/gegl-0.0/whitebalance.a +lib/gegl-0.0/whitebalance.la +lib/gegl-0.0/whitebalance.so +lib/gegl-0.0/write-buffer.a +lib/gegl-0.0/write-buffer.la +lib/gegl-0.0/write-buffer.so +lib/gegl-0.0/xor.a +lib/gegl-0.0/xor.la +lib/gegl-0.0/xor.so +lib/libgegl-0.0.a +lib/libgegl-0.0.la +lib/libgegl-0.0.so +lib/libgegl-0.0.so.0 +libdata/pkgconfig/gegl.pc +@dirrm lib/gegl-0.0 +@dirrm include/gegl-0.0/operation +@dirrm include/gegl-0.0 diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 05a7a225437d..239d398a23ae 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-applets/Makefile,v 1.175 2008/03/10 20:03:41 mezz Exp $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.193 2008/12/20 20:05:50 marcus Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${POR LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ gweather.1:${PORTSDIR}/net/libgweather \ xklavier.12:${PORTSDIR}/x11/libxklavier \ - gucharmap.6:${PORTSDIR}/deskutils/gucharmap + gucharmap.7:${PORTSDIR}/deskutils/gucharmap RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon @@ -31,13 +32,12 @@ GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ - gail gnomedocutils libgnomekbd +USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel gnomedocutils \ + libgnomekbd WANT_GNOME= yes USE_GSTREAMER= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gstreamer=0.10 \ - --enable-stickynotes +CONFIGURE_ARGS= --with-gstreamer=0.10 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ OS_SYS="/usr/include" diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index c3fdb935ad71..293bb28a0d7a 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.22.3.tar.bz2) = 9e64d2827b0e8d2a03ebffb2c3499566 -SHA256 (gnome2/gnome-applets-2.22.3.tar.bz2) = dac8527273b097a9e2debae2223022ac2b7d78c86643654d6ca5d0db51574c52 -SIZE (gnome2/gnome-applets-2.22.3.tar.bz2) = 7508373 +MD5 (gnome2/gnome-applets-2.24.2.tar.bz2) = 7bdfde8fd9035c41fd6d42490663c7ba +SHA256 (gnome2/gnome-applets-2.24.2.tar.bz2) = 50bbf16de9c91fcc96156a154dabac490963fa768ecfea3c02f22bdc38c303b8 +SIZE (gnome2/gnome-applets-2.24.2.tar.bz2) = 7873299 diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index 7d1f860845cb..8a9822d48f15 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig 2007-07-09 18:13:48.000000000 -0400 -+++ configure 2007-07-09 18:14:19.000000000 -0400 -@@ -25117,7 +25117,7 @@ _ACEOF +--- configure.orig 2008-12-20 14:46:11.000000000 -0500 ++++ configure 2008-12-20 14:54:57.000000000 -0500 +@@ -17150,7 +17150,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -9,7 +9,7 @@ ac_define_dir=`eval echo $ac_define_dir` GNOMELOCALEDIR="$ac_define_dir" -@@ -27157,8 +27157,8 @@ fi +@@ -19097,8 +19097,8 @@ fi ;; # list of supported OS cores that do not use libapm @@ -20,16 +20,7 @@ ACPIINC="-I${OS_SYS}" else ACPIINC="-I/usr/src/sys" -@@ -27924,7 +27924,7 @@ echo "${ECHO_T}no" >&6; } - fi - - -- stb="system-tools-backends" -+ stb="system-tools-backends-2.0" - - if test x$PKG_CONFIG != xno ; then - if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then -@@ -28166,6 +28166,9 @@ if test x$disable_cpufreq = xno; then +@@ -20023,6 +20023,9 @@ if test x$disable_cpufreq = xno; then *linux*) build_cpufreq_applet=yes ;; @@ -39,7 +30,7 @@ *) { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5 echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;} -@@ -28684,7 +28687,7 @@ gladedir="${pkgdatadir}/glade" +@@ -20591,7 +20594,7 @@ builderdir="${pkgdatadir}/builder" test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -48,7 +39,7 @@ ac_define_dir=`eval echo $ac_define_dir` GNOME_ICONDIR="$ac_define_dir" -@@ -28697,7 +28700,7 @@ _ACEOF +@@ -20604,7 +20607,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -57,16 +48,16 @@ ac_define_dir=`eval echo $ac_define_dir` GNOME_PIXMAPSDIR="$ac_define_dir" -@@ -28710,7 +28713,7 @@ _ACEOF +@@ -20617,7 +20620,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -- ac_define_dir=`eval echo $"${gladedir}"` -+ ac_define_dir=`eval echo "${gladedir}"` +- ac_define_dir=`eval echo $"${builderdir}"` ++ ac_define_dir=`eval echo "${builderdir}"` ac_define_dir=`eval echo $ac_define_dir` - GNOME_GLADEDIR="$ac_define_dir" + GTK_BUILDERDIR="$ac_define_dir" -@@ -28723,7 +28726,7 @@ _ACEOF +@@ -20630,7 +20633,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -75,7 +66,7 @@ ac_define_dir=`eval echo $ac_define_dir` DATADIR="$ac_define_dir" -@@ -28736,7 +28739,7 @@ _ACEOF +@@ -20643,7 +20646,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -84,7 +75,7 @@ ac_define_dir=`eval echo $ac_define_dir` SYSCONFDIR="$ac_define_dir" -@@ -28749,7 +28752,7 @@ _ACEOF +@@ -20656,7 +20659,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -93,7 +84,7 @@ ac_define_dir=`eval echo $ac_define_dir` LIBDIR="$ac_define_dir" -@@ -28762,7 +28765,7 @@ _ACEOF +@@ -20669,7 +20672,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd index 734bd6c74cea..5cca16dd4d9c 100644 --- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd @@ -54,52 +54,6 @@ +G_END_DECLS + +#endif /* __CPUFREQ_SELECTOR_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-selector/main.c.orig Sat Jun 17 22:13:41 2006 -+++ cpufreq/src/cpufreq-selector/main.c Sat Jun 24 02:15:02 2006 -@@ -17,6 +17,7 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos Garc�a Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #ifdef HAVE_CONFIG_H -@@ -33,6 +34,9 @@ - #ifdef HAVE_LIBCPUFREQ - #include "cpufreq-selector-libcpufreq.h" - #endif -+#ifdef __FreeBSD__ -+#include "cpufreq-selector-sysctl.h" -+#endif /* __FreeBSD__ */ - - static gint cpu = 0; - static gchar *governor = NULL; -@@ -51,6 +55,9 @@ main (gint argc, gchar **argv) - CPUFreqSelector *selector; - GOptionContext *context; - GError *error = NULL; -+#ifdef __FreeBSD__ -+ size_t len; -+#endif - - if (geteuid () != 0) { - g_printerr ("You must be root\n"); -@@ -83,10 +90,15 @@ main (gint argc, gchar **argv) - #ifdef HAVE_LIBCPUFREQ - selector = cpufreq_selector_libcpufreq_new (cpu); - #else -+#ifndef __FreeBSD__ - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - selector = cpufreq_selector_sysfs_new (cpu); - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ - selector = cpufreq_selector_procfs_new (cpu); -+#else -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ selector = cpufreq_selector_sysctl_new (cpu); -+#endif /* __FreeBSD__ */ - } else { - g_printerr ("No cpufreq support\n"); - return 1; --- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c.orig Wed Jul 26 01:34:18 2006 +++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c Wed Jul 26 01:42:00 2006 @@ -0,0 +1,87 @@ @@ -190,39 +144,75 @@ + + return TRUE; +} ---- cpufreq/src/cpufreq-selector/Makefile.in.orig 2007-07-30 21:08:35.000000000 -0400 -+++ cpufreq/src/cpufreq-selector/Makefile.in 2007-07-30 21:08:36.000000000 -0400 -@@ -57,13 +57,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf - cpufreq-selector.h cpufreq-selector-sysfs.c \ - cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \ - cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \ -- cpufreq-selector-libcpufreq.h main.c -+ cpufreq-selector-libcpufreq.h main.c \ -+ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h +--- cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c.orig 2008-06-16 14:33:25.000000000 -0400 ++++ cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2008-06-16 14:35:28.000000000 -0400 +@@ -27,20 +27,32 @@ + #ifdef HAVE_LIBCPUFREQ + #include "cpufreq-selector-libcpufreq.h" + #endif ++#ifdef __FreeBSD__ ++#include "cpufreq-selector-sysctl.h" ++#endif /* __FreeBSD__ */ + + CPUFreqSelector * + cpufreq_selector_factory_create_selector (guint cpu) + { + CPUFreqSelector *selector = NULL; ++#ifdef __FreeBSD__ ++ size_t len; ++#endif + + #ifdef HAVE_LIBCPUFREQ + selector = cpufreq_selector_libcpufreq_new (cpu); + #else ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + selector = cpufreq_selector_sysfs_new (cpu); + } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ + selector = cpufreq_selector_procfs_new (cpu); + } ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ selector = cpufreq_selector_sysctl_new (cpu); ++ } ++#endif /* __FreeBSD__ */ + #endif /* HAVE_LIBCPUFREQ */ + + return selector; +--- cpufreq/src/cpufreq-selector/Makefile.in.orig 2008-06-16 14:26:07.000000000 -0400 ++++ cpufreq/src/cpufreq-selector/Makefile.in 2008-06-16 14:38:15.000000000 -0400 +@@ -65,7 +65,7 @@ am__cpufreq_selector_SOURCES_DIST = cpuf + cpufreq-selector-libcpufreq.h cpufreq-selector-service.c \ + cpufreq-selector-service.h cpufreq-selector-factory.c \ + cpufreq-selector-factory.h cpufreq-selector-service-glue.h \ +- main.c ++ main.c cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h @HAVE_LIBCPUFREQ_TRUE@am__objects_1 = \ @HAVE_LIBCPUFREQ_TRUE@ cpufreq-selector-libcpufreq.$(OBJEXT) - am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \ + @HAVE_POLKIT_TRUE@am__objects_2 = cpufreq-selector-service.$(OBJEXT) +@@ -74,7 +74,8 @@ am_cpufreq_selector_OBJECTS = cpufreq-se cpufreq-selector-sysfs.$(OBJEXT) \ cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \ -- main.$(OBJEXT) -+ main.$(OBJEXT) \ + $(am__objects_2) cpufreq-selector-factory.$(OBJEXT) \ +- $(am__objects_3) main.$(OBJEXT) ++ $(am__objects_3) main.$(OBJEXT) \ + cpufreq-selector-sysctl.$(OBJEXT) cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) am__DEPENDENCIES_1 = - cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@@ -381,6 +383,7 @@ cpufreq_selector_SOURCES = \ - cpufreq-selector.c cpufreq-selector.h \ - cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \ - cpufreq-selector-procfs.c cpufreq-selector-procfs.h \ -+ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h \ - $(cpufreq_files) \ - main.c - -@@ -462,6 +465,7 @@ distclean-compile: - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@ + @HAVE_POLKIT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ +@@ -371,6 +372,7 @@ cpufreq_selector_SOURCES = \ + cpufreq-selector.c cpufreq-selector.h \ + cpufreq-selector-sysfs.c cpufreq-selector-sysfs.h \ + cpufreq-selector-procfs.c cpufreq-selector-procfs.h \ ++ cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h \ + $(cpufreq_files) \ + $(service_files) \ + cpufreq-selector-factory.c cpufreq-selector-factory.h \ +@@ -480,6 +482,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-service.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ + diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py index 0dc24164ec34..7ddb583de639 100644 --- a/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py +++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py @@ -1,5 +1,5 @@ ---- invest-applet/invest/invest-applet.py.orig Wed Sep 13 20:42:15 2006 -+++ invest-applet/invest/invest-applet.py Wed Sep 13 20:42:28 2006 +--- invest-applet/invest/invest-applet.py.orig 2008-03-15 19:39:32.000000000 -0400 ++++ invest-applet/invest/invest-applet.py 2008-04-28 13:27:46.000000000 -0400 @@ -26,8 +26,8 @@ import invest, invest.applet, invest.def import gettext, locale gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) @@ -8,6 +8,6 @@ -locale.textdomain(invest.defs.GETTEXT_PACKAGE) +#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) +#locale.textdomain(invest.defs.GETTEXT_PACKAGE) - gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) - gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE) + + from gettext import gettext as _ diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart index 2eddc8154089..aa763c16c429 100644 --- a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart +++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart @@ -1,5 +1,5 @@ ---- invest-applet/invest/invest-chart.orig Wed Sep 13 20:41:18 2006 -+++ invest-applet/invest/invest-chart Wed Sep 13 20:41:33 2006 +--- invest-applet/invest/invest-chart.orig 2008-03-15 16:34:50.000000000 -0400 ++++ invest-applet/invest/invest-chart 2008-04-28 13:29:13.000000000 -0400 @@ -6,8 +6,8 @@ import sys, invest.chart, gtk import gettext, locale gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) @@ -8,6 +8,6 @@ -locale.textdomain(invest.defs.GETTEXT_PACKAGE) +#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) +#locale.textdomain(invest.defs.GETTEXT_PACKAGE) - gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR) - gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE) + if __name__ == "__main__": + win = invest.chart.show_chart(sys.argv[1:]) diff --git a/x11/gnome-applets/files/patch-mixer_applet.c b/x11/gnome-applets/files/patch-mixer_applet.c deleted file mode 100644 index d7c0eb517833..000000000000 --- a/x11/gnome-applets/files/patch-mixer_applet.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mixer/applet.c.orig Mon Nov 7 09:53:52 2005 -+++ mixer/applet.c Mon Nov 28 01:16:50 2005 -@@ -953,7 +953,7 @@ gnome_volume_applet_adjust_volume (GstMi - - volumes = g_new (gint, track->num_channels); - for (n = 0; n < track->num_channels; n++) -- volumes[n] = lrint (volume); -+ volumes[n] = (int) rint (volume); - gst_mixer_set_volume (mixer, track, volumes); - g_free (volumes); - } diff --git a/x11/gnome-applets/files/patch-modemlights_Makefile.in b/x11/gnome-applets/files/patch-modemlights_Makefile.in deleted file mode 100644 index 874884722127..000000000000 --- a/x11/gnome-applets/files/patch-modemlights_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- modemlights/Makefile.in.orig Fri Jan 14 00:08:52 2005 -+++ modemlights/Makefile.in Fri Jan 14 00:09:20 2005 -@@ -319,6 +319,7 @@ - modem_applet_LDADD = \ - $(GNOME_APPLETS_LIBS) \ - $(LIBGLADE_LIBS) \ -+ -lutil \ - $(MODEMLIGHTS_LIBS) - - uidir = $(datadir)/gnome-2.0/ui diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 9fc4e42bbfce..68f004ac32c3 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,5 +1,6 @@ %%CPUFREQ%%bin/cpufreq-selector %%PYTHON%%bin/invest-chart +%%CPUFREQ%%etc/dbus-1/system.d/org.gnome.CPUFreqSelector.conf %%BATTERY%%etc/sound/events/battstat_applet.soundlist %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyc @@ -38,7 +39,6 @@ libdata/bonobo/servers/GNOME_KeyboardApplet.server libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server -libdata/bonobo/servers/GNOME_ModemLights.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server libdata/bonobo/servers/GNOME_NullApplet_Factory.server libdata/bonobo/servers/GNOME_Panel_TrashApplet.server @@ -57,11 +57,12 @@ libexec/gweather-applet-2 %%PYTHON%%libexec/invest-applet %%COMMANDER%%libexec/mini_commander_applet libexec/mixer_applet2 -libexec/modem_applet libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet +%%CPUFREQ%%share/PolicyKit/policy/org.gnome.cpufreqselector.policy +%%CPUFREQ%%share/dbus-1/system-services/org.gnome.CPUFreqSelector.service share/gnome-2.0/ui/GNOME_AccessxApplet.xml %%BATTERY%%share/gnome-2.0/ui/GNOME_BattstatApplet.xml %%CPUFREQ%%share/gnome-2.0/ui/GNOME_CPUFreqApplet.xml @@ -72,11 +73,18 @@ share/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome-2.0/ui/GNOME_GeyesApplet.xml %%COMMANDER%%share/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome-2.0/ui/GNOME_MixerApplet.xml -share/gnome-2.0/ui/GNOME_ModemLights.xml share/gnome-2.0/ui/GNOME_MultiloadApplet.xml share/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml %%PYTHON%%share/gnome-2.0/ui/Invest_Applet.xml +%%BATTERY%%%%DATADIR%%/builder/battstat_applet.ui +%%CPUFREQ%%%%DATADIR%%/builder/cpufreq-preferences.ui +%%PYTHON%%%%DATADIR%%/builder/financialchart.ui +%%DATADIR%%/builder/gswitchit.ui +%%COMMANDER%%%%DATADIR%%/builder/mini-commander.ui +%%PYTHON%%%%DATADIR%%/builder/prefs-dialog.ui +%%DATADIR%%/builder/stickynotes.ui +%%DATADIR%%/builder/trashapplet-empty-progress.ui %%DATADIR%%/geyes/Bizarre/Bizarre-eye.png %%DATADIR%%/geyes/Bizarre/Bizarre-pupil.png %%DATADIR%%/geyes/Bizarre/config @@ -95,18 +103,13 @@ share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml %%DATADIR%%/geyes/Tango/config %%DATADIR%%/geyes/Tango/tango-eye.png %%DATADIR%%/geyes/Tango/tango-pupil.png -%%BATTERY%%%%DATADIR%%/glade/battstat_applet.glade -%%CPUFREQ%%%%DATADIR%%/glade/cpufreq-preferences.glade -%%PYTHON%%%%DATADIR%%/glade/financialchart.glade -%%DATADIR%%/glade/gswitchit.glade -%%COMMANDER%%%%DATADIR%%/glade/mini-commander.glade -%%DATADIR%%/glade/modemlights.glade -%%PYTHON%%%%DATADIR%%/glade/prefs-dialog.glade -%%DATADIR%%/glade/stickynotes.glade -%%DATADIR%%/glade/trashapplet-empty-progress.ui -%%PYTHON%%%%DATADIR%%/invest-applet/invest-16.png -%%PYTHON%%%%DATADIR%%/invest-applet/invest-button.png -%%PYTHON%%%%DATADIR%%/invest-applet/invest.svg +%%PYTHON%%%%DATADIR%%/invest-applet/invest-16_neutral.png +%%PYTHON%%%%DATADIR%%/invest-applet/invest-22_down.png +%%PYTHON%%%%DATADIR%%/invest-applet/invest-22_neutral.png +%%PYTHON%%%%DATADIR%%/invest-applet/invest-22_up.png +%%PYTHON%%%%DATADIR%%/invest-applet/invest_down.svg +%%PYTHON%%%%DATADIR%%/invest-applet/invest_neutral.svg +%%PYTHON%%%%DATADIR%%/invest-applet/invest_up.svg share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png @@ -144,6 +147,18 @@ share/gnome/help/accessx-status/ca/figures/accessx_sticky-keys.png share/gnome/help/accessx-status/ca/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/ca/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/ca/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/el/accessx-status.xml +share/gnome/help/accessx-status/el/figures/accessx-status-applet.png +share/gnome/help/accessx-status/el/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/el/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/el/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/el/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/el/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/el/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/el/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/el/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/el/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/el/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/en_GB/accessx-status.xml share/gnome/help/accessx-status/en_GB/figures/accessx-status-applet.png share/gnome/help/accessx-status/en_GB/figures/accessx-status-disabled.png @@ -204,6 +219,18 @@ share/gnome/help/accessx-status/it/figures/accessx_sticky-keys.png share/gnome/help/accessx-status/it/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/it/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/it/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/ko/accessx-status.xml +share/gnome/help/accessx-status/ko/figures/accessx-status-applet.png +share/gnome/help/accessx-status/ko/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/ko/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/ko/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/ko/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/ko/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/ko/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/ko/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/ko/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/ko/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/ko/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/nl/accessx-status.xml share/gnome/help/accessx-status/nl/figures/accessx-status-applet.png share/gnome/help/accessx-status/nl/figures/accessx-status-disabled.png @@ -265,6 +292,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/bg/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/bg/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/de/battstat.xml +%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/de/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/el/battstat.xml %%BATTERY%%share/gnome/help/battstat/el/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/el/figures/battstat-applet.png @@ -347,6 +380,11 @@ share/gnome/help/char-palette/ca/figures/charpalette_applet.png share/gnome/help/char-palette/ca/figures/charpalette_chargroup.png share/gnome/help/char-palette/ca/figures/charpick-preferences.png share/gnome/help/char-palette/ca/figures/charpick_characters.png +share/gnome/help/char-palette/de/char-palette.xml +share/gnome/help/char-palette/de/figures/charpalette_applet.png +share/gnome/help/char-palette/de/figures/charpalette_chargroup.png +share/gnome/help/char-palette/de/figures/charpick-preferences.png +share/gnome/help/char-palette/de/figures/charpick_characters.png share/gnome/help/char-palette/en_GB/char-palette.xml share/gnome/help/char-palette/en_GB/figures/charpalette_applet.png share/gnome/help/char-palette/en_GB/figures/charpalette_chargroup.png @@ -412,6 +450,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%COMMANDER%%share/gnome/help/command-line/C/figures/prefs-macros.png %%COMMANDER%%share/gnome/help/command-line/C/figures/prefs.png %%COMMANDER%%share/gnome/help/command-line/C/legal.xml +%%COMMANDER%%share/gnome/help/command-line/el/command-line.xml +%%COMMANDER%%share/gnome/help/command-line/el/figures/command-line.png +%%COMMANDER%%share/gnome/help/command-line/el/figures/prefs-macros.png +%%COMMANDER%%share/gnome/help/command-line/el/figures/prefs.png %%COMMANDER%%share/gnome/help/command-line/en_GB/command-line.xml %%COMMANDER%%share/gnome/help/command-line/en_GB/figures/command-line.png %%COMMANDER%%share/gnome/help/command-line/en_GB/figures/prefs-macros.png @@ -465,6 +507,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/ca/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/de/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/en_GB/figures/cpufreq-25.png @@ -575,6 +627,26 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_HK/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_TW/figures/cpufreq-applet.png share/gnome/help/drivemount/C/drivemount.xml share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png share/gnome/help/drivemount/C/figures/drivemount-applet_example.png @@ -582,6 +654,12 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png share/gnome/help/drivemount/C/figures/drivemount-applet_open.png share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml +share/gnome/help/drivemount/de/drivemount.xml +share/gnome/help/drivemount/de/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/de/figures/drivemount-applet_example.png +share/gnome/help/drivemount/de/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/de/figures/drivemount-applet_open.png +share/gnome/help/drivemount/de/figures/drivemount-applet_status.png share/gnome/help/drivemount/en_GB/drivemount.xml share/gnome/help/drivemount/en_GB/figures/drivemount-applet_eject.png share/gnome/help/drivemount/en_GB/figures/drivemount-applet_example.png @@ -661,6 +739,8 @@ share/gnome/help/geyes/bg/figures/geyes_applet.png share/gnome/help/geyes/bg/geyes.xml share/gnome/help/geyes/ca/figures/geyes_applet.png share/gnome/help/geyes/ca/geyes.xml +share/gnome/help/geyes/da/figures/geyes_applet.png +share/gnome/help/geyes/da/geyes.xml share/gnome/help/geyes/de/figures/geyes_applet.png share/gnome/help/geyes/de/geyes.xml share/gnome/help/geyes/en_GB/figures/geyes_applet.png @@ -711,6 +791,21 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml +share/gnome/help/gweather/de/figures/gweather-details.png +share/gnome/help/gweather/de/figures/gweather-menu-prefs.png +share/gnome/help/gweather/de/figures/gweather-prefs-general.png +share/gnome/help/gweather/de/figures/gweather-prefs-locations.png +share/gnome/help/gweather/de/figures/gweather_applet.png +share/gnome/help/gweather/de/figures/stock_weather-cloudy.png +share/gnome/help/gweather/de/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/de/figures/stock_weather-fog.png +share/gnome/help/gweather/de/figures/stock_weather-night-clear.png +share/gnome/help/gweather/de/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/de/figures/stock_weather-showers.png +share/gnome/help/gweather/de/figures/stock_weather-snow.png +share/gnome/help/gweather/de/figures/stock_weather-storm.png +share/gnome/help/gweather/de/figures/stock_weather-sunny.png +share/gnome/help/gweather/de/gweather.xml share/gnome/help/gweather/en_GB/figures/gweather-details.png share/gnome/help/gweather/en_GB/figures/gweather-menu-prefs.png share/gnome/help/gweather/en_GB/figures/gweather-prefs-general.png @@ -891,11 +986,21 @@ share/gnome/help/gweather/uk/figures/stock_weather-snow.png share/gnome/help/gweather/uk/figures/stock_weather-storm.png share/gnome/help/gweather/uk/figures/stock_weather-sunny.png share/gnome/help/gweather/uk/gweather.xml +%%PYTHON%%share/gnome/help/invest-applet/C/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/C/legal.xml +%%PYTHON%%share/gnome/help/invest-applet/el/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/es/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/fi/invest-applet.xml +%%PYTHON%%share/gnome/help/invest-applet/sv/invest-applet.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml share/gnome/help/mixer_applet2/ca/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ca/mixer_applet2.xml +share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/de/mixer_applet2.xml +share/gnome/help/mixer_applet2/el/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/el/mixer_applet2.xml share/gnome/help/mixer_applet2/en_GB/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/en_GB/mixer_applet2.xml share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png @@ -904,6 +1009,8 @@ share/gnome/help/mixer_applet2/fi/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/fi/mixer_applet2.xml share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/fr/mixer_applet2.xml +share/gnome/help/mixer_applet2/hu/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/hu/mixer_applet2.xml share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/it/mixer_applet2.xml share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png @@ -949,6 +1056,10 @@ share/gnome/help/multiload/ko/figures/multiload-preferences.png share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png share/gnome/help/multiload/ko/figures/system_monitor.png share/gnome/help/multiload/ko/multiload.xml +share/gnome/help/multiload/nl/figures/multiload-preferences.png +share/gnome/help/multiload/nl/figures/system-monitor-applet_window.png +share/gnome/help/multiload/nl/figures/system_monitor.png +share/gnome/help/multiload/nl/multiload.xml share/gnome/help/multiload/oc/figures/multiload-preferences.png share/gnome/help/multiload/oc/figures/system-monitor-applet_window.png share/gnome/help/multiload/oc/figures/system_monitor.png @@ -986,6 +1097,12 @@ share/gnome/help/stickynotes_applet/ca/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/ca/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/ca/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/ca/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/de/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/de/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/de/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/de/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml share/gnome/help/stickynotes_applet/el/figures/stickynote-right-menu-lock.png share/gnome/help/stickynotes_applet/el/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/el/figures/stickynotes-note-prefs.png @@ -1067,6 +1184,8 @@ share/gnome/help/trashapplet/da/figures/trash-applet.png share/gnome/help/trashapplet/da/trashapplet.xml share/gnome/help/trashapplet/de/figures/trash-applet.png share/gnome/help/trashapplet/de/trashapplet.xml +share/gnome/help/trashapplet/el/figures/trash-applet.png +share/gnome/help/trashapplet/el/trashapplet.xml share/gnome/help/trashapplet/en_GB/figures/trash-applet.png share/gnome/help/trashapplet/en_GB/trashapplet.xml share/gnome/help/trashapplet/es/figures/trash-applet.png @@ -1075,6 +1194,8 @@ share/gnome/help/trashapplet/fi/figures/trash-applet.png share/gnome/help/trashapplet/fi/trashapplet.xml share/gnome/help/trashapplet/fr/figures/trash-applet.png share/gnome/help/trashapplet/fr/trashapplet.xml +share/gnome/help/trashapplet/hu/figures/trash-applet.png +share/gnome/help/trashapplet/hu/trashapplet.xml share/gnome/help/trashapplet/it/figures/trash-applet.png share/gnome/help/trashapplet/it/trashapplet.xml share/gnome/help/trashapplet/nl/figures/trash-applet.png @@ -1083,40 +1204,43 @@ share/gnome/help/trashapplet/oc/figures/trash-applet.png share/gnome/help/trashapplet/oc/trashapplet.xml share/gnome/help/trashapplet/pa/figures/trash-applet.png share/gnome/help/trashapplet/pa/trashapplet.xml +share/gnome/help/trashapplet/pt_BR/figures/trash-applet.png +share/gnome/help/trashapplet/pt_BR/trashapplet.xml share/gnome/help/trashapplet/ru/figures/trash-applet.png share/gnome/help/trashapplet/ru/trashapplet.xml share/gnome/help/trashapplet/sv/figures/trash-applet.png share/gnome/help/trashapplet/sv/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png share/gnome/help/trashapplet/uk/trashapplet.xml +share/gnome/help/trashapplet/zh_HK/figures/trash-applet.png +share/gnome/help/trashapplet/zh_HK/trashapplet.xml +share/gnome/help/trashapplet/zh_TW/figures/trash-applet.png +share/gnome/help/trashapplet/zh_TW/trashapplet.xml %%CPUFREQ%%share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png share/icons/hicolor/16x16/apps/gnome-eyes-applet.png -share/icons/hicolor/16x16/apps/gnome-modem-monitor-applet.png share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png +%%PYTHON%%share/icons/hicolor/16x16/apps/invest-applet.png %%CPUFREQ%%share/icons/hicolor/22x22/apps/gnome-cpu-frequency-applet.png share/icons/hicolor/22x22/apps/gnome-eyes-applet.png -share/icons/hicolor/22x22/apps/gnome-modem-monitor-applet.png share/icons/hicolor/22x22/apps/gnome-sticky-notes-applet.png +%%PYTHON%%share/icons/hicolor/22x22/apps/invest-applet.png %%CPUFREQ%%share/icons/hicolor/24x24/apps/gnome-cpu-frequency-applet.png share/icons/hicolor/24x24/apps/gnome-eyes-applet.png -share/icons/hicolor/24x24/apps/gnome-modem-monitor-applet.png share/icons/hicolor/24x24/apps/gnome-sticky-notes-applet.png %%CPUFREQ%%share/icons/hicolor/32x32/apps/gnome-cpu-frequency-applet.png share/icons/hicolor/32x32/apps/gnome-eyes-applet.png -share/icons/hicolor/32x32/apps/gnome-modem-monitor-applet.png share/icons/hicolor/32x32/apps/gnome-sticky-notes-applet.png share/icons/hicolor/48x48/apps/ax-applet.png -share/icons/hicolor/48x48/apps/charpick.png %%COMMANDER%%share/icons/hicolor/48x48/apps/gnome-mini-commander.png -share/icons/hicolor/48x48/apps/gswitchit-applet.png -share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png +%%PYTHON%%share/icons/hicolor/48x48/apps/invest-applet.png %%CPUFREQ%%share/icons/hicolor/scalable/apps/gnome-cpu-frequency-applet.svg share/icons/hicolor/scalable/apps/gnome-eyes-applet.svg -share/icons/hicolor/scalable/apps/gnome-modem-monitor-applet.svg share/icons/hicolor/scalable/apps/gnome-sticky-notes-applet.svg +%%PYTHON%%share/icons/hicolor/scalable/apps/invest-applet.svg share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo share/locale/as/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ast/LC_MESSAGES/gnome-applets-2.0.mo share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo share/locale/be@latin/LC_MESSAGES/gnome-applets-2.0.mo @@ -1175,6 +1299,7 @@ share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/mai/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mg/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo @@ -1189,6 +1314,7 @@ share/locale/oc/LC_MESSAGES/gnome-applets-2.0.mo share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ps/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ro/LC_MESSAGES/gnome-applets-2.0.mo @@ -1199,7 +1325,7 @@ share/locale/sk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sq/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo @@ -1215,17 +1341,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo share/omf/accessx-status/accessx-status-C.omf share/omf/accessx-status/accessx-status-bg.omf share/omf/accessx-status/accessx-status-ca.omf +share/omf/accessx-status/accessx-status-el.omf share/omf/accessx-status/accessx-status-en_GB.omf share/omf/accessx-status/accessx-status-es.omf share/omf/accessx-status/accessx-status-fi.omf share/omf/accessx-status/accessx-status-fr.omf share/omf/accessx-status/accessx-status-it.omf +share/omf/accessx-status/accessx-status-ko.omf share/omf/accessx-status/accessx-status-nl.omf share/omf/accessx-status/accessx-status-oc.omf share/omf/accessx-status/accessx-status-sv.omf share/omf/accessx-status/accessx-status-uk.omf %%BATTERY%%share/omf/battstat/battstat-C.omf %%BATTERY%%share/omf/battstat/battstat-bg.omf +%%BATTERY%%share/omf/battstat/battstat-de.omf %%BATTERY%%share/omf/battstat/battstat-el.omf %%BATTERY%%share/omf/battstat/battstat-en_GB.omf %%BATTERY%%share/omf/battstat/battstat-es.omf @@ -1240,6 +1369,7 @@ share/omf/accessx-status/accessx-status-uk.omf share/omf/char-palette/char-palette-C.omf share/omf/char-palette/char-palette-bg.omf share/omf/char-palette/char-palette-ca.omf +share/omf/char-palette/char-palette-de.omf share/omf/char-palette/char-palette-en_GB.omf share/omf/char-palette/char-palette-es.omf share/omf/char-palette/char-palette-fi.omf @@ -1253,6 +1383,7 @@ share/omf/char-palette/char-palette-ru.omf share/omf/char-palette/char-palette-sv.omf share/omf/char-palette/char-palette-uk.omf %%COMMANDER%%share/omf/command-line/command-line-C.omf +%%COMMANDER%%share/omf/command-line/command-line-el.omf %%COMMANDER%%share/omf/command-line/command-line-en_GB.omf %%COMMANDER%%share/omf/command-line/command-line-es.omf %%COMMANDER%%share/omf/command-line/command-line-fr.omf @@ -1263,6 +1394,7 @@ share/omf/char-palette/char-palette-uk.omf %%COMMANDER%%share/omf/command-line/command-line-uk.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-C.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ca.omf +%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-de.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-en_GB.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-es.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fi.omf @@ -1274,7 +1406,10 @@ share/omf/char-palette/char-palette-uk.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-sv.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-uk.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf +%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_HK.omf +%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-zh_TW.omf share/omf/drivemount/drivemount-C.omf +share/omf/drivemount/drivemount-de.omf share/omf/drivemount/drivemount-en_GB.omf share/omf/drivemount/drivemount-es.omf share/omf/drivemount/drivemount-fi.omf @@ -1290,6 +1425,7 @@ share/omf/drivemount/drivemount-zh_CN.omf share/omf/geyes/geyes-C.omf share/omf/geyes/geyes-bg.omf share/omf/geyes/geyes-ca.omf +share/omf/geyes/geyes-da.omf share/omf/geyes/geyes-de.omf share/omf/geyes/geyes-en_GB.omf share/omf/geyes/geyes-es.omf @@ -1313,6 +1449,7 @@ share/omf/gswitchit/gswitchit-ru.omf share/omf/gswitchit/gswitchit-sv.omf share/omf/gswitchit/gswitchit-uk.omf share/omf/gweather/gweather-C.omf +share/omf/gweather/gweather-de.omf share/omf/gweather/gweather-en_GB.omf share/omf/gweather/gweather-es.omf share/omf/gweather/gweather-fi.omf @@ -1325,12 +1462,20 @@ share/omf/gweather/gweather-pt_BR.omf share/omf/gweather/gweather-ru.omf share/omf/gweather/gweather-sv.omf share/omf/gweather/gweather-uk.omf +%%PYTHON%%share/omf/invest-applet/invest-applet-C.omf +%%PYTHON%%share/omf/invest-applet/invest-applet-el.omf +%%PYTHON%%share/omf/invest-applet/invest-applet-es.omf +%%PYTHON%%share/omf/invest-applet/invest-applet-fi.omf +%%PYTHON%%share/omf/invest-applet/invest-applet-sv.omf share/omf/mixer_applet2/mixer_applet2-C.omf share/omf/mixer_applet2/mixer_applet2-ca.omf +share/omf/mixer_applet2/mixer_applet2-de.omf +share/omf/mixer_applet2/mixer_applet2-el.omf share/omf/mixer_applet2/mixer_applet2-en_GB.omf share/omf/mixer_applet2/mixer_applet2-es.omf share/omf/mixer_applet2/mixer_applet2-fi.omf share/omf/mixer_applet2/mixer_applet2-fr.omf +share/omf/mixer_applet2/mixer_applet2-hu.omf share/omf/mixer_applet2/mixer_applet2-it.omf share/omf/mixer_applet2/mixer_applet2-ko.omf share/omf/mixer_applet2/mixer_applet2-oc.omf @@ -1346,6 +1491,7 @@ share/omf/multiload/multiload-es.omf share/omf/multiload/multiload-fi.omf share/omf/multiload/multiload-fr.omf share/omf/multiload/multiload-ko.omf +share/omf/multiload/multiload-nl.omf share/omf/multiload/multiload-oc.omf share/omf/multiload/multiload-pa.omf share/omf/multiload/multiload-pt_BR.omf @@ -1354,6 +1500,7 @@ share/omf/multiload/multiload-sv.omf share/omf/multiload/multiload-uk.omf share/omf/stickynotes_applet/stickynotes_applet-C.omf share/omf/stickynotes_applet/stickynotes_applet-ca.omf +share/omf/stickynotes_applet/stickynotes_applet-de.omf share/omf/stickynotes_applet/stickynotes_applet-el.omf share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf share/omf/stickynotes_applet/stickynotes_applet-es.omf @@ -1370,17 +1517,22 @@ share/omf/trashapplet/trashapplet-C.omf share/omf/trashapplet/trashapplet-ca.omf share/omf/trashapplet/trashapplet-da.omf share/omf/trashapplet/trashapplet-de.omf +share/omf/trashapplet/trashapplet-el.omf share/omf/trashapplet/trashapplet-en_GB.omf share/omf/trashapplet/trashapplet-es.omf share/omf/trashapplet/trashapplet-fi.omf share/omf/trashapplet/trashapplet-fr.omf +share/omf/trashapplet/trashapplet-hu.omf share/omf/trashapplet/trashapplet-it.omf share/omf/trashapplet/trashapplet-nl.omf share/omf/trashapplet/trashapplet-oc.omf share/omf/trashapplet/trashapplet-pa.omf +share/omf/trashapplet/trashapplet-pt_BR.omf share/omf/trashapplet/trashapplet-ru.omf share/omf/trashapplet/trashapplet-sv.omf share/omf/trashapplet/trashapplet-uk.omf +share/omf/trashapplet/trashapplet-zh_HK.omf +share/omf/trashapplet/trashapplet-zh_TW.omf share/pixmaps/accessx-status-applet/ax-applet.png share/pixmaps/accessx-status-applet/ax-bouncekeys.png share/pixmaps/accessx-status-applet/ax-key-base.png @@ -1422,7 +1574,6 @@ share/pixmaps/accessx-status-applet/sticky-super-none.png %%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-50.png %%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-75.png %%CPUFREQ%%share/pixmaps/cpufreq-applet/cpufreq-na.png -%%PYTHON%%share/pixmaps/invest-big.png share/pixmaps/stickynotes/close.png share/pixmaps/stickynotes/locked.png share/pixmaps/stickynotes/resize_se.png @@ -1521,6 +1672,7 @@ share/xmodmap/xmodmap.yu @dirrm share/omf/stickynotes_applet @dirrm share/omf/multiload @dirrm share/omf/mixer_applet2 +%%PYTHON%%@dirrm share/omf/invest-applet @dirrm share/omf/gweather @dirrm share/omf/gswitchit @dirrm share/omf/geyes @@ -1530,12 +1682,18 @@ share/xmodmap/xmodmap.yu @dirrm share/omf/char-palette %%BATTERY%%@dirrm share/omf/battstat @dirrm share/omf/accessx-status +@dirrm share/gnome/help/trashapplet/zh_TW/figures +@dirrm share/gnome/help/trashapplet/zh_TW +@dirrm share/gnome/help/trashapplet/zh_HK/figures +@dirrm share/gnome/help/trashapplet/zh_HK @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk @dirrm share/gnome/help/trashapplet/sv/figures @dirrm share/gnome/help/trashapplet/sv @dirrm share/gnome/help/trashapplet/ru/figures @dirrm share/gnome/help/trashapplet/ru +@dirrm share/gnome/help/trashapplet/pt_BR/figures +@dirrm share/gnome/help/trashapplet/pt_BR @dirrm share/gnome/help/trashapplet/pa/figures @dirrm share/gnome/help/trashapplet/pa @dirrm share/gnome/help/trashapplet/oc/figures @@ -1544,6 +1702,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/trashapplet/nl @dirrm share/gnome/help/trashapplet/it/figures @dirrm share/gnome/help/trashapplet/it +@dirrm share/gnome/help/trashapplet/hu/figures +@dirrm share/gnome/help/trashapplet/hu @dirrm share/gnome/help/trashapplet/fr/figures @dirrm share/gnome/help/trashapplet/fr @dirrm share/gnome/help/trashapplet/fi/figures @@ -1552,6 +1712,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/trashapplet/es @dirrm share/gnome/help/trashapplet/en_GB/figures @dirrm share/gnome/help/trashapplet/en_GB +@dirrm share/gnome/help/trashapplet/el/figures +@dirrm share/gnome/help/trashapplet/el @dirrm share/gnome/help/trashapplet/de/figures @dirrm share/gnome/help/trashapplet/de @dirrm share/gnome/help/trashapplet/da/figures @@ -1585,6 +1747,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/stickynotes_applet/en_GB @dirrm share/gnome/help/stickynotes_applet/el/figures @dirrm share/gnome/help/stickynotes_applet/el +@dirrm share/gnome/help/stickynotes_applet/de/figures +@dirrm share/gnome/help/stickynotes_applet/de @dirrm share/gnome/help/stickynotes_applet/ca/figures @dirrm share/gnome/help/stickynotes_applet/ca @dirrm share/gnome/help/stickynotes_applet/C/figures @@ -1602,6 +1766,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/multiload/pa @dirrm share/gnome/help/multiload/oc/figures @dirrm share/gnome/help/multiload/oc +@dirrm share/gnome/help/multiload/nl/figures +@dirrm share/gnome/help/multiload/nl @dirrm share/gnome/help/multiload/ko/figures @dirrm share/gnome/help/multiload/ko @dirrm share/gnome/help/multiload/fr/figures @@ -1633,6 +1799,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/mixer_applet2/ko @dirrm share/gnome/help/mixer_applet2/it/figures @dirrm share/gnome/help/mixer_applet2/it +@dirrm share/gnome/help/mixer_applet2/hu/figures +@dirrm share/gnome/help/mixer_applet2/hu @dirrm share/gnome/help/mixer_applet2/fr/figures @dirrm share/gnome/help/mixer_applet2/fr @dirrm share/gnome/help/mixer_applet2/fi/figures @@ -1641,11 +1809,21 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/mixer_applet2/es @dirrm share/gnome/help/mixer_applet2/en_GB/figures @dirrm share/gnome/help/mixer_applet2/en_GB +@dirrm share/gnome/help/mixer_applet2/el/figures +@dirrm share/gnome/help/mixer_applet2/el +@dirrm share/gnome/help/mixer_applet2/de/figures +@dirrm share/gnome/help/mixer_applet2/de @dirrm share/gnome/help/mixer_applet2/ca/figures @dirrm share/gnome/help/mixer_applet2/ca @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 +%%PYTHON%%@dirrm share/gnome/help/invest-applet/sv +%%PYTHON%%@dirrm share/gnome/help/invest-applet/fi +%%PYTHON%%@dirrm share/gnome/help/invest-applet/es +%%PYTHON%%@dirrm share/gnome/help/invest-applet/el +%%PYTHON%%@dirrm share/gnome/help/invest-applet/C +%%PYTHON%%@dirrm share/gnome/help/invest-applet @dirrm share/gnome/help/gweather/uk/figures @dirrm share/gnome/help/gweather/uk @dirrm share/gnome/help/gweather/sv/figures @@ -1670,6 +1848,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/gweather/es @dirrm share/gnome/help/gweather/en_GB/figures @dirrm share/gnome/help/gweather/en_GB +@dirrm share/gnome/help/gweather/de/figures +@dirrm share/gnome/help/gweather/de @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather @@ -1707,6 +1887,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/geyes/en_GB @dirrm share/gnome/help/geyes/de/figures @dirrm share/gnome/help/geyes/de +@dirrm share/gnome/help/geyes/da/figures +@dirrm share/gnome/help/geyes/da @dirrm share/gnome/help/geyes/ca/figures @dirrm share/gnome/help/geyes/ca @dirrm share/gnome/help/geyes/bg/figures @@ -1738,9 +1920,15 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/drivemount/es @dirrm share/gnome/help/drivemount/en_GB/figures @dirrm share/gnome/help/drivemount/en_GB +@dirrm share/gnome/help/drivemount/de/figures +@dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_TW/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_TW +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_HK/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_HK %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures @@ -1763,6 +1951,8 @@ share/xmodmap/xmodmap.yu %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/en_GB +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/de/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/de %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ca %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures @@ -1784,6 +1974,8 @@ share/xmodmap/xmodmap.yu %%COMMANDER%%@dirrm share/gnome/help/command-line/es %%COMMANDER%%@dirrm share/gnome/help/command-line/en_GB/figures %%COMMANDER%%@dirrm share/gnome/help/command-line/en_GB +%%COMMANDER%%@dirrm share/gnome/help/command-line/el/figures +%%COMMANDER%%@dirrm share/gnome/help/command-line/el %%COMMANDER%%@dirrm share/gnome/help/command-line/C/figures %%COMMANDER%%@dirrm share/gnome/help/command-line/C %%COMMANDER%%@dirrm share/gnome/help/command-line @@ -1811,6 +2003,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/char-palette/es @dirrm share/gnome/help/char-palette/en_GB/figures @dirrm share/gnome/help/char-palette/en_GB +@dirrm share/gnome/help/char-palette/de/figures +@dirrm share/gnome/help/char-palette/de @dirrm share/gnome/help/char-palette/ca/figures @dirrm share/gnome/help/char-palette/ca @dirrm share/gnome/help/char-palette/bg/figures @@ -1840,6 +2034,8 @@ share/xmodmap/xmodmap.yu %%BATTERY%%@dirrm share/gnome/help/battstat/en_GB %%BATTERY%%@dirrm share/gnome/help/battstat/el/figures %%BATTERY%%@dirrm share/gnome/help/battstat/el +%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/de %%BATTERY%%@dirrm share/gnome/help/battstat/bg/figures %%BATTERY%%@dirrm share/gnome/help/battstat/bg %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures @@ -1853,6 +2049,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/accessx-status/oc @dirrm share/gnome/help/accessx-status/nl/figures @dirrm share/gnome/help/accessx-status/nl +@dirrm share/gnome/help/accessx-status/ko/figures +@dirrm share/gnome/help/accessx-status/ko @dirrm share/gnome/help/accessx-status/it/figures @dirrm share/gnome/help/accessx-status/it @dirrm share/gnome/help/accessx-status/fr/figures @@ -1863,6 +2061,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/accessx-status/es @dirrm share/gnome/help/accessx-status/en_GB/figures @dirrm share/gnome/help/accessx-status/en_GB +@dirrm share/gnome/help/accessx-status/el/figures +@dirrm share/gnome/help/accessx-status/el @dirrm share/gnome/help/accessx-status/ca/figures @dirrm share/gnome/help/accessx-status/ca @dirrm share/gnome/help/accessx-status/bg/figures @@ -1871,7 +2071,6 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status %%PYTHON%%@dirrm %%DATADIR%%/invest-applet -@dirrm %%DATADIR%%/glade @dirrm %%DATADIR%%/geyes/Tango @dirrm %%DATADIR%%/geyes/Horrid @dirrm %%DATADIR%%/geyes/Default-tiny @@ -1879,6 +2078,7 @@ share/xmodmap/xmodmap.yu @dirrm %%DATADIR%%/geyes/Bloodshot @dirrm %%DATADIR%%/geyes/Bizarre @dirrm %%DATADIR%%/geyes +@dirrm %%DATADIR%%/builder @dirrm %%DATADIR%% %%COMMANDER%%@dirrmtry libexec/gnome-applets %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest @@ -1888,16 +2088,22 @@ share/xmodmap/xmodmap.yu @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @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/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @@ -1940,5 +2146,7 @@ share/xmodmap/xmodmap.yu @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 03b8a1f1bbc9..57148507ec1d 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-desktop/Makefile,v 1.138 2008/03/11 00:00:35 ahze Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.154 2008/11/25 17:20:55 mezz Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index e92e83a59be5..d940c795e514 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.22.3.tar.bz2) = c5e24ee437e5d98c03299b0442523a6b -SHA256 (gnome2/gnome-desktop-2.22.3.tar.bz2) = 10c087e16c530eb2d09c5794ba5c0d6d2ec6e548860e13f31b2f2375df964dc9 -SIZE (gnome2/gnome-desktop-2.22.3.tar.bz2) = 1444103 +MD5 (gnome2/gnome-desktop-2.24.2.tar.bz2) = 57fd1002efdb8c24f72255cfe1bc497e +SHA256 (gnome2/gnome-desktop-2.24.2.tar.bz2) = 18148db9750e407507a776641f33e7b7f9a1888300618a89185a2831e3bbbdd2 +SIZE (gnome2/gnome-desktop-2.24.2.tar.bz2) = 1509817 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index 38d6a412e780..9f51fab3dcd6 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -3,10 +3,13 @@ include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h include/gnome-desktop-2.0/libgnomeui/gnome-bg.h include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h include/gnome-desktop-2.0/libgnomeui/gnome-hint.h +include/gnome-desktop-2.0/libgnomeui/gnome-rr-config.h +include/gnome-desktop-2.0/libgnomeui/gnome-rr-labeler.h +include/gnome-desktop-2.0/libgnomeui/gnome-rr.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.la lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.2 +lib/libgnome-desktop-2.so.7 libdata/pkgconfig/gnome-desktop-2.0.pc share/applications/gnome-about.desktop share/gnome-about/contributors.list @@ -24,6 +27,7 @@ share/gnome-about/headers/header-bg-snow01.png share/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml share/gnome/help/fdl/ar/fdl.xml +share/gnome/help/fdl/de/fdl.xml share/gnome/help/fdl/es/fdl.xml share/gnome/help/fdl/fr/fdl.xml share/gnome/help/fdl/hu/fdl.xml @@ -35,6 +39,8 @@ share/gnome/help/fdl/vi/fdl.xml share/gnome/help/gpl/C/gpl.xml share/gnome/help/gpl/ar/gpl.xml share/gnome/help/gpl/ca/gpl.xml +share/gnome/help/gpl/cs/gpl.xml +share/gnome/help/gpl/de/gpl.xml share/gnome/help/gpl/es/gpl.xml share/gnome/help/gpl/fi/gpl.xml share/gnome/help/gpl/fr/gpl.xml @@ -48,7 +54,9 @@ share/gnome/help/gpl/vi/gpl.xml share/gnome/help/gpl/zh_CN/gpl.xml share/gnome/help/lgpl/C/lgpl.xml share/gnome/help/lgpl/ar/lgpl.xml +share/gnome/help/lgpl/de/lgpl.xml share/gnome/help/lgpl/es/lgpl.xml +share/gnome/help/lgpl/fi/lgpl.xml share/gnome/help/lgpl/fr/lgpl.xml share/gnome/help/lgpl/hu/lgpl.xml share/gnome/help/lgpl/ko/lgpl.xml @@ -61,6 +69,7 @@ share/gnome/help/lgpl/zh_CN/lgpl.xml share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ast/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/be@latin/LC_MESSAGES/gnome-desktop-2.0.mo @@ -106,6 +115,7 @@ share/locale/ky/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/mai/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mg/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo @@ -122,6 +132,7 @@ share/locale/oc/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/or/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pl/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ps/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo @@ -132,7 +143,7 @@ share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo @@ -154,6 +165,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo share/omf/fdl/fdl-C.omf share/omf/fdl/fdl-ar.omf +share/omf/fdl/fdl-de.omf share/omf/fdl/fdl-es.omf share/omf/fdl/fdl-fr.omf share/omf/fdl/fdl-hu.omf @@ -165,6 +177,8 @@ share/omf/fdl/fdl-vi.omf share/omf/gpl/gpl-C.omf share/omf/gpl/gpl-ar.omf share/omf/gpl/gpl-ca.omf +share/omf/gpl/gpl-cs.omf +share/omf/gpl/gpl-de.omf share/omf/gpl/gpl-es.omf share/omf/gpl/gpl-fi.omf share/omf/gpl/gpl-fr.omf @@ -178,7 +192,9 @@ share/omf/gpl/gpl-vi.omf share/omf/gpl/gpl-zh_CN.omf share/omf/lgpl/lgpl-C.omf share/omf/lgpl/lgpl-ar.omf +share/omf/lgpl/lgpl-de.omf share/omf/lgpl/lgpl-es.omf +share/omf/lgpl/lgpl-fi.omf share/omf/lgpl/lgpl-fr.omf share/omf/lgpl/lgpl-hu.omf share/omf/lgpl/lgpl-ko.omf @@ -272,7 +288,9 @@ share/pixmaps/vnterm.xpm @dirrm share/gnome/help/lgpl/ko @dirrm share/gnome/help/lgpl/hu @dirrm share/gnome/help/lgpl/fr +@dirrm share/gnome/help/lgpl/fi @dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/lgpl/de @dirrm share/gnome/help/lgpl/ar @dirrm share/gnome/help/gpl/zh_CN @dirrm share/gnome/help/gpl/vi @@ -285,6 +303,8 @@ share/pixmaps/vnterm.xpm @dirrm share/gnome/help/gpl/fr @dirrm share/gnome/help/gpl/fi @dirrm share/gnome/help/gpl/es +@dirrm share/gnome/help/gpl/de +@dirrm share/gnome/help/gpl/cs @dirrm share/gnome/help/gpl/ca @dirrm share/gnome/help/gpl/ar @dirrm share/gnome/help/fdl/vi @@ -295,6 +315,7 @@ share/pixmaps/vnterm.xpm @dirrm share/gnome/help/fdl/hu @dirrm share/gnome/help/fdl/fr @dirrm share/gnome/help/fdl/es +@dirrm share/gnome/help/fdl/de @dirrm share/gnome/help/fdl/ar @dirrm share/gnome-about/headers @dirrmtry share/applications @@ -319,10 +340,14 @@ share/pixmaps/vnterm.xpm @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @@ -333,6 +358,8 @@ share/pixmaps/vnterm.xpm @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @@ -347,3 +374,5 @@ share/pixmaps/vnterm.xpm @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index acc19c213a31..264061e79925 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.74 2008/03/10 23:44:52 ahze Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.88 2008/11/25 17:27:09 mezz Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTVERSION= 2.24.2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 741021ea35d3..7786cd23a623 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-menus-2.22.2.tar.bz2) = 2bb185643632b28f4dba4b8201b8e230 -SHA256 (gnome2/gnome-menus-2.22.2.tar.bz2) = b3ef17eb05308e35e1627e5ca56b6951e9aea69cf112164ef698cdad6f44ed23 -SIZE (gnome2/gnome-menus-2.22.2.tar.bz2) = 465566 +MD5 (gnome2/gnome-menus-2.24.2.tar.bz2) = ca8e25b031fd7024b3f9abe1c6865d2c +SHA256 (gnome2/gnome-menus-2.24.2.tar.bz2) = c28cc72e69164533e4a64270486d18b58184920ec4f4b288758758a373d45d3c +SIZE (gnome2/gnome-menus-2.24.2.tar.bz2) = 453261 diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu index 85533b6d6c0e..116dad13f19b 100644 --- a/x11/gnome-menus/files/patch-layout::applications.menu +++ b/x11/gnome-menus/files/patch-layout::applications.menu @@ -1,8 +1,8 @@ ---- layout/applications.menu.orig Sun Jul 8 18:04:11 2007 -+++ layout/applications.menu Sun Jul 8 18:04:35 2007 -@@ -6,24 +6,26 @@ +--- layout/applications.menu.orig 2008-04-21 15:49:29.000000000 -0400 ++++ layout/applications.menu 2008-04-28 14:51:24.000000000 -0400 +@@ -6,9 +6,8 @@ <Name>Applications</Name> - <Directory>Applications.directory</Directory> + <Directory>X-GNOME-Menu-Applications.directory</Directory> - <!-- Scan legacy dirs first, as later items take priority --> - <KDELegacyDirs/> @@ -12,161 +12,106 @@ <LegacyDir>/usr/share/gnome/apps</LegacyDir> <!-- Read standard .directory and .desktop file locations --> - <DefaultAppDirs/> - <DefaultDirectoryDirs/> - -- <!-- Read in overrides and child menus from applications-merged/ --> -- <DefaultMergeDirs/> -- - <!-- Accessories submenu --> - <Menu> - <Name>Accessories</Name> - <Directory>Accessories.directory</Directory> - <Include> - <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> - <Category>Utility</Category> - <Not> - <Category>System</Category> -@@ -38,6 +40,12 @@ - <Directory>Accessibility.directory</Directory> - <Include> +@@ -31,6 +30,8 @@ + applications here --> + <Not><Category>Accessibility</Category></Not> + <Not><Category>System</Category></Not> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> + </And> + </Include> + </Menu> <!-- End Accessories --> +@@ -43,6 +44,8 @@ <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>Accessibility</Category> - <Not> - <Category>Settings</Category> -@@ -52,6 +60,12 @@ - <Directory>Development.directory</Directory> + <Not><Category>Settings</Category></Not> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> + </And> + </Include> + </Menu> <!-- End Accessibility --> +@@ -54,6 +57,8 @@ <Include> <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>Development</Category> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> <Filename>emacs.desktop</Filename> -@@ -64,6 +78,12 @@ - <Directory>Education.directory</Directory> + </Include> +@@ -66,6 +71,8 @@ <Include> <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>Education</Category> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> </Include> -@@ -75,6 +95,12 @@ - <Directory>Games.directory</Directory> + </Menu> <!-- End Education --> +@@ -77,6 +84,8 @@ <Include> <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>Game</Category> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> </Include> -@@ -86,6 +112,12 @@ - <Directory>Graphics.directory</Directory> + </Menu> <!-- End Games --> +@@ -88,6 +97,8 @@ <Include> <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>Graphics</Category> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> </Include> -@@ -97,6 +129,12 @@ - <Directory>Internet.directory</Directory> + </Menu> <!-- End Graphics --> +@@ -99,6 +110,8 @@ <Include> <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>Network</Category> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> </Include> -@@ -108,6 +146,12 @@ - <Directory>Multimedia.directory</Directory> + </Menu> <!-- End Internet --> +@@ -110,6 +123,8 @@ <Include> <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>AudioVideo</Category> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> </Include> -@@ -119,6 +163,12 @@ - <Directory>Office.directory</Directory> + </Menu> <!-- End Multimedia --> +@@ -121,6 +136,8 @@ <Include> <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>Office</Category> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> </Include> -@@ -130,6 +180,12 @@ - <Directory>System-Tools.directory</Directory> - <Include> + </Menu> <!-- End Office --> +@@ -133,6 +150,8 @@ <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> <Category>System</Category> <Not><Category>Settings</Category></Not> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> -@@ -143,11 +199,204 @@ - <OnlyUnallocated/> - <Include> - <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> + </Include> + </Menu> <!-- End System Tools --> +@@ -147,8 +166,197 @@ <Not><Category>Core</Category></Not> <Not><Category>Settings</Category></Not> <Not><Category>Screensaver</Category></Not> ++ <Not><Category>Qt</Category></Not> ++ <Not><Category>KDE</Category></Not> </And> </Include> </Menu> <!-- End Other --> -+ + + <!-- Read in overrides and child menus from applications-merged/ --> + <DefaultMergeDirs/> + @@ -353,5 +298,5 @@ + </Include> + </Menu> <!-- End KOther --> + </Menu> <!-- KDE --> - ++ </Menu> <!-- End Applications --> diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu deleted file mode 100644 index 705e0e6cd2ee..000000000000 --- a/x11/gnome-menus/files/patch-layout::preferences.menu +++ /dev/null @@ -1,41 +0,0 @@ ---- layout/preferences.menu.orig Tue Feb 13 04:18:01 2007 -+++ layout/preferences.menu Tue Feb 13 16:54:35 2007 -@@ -9,12 +9,15 @@ - <DefaultAppDirs/> - <DefaultDirectoryDirs/> - -- <!-- Read in overrides and child menus from preferences-merged/ --> -- <DefaultMergeDirs/> -- - <!-- Stuff in the toplevel --> - <Include> - <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> - <Category>Settings</Category> - <Not> - <Or> -@@ -36,10 +39,19 @@ - <Directory>Settings-Accessibility.directory</Directory> - <Include> - <And> -+ <Not> -+ <Or> -+ <Category>Qt</Category> -+ <Category>KDE</Category> -+ </Or> -+ </Not> - <Category>Settings</Category> - <Category>Accessibility</Category> - </And> - </Include> - </Menu> -+ -+ <!-- Read in overrides and child menus from preferences-merged/ --> -+ <DefaultMergeDirs/> - - </Menu> <!-- End Prefs --> diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 1541e93ecb50..117cf47d31ab 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -1,5 +1,4 @@ etc/xdg/menus/gnome-applications.menu -etc/xdg/menus/preferences.menu etc/xdg/menus/settings.menu include/gnome-menus/gmenu-tree.h lib/libgnome-menu.a @@ -10,32 +9,31 @@ lib/libgnome-menu.so.2 %%PYTHON_SITELIBDIR%%/gmenu.la %%PYTHON_SITELIBDIR%%/gmenu.so libdata/pkgconfig/libgnome-menu.pc -share/desktop-directories/Accessibility.directory -share/desktop-directories/Accessories.directory -share/desktop-directories/Applications.directory -share/desktop-directories/Desktop.directory +share/desktop-directories/AudioVideo.directory share/desktop-directories/Development.directory share/desktop-directories/Education.directory -share/desktop-directories/Games.directory +share/desktop-directories/Game.directory share/desktop-directories/Graphics.directory share/desktop-directories/Hardware.directory -share/desktop-directories/Internet.directory share/desktop-directories/InternetAndNetwork.directory share/desktop-directories/KDE.directory share/desktop-directories/LookAndFeel.directory -share/desktop-directories/Multimedia.directory +share/desktop-directories/Network.directory share/desktop-directories/Office.directory -share/desktop-directories/Other.directory share/desktop-directories/Personal.directory -share/desktop-directories/Preferences.directory -share/desktop-directories/Settings-Accessibility.directory +share/desktop-directories/Settings-System.directory share/desktop-directories/Settings.directory -share/desktop-directories/System-Settings.directory share/desktop-directories/System-Tools.directory share/desktop-directories/System.directory +share/desktop-directories/Utility-Accessibility.directory +share/desktop-directories/Utility.directory +share/desktop-directories/X-GNOME-Menu-Applications.directory +share/desktop-directories/X-GNOME-Menu-System.directory +share/desktop-directories/X-GNOME-Other.directory share/locale/af/LC_MESSAGES/gnome-menus.mo share/locale/ar/LC_MESSAGES/gnome-menus.mo share/locale/as/LC_MESSAGES/gnome-menus.mo +share/locale/ast/LC_MESSAGES/gnome-menus.mo share/locale/be/LC_MESSAGES/gnome-menus.mo share/locale/be@latin/LC_MESSAGES/gnome-menus.mo share/locale/bg/LC_MESSAGES/gnome-menus.mo @@ -65,13 +63,16 @@ share/locale/gn/LC_MESSAGES/gnome-menus.mo share/locale/gu/LC_MESSAGES/gnome-menus.mo share/locale/he/LC_MESSAGES/gnome-menus.mo share/locale/hi/LC_MESSAGES/gnome-menus.mo +share/locale/hr/LC_MESSAGES/gnome-menus.mo share/locale/hu/LC_MESSAGES/gnome-menus.mo share/locale/hy/LC_MESSAGES/gnome-menus.mo share/locale/id/LC_MESSAGES/gnome-menus.mo share/locale/io/LC_MESSAGES/gnome-menus.mo +share/locale/is/LC_MESSAGES/gnome-menus.mo share/locale/it/LC_MESSAGES/gnome-menus.mo share/locale/ja/LC_MESSAGES/gnome-menus.mo share/locale/ka/LC_MESSAGES/gnome-menus.mo +share/locale/kk/LC_MESSAGES/gnome-menus.mo share/locale/kn/LC_MESSAGES/gnome-menus.mo share/locale/ko/LC_MESSAGES/gnome-menus.mo share/locale/ku/LC_MESSAGES/gnome-menus.mo @@ -93,6 +94,7 @@ share/locale/oc/LC_MESSAGES/gnome-menus.mo share/locale/or/LC_MESSAGES/gnome-menus.mo share/locale/pa/LC_MESSAGES/gnome-menus.mo share/locale/pl/LC_MESSAGES/gnome-menus.mo +share/locale/ps/LC_MESSAGES/gnome-menus.mo share/locale/pt/LC_MESSAGES/gnome-menus.mo share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo share/locale/ro/LC_MESSAGES/gnome-menus.mo @@ -103,7 +105,7 @@ share/locale/sk/LC_MESSAGES/gnome-menus.mo share/locale/sl/LC_MESSAGES/gnome-menus.mo share/locale/sq/LC_MESSAGES/gnome-menus.mo share/locale/sr/LC_MESSAGES/gnome-menus.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo +share/locale/sr@latin/LC_MESSAGES/gnome-menus.mo share/locale/sv/LC_MESSAGES/gnome-menus.mo share/locale/ta/LC_MESSAGES/gnome-menus.mo share/locale/te/LC_MESSAGES/gnome-menus.mo @@ -131,10 +133,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -147,6 +153,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/io/LC_MESSAGES @dirrmtry share/locale/io @dirrmtry share/locale/hy/LC_MESSAGES @@ -161,5 +169,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index a534f3c5c3c8..d6fc21834590 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.177 2008/03/23 06:13:12 marcus Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.195 2009/01/10 01:59:22 mezz Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.22.2 -PORTREVISION?= 1 +PORTVERSION= 2.24.2 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -68,11 +68,6 @@ post-patch: ${XARGS} -n 10 ${REINPLACE_CMD} -e \ 's|"applications.menu"|"gnome-applications.menu"|' -post-install: - ${MKDIR} ${PREFIX}/share/gnome-panel - ${INSTALL_DATA} ${FILESDIR}/iso3166.tab \ - ${PREFIX}/share/gnome-panel/iso3166.tab - .include <bsd.port.post.mk> .endif diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 64b763212d0c..4f6d1f85b072 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.22.2.tar.bz2) = 3d8aab9d476a593e731afcd60272454a -SHA256 (gnome2/gnome-panel-2.22.2.tar.bz2) = e1ecc0ddc5a09481deb2daa1f30fa14472bfed541db46bb4f49f3d0d728b0a45 -SIZE (gnome2/gnome-panel-2.22.2.tar.bz2) = 3255261 +MD5 (gnome2/gnome-panel-2.24.2.tar.bz2) = a8c9df673e12e72694b55c665bb739dc +SHA256 (gnome2/gnome-panel-2.24.2.tar.bz2) = 0bce9329da4850344ca49a2c0f38f7987afcb98d29e52803a3de0a4664593c57 +SIZE (gnome2/gnome-panel-2.24.2.tar.bz2) = 3353083 diff --git a/x11/gnome-panel/files/iso3166.tab b/x11/gnome-panel/files/iso3166.tab deleted file mode 100644 index 22ff82083588..000000000000 --- a/x11/gnome-panel/files/iso3166.tab +++ /dev/null @@ -1,268 +0,0 @@ -# $OpenBSD: iso3166.tab,v 1.17 2007/02/02 20:26:51 millert Exp $ -# ISO 3166 alpha-2 country codes -# -# @(#)iso3166.tab 8.4 -# -# From Paul Eggert (2006-09-27): -# -# This file contains a table with the following columns: -# 1. ISO 3166-1 alpha-2 country code, current as of -# ISO 3166-1 Newsletter No. V-12 (2006-09-26). See: -# <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html"> -# ISO 3166 Maintenance agency (ISO 3166/MA) -# </a>. -# 2. The usual English name for the country, -# chosen so that alphabetic sorting of subsets produces helpful lists. -# This is not the same as the English name in the ISO 3166 tables. -# -# Columns are separated by a single tab. -# The table is sorted by country code. -# -# Lines beginning with `#' are comments. -# -#country- -#code country name -AD Andorra -AE United Arab Emirates -AF Afghanistan -AG Antigua & Barbuda -AI Anguilla -AL Albania -AM Armenia -AN Netherlands Antilles -AO Angola -AQ Antarctica -AR Argentina -AS Samoa (American) -AT Austria -AU Australia -AW Aruba -AX Aaland Islands -AZ Azerbaijan -BA Bosnia & Herzegovina -BB Barbados -BD Bangladesh -BE Belgium -BF Burkina Faso -BG Bulgaria -BH Bahrain -BI Burundi -BJ Benin -BM Bermuda -BN Brunei -BO Bolivia -BR Brazil -BS Bahamas -BT Bhutan -BV Bouvet Island -BW Botswana -BY Belarus -BZ Belize -CA Canada -CC Cocos (Keeling) Islands -CD Congo (Dem. Rep.) -CF Central African Rep. -CG Congo (Rep.) -CH Switzerland -CI Cote d'Ivoire -CK Cook Islands -CL Chile -CM Cameroon -CN China -CO Colombia -CR Costa Rica -CU Cuba -CV Cape Verde -CX Christmas Island -CY Cyprus -CZ Czech Republic -DE Germany -DJ Djibouti -DK Denmark -DM Dominica -DO Dominican Republic -DZ Algeria -EC Ecuador -EE Estonia -EG Egypt -EH Western Sahara -ER Eritrea -ES Spain -ET Ethiopia -FI Finland -FJ Fiji -FK Falkland Islands -FM Micronesia -FO Faroe Islands -FR France -GA Gabon -GB Britain (UK) -GD Grenada -GE Georgia -GF French Guiana -GG Guernsey -GH Ghana -GI Gibraltar -GL Greenland -GM Gambia -GN Guinea -GP Guadeloupe -GQ Equatorial Guinea -GR Greece -GS South Georgia & the South Sandwich Islands -GT Guatemala -GU Guam -GW Guinea-Bissau -GY Guyana -HK Hong Kong -HM Heard Island & McDonald Islands -HN Honduras -HR Croatia -HT Haiti -HU Hungary -ID Indonesia -IE Ireland -IL Israel -IM Isle of Man -IN India -IO British Indian Ocean Territory -IQ Iraq -IR Iran -IS Iceland -IT Italy -JE Jersey -JM Jamaica -JO Jordan -JP Japan -KE Kenya -KG Kyrgyzstan -KH Cambodia -KI Kiribati -KM Comoros -KN St Kitts & Nevis -KP Korea (North) -KR Korea (South) -KW Kuwait -KY Cayman Islands -KZ Kazakhstan -LA Laos -LB Lebanon -LC St Lucia -LI Liechtenstein -LK Sri Lanka -LR Liberia -LS Lesotho -LT Lithuania -LU Luxembourg -LV Latvia -LY Libya -MA Morocco -MC Monaco -MD Moldova -ME Montenegro -MG Madagascar -MH Marshall Islands -MK Macedonia -ML Mali -MM Myanmar (Burma) -MN Mongolia -MO Macau -MP Northern Mariana Islands -MQ Martinique -MR Mauritania -MS Montserrat -MT Malta -MU Mauritius -MV Maldives -MW Malawi -MX Mexico -MY Malaysia -MZ Mozambique -NA Namibia -NC New Caledonia -NE Niger -NF Norfolk Island -NG Nigeria -NI Nicaragua -NL Netherlands -NO Norway -NP Nepal -NR Nauru -NU Niue -NZ New Zealand -OM Oman -PA Panama -PE Peru -PF French Polynesia -PG Papua New Guinea -PH Philippines -PK Pakistan -PL Poland -PM St Pierre & Miquelon -PN Pitcairn -PR Puerto Rico -PS Palestine -PT Portugal -PW Palau -PY Paraguay -QA Qatar -RE Reunion -RO Romania -RS Serbia -RU Russia -RW Rwanda -SA Saudi Arabia -SB Solomon Islands -SC Seychelles -SD Sudan -SE Sweden -SG Singapore -SH St Helena -SI Slovenia -SJ Svalbard & Jan Mayen -SK Slovakia -SL Sierra Leone -SM San Marino -SN Senegal -SO Somalia -SR Suriname -ST Sao Tome & Principe -SV El Salvador -SY Syria -SZ Swaziland -TC Turks & Caicos Is -TD Chad -TF French Southern & Antarctic Lands -TG Togo -TH Thailand -TJ Tajikistan -TK Tokelau -TL East Timor -TM Turkmenistan -TN Tunisia -TO Tonga -TR Turkey -TT Trinidad & Tobago -TV Tuvalu -TW Taiwan -TZ Tanzania -UA Ukraine -UG Uganda -UM US minor outlying islands -US United States -UY Uruguay -UZ Uzbekistan -VA Vatican City -VC St Vincent -VE Venezuela -VG Virgin Islands (UK) -VI Virgin Islands (US) -VN Vietnam -VU Vanuatu -WF Wallis & Futuna -WS Samoa (western) -YE Yemen -YT Mayotte -ZA South Africa -ZM Zambia -ZW Zimbabwe diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c deleted file mode 100644 index b6524a42ddd0..000000000000 --- a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c +++ /dev/null @@ -1,15 +0,0 @@ ---- applets/clock/clock-zonetable.c.orig 2008-04-15 16:58:01.000000000 -0400 -+++ applets/clock/clock-zonetable.c 2008-04-19 20:32:30.000000000 -0400 -@@ -18,8 +18,12 @@ - #define ISO3166_FILE SYSTEM_ZONEINFODIR"/country.tab" - #else - #define ZONETAB_FILE SYSTEM_ZONEINFODIR"/zone.tab" -+#ifdef __FreeBSD__ -+#define ISO3166_FILE DATADIR"/gnome-panel/iso3166.tab" -+#else - #define ISO3166_FILE SYSTEM_ZONEINFODIR"/iso3166.tab" - #endif -+#endif - - static GObject *zonetable_singleton = NULL; - diff --git a/x11/gnome-panel/files/patch-gnome-panel_menu.c b/x11/gnome-panel/files/patch-gnome-panel_menu.c deleted file mode 100644 index aa7aeae8c193..000000000000 --- a/x11/gnome-panel/files/patch-gnome-panel_menu.c +++ /dev/null @@ -1,42 +0,0 @@ ---- gnome-panel/menu.c.orig Sat Mar 26 15:12:10 2005 -+++ gnome-panel/menu.c Fri Jun 3 11:17:45 2005 -@@ -1535,8 +1535,8 @@ - return NULL; - } - --static void --image_menu_shown (GtkWidget *image, gpointer data) -+static gboolean -+image_menu_exposed (GtkWidget *image, GdkEventExpose *event, gpointer data) - { - IconToLoad *new_icon; - IconToLoad *icon; -@@ -1545,7 +1545,7 @@ - - /* if we've already handled this */ - if (gtk_image_get_storage_type (GTK_IMAGE (image)) != GTK_IMAGE_EMPTY) -- return; -+ return FALSE; /* propagate event */ - - if (find_in_load_list (image) == NULL) { - new_icon = icon_to_load_copy (icon); -@@ -1554,6 +1554,8 @@ - } - if (load_icons_id == 0) - load_icons_id = g_idle_add (load_icons_handler, NULL); -+ -+ return FALSE; /* propagate event */ - } - - static void -@@ -1601,8 +1603,8 @@ - gtk_image_menu_item_set_image ( - GTK_IMAGE_MENU_ITEM (image_menu_item), image); - -- g_signal_connect_data (image, "map", -- G_CALLBACK (image_menu_shown), icon, -+ g_signal_connect_data (image, "expose-event", -+ G_CALLBACK (image_menu_exposed), icon, - (GClosureNotify) icon_to_load_free, 0); - - g_signal_connect (image, "destroy", diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 7d352da6d812..6a5de3dd3d01 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -44,7 +44,6 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml %%DATADIR%%/glade/panel-test-applets.glade %%DATADIR%%/glade/window-list.glade %%DATADIR%%/glade/workspace-switcher.glade -%%DATADIR%%/iso3166.tab %%DATADIR%%/pixmaps/clock-calendar-icon.png %%DATADIR%%/pixmaps/clock-face-large.svg %%DATADIR%%/pixmaps/clock-face-small-day.svg @@ -68,6 +67,9 @@ share/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png share/gnome/help/clock/C/legal.xml +share/gnome/help/clock/ar/clock.xml +share/gnome/help/clock/ar/figures/clock_applet.png +share/gnome/help/clock/ar/legal.xml share/gnome/help/clock/ca/clock.xml share/gnome/help/clock/ca/figures/clock_applet.png share/gnome/help/clock/ca/legal.xml @@ -80,6 +82,9 @@ share/gnome/help/clock/el/legal.xml share/gnome/help/clock/es/clock.xml share/gnome/help/clock/es/figures/clock_applet.png share/gnome/help/clock/es/legal.xml +share/gnome/help/clock/fi/clock.xml +share/gnome/help/clock/fi/figures/clock_applet.png +share/gnome/help/clock/fi/legal.xml share/gnome/help/clock/fr/clock.xml share/gnome/help/clock/fr/figures/clock_applet.png share/gnome/help/clock/fr/legal.xml @@ -113,6 +118,9 @@ share/gnome/help/clock/sr/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml +share/gnome/help/clock/th/clock.xml +share/gnome/help/clock/th/figures/clock_applet.png +share/gnome/help/clock/th/legal.xml share/gnome/help/clock/uk/clock.xml share/gnome/help/clock/uk/figures/clock_applet.png share/gnome/help/clock/uk/legal.xml @@ -143,12 +151,18 @@ share/gnome/help/fish/C/legal.xml share/gnome/help/fish/ca/figures/fish_applet.png share/gnome/help/fish/ca/fish.xml share/gnome/help/fish/ca/legal.xml +share/gnome/help/fish/de/figures/fish_applet.png +share/gnome/help/fish/de/fish.xml +share/gnome/help/fish/de/legal.xml share/gnome/help/fish/el/figures/fish_applet.png share/gnome/help/fish/el/fish.xml share/gnome/help/fish/el/legal.xml share/gnome/help/fish/es/figures/fish_applet.png share/gnome/help/fish/es/fish.xml share/gnome/help/fish/es/legal.xml +share/gnome/help/fish/fi/figures/fish_applet.png +share/gnome/help/fish/fi/fish.xml +share/gnome/help/fish/fi/legal.xml share/gnome/help/fish/fr/figures/fish_applet.png share/gnome/help/fish/fr/fish.xml share/gnome/help/fish/fr/legal.xml @@ -161,13 +175,20 @@ share/gnome/help/fish/ko/legal.xml share/gnome/help/fish/oc/figures/fish_applet.png share/gnome/help/fish/oc/fish.xml share/gnome/help/fish/oc/legal.xml +share/gnome/help/fish/ru/figures/fish_applet.png +share/gnome/help/fish/ru/fish.xml +share/gnome/help/fish/ru/legal.xml share/gnome/help/fish/sv/figures/fish_applet.png share/gnome/help/fish/sv/fish.xml share/gnome/help/fish/sv/legal.xml +share/gnome/help/fish/th/figures/fish_applet.png +share/gnome/help/fish/th/fish.xml +share/gnome/help/fish/th/legal.xml share/gnome/help/fish/uk/figures/fish_applet.png share/gnome/help/fish/uk/fish.xml share/gnome/help/fish/uk/legal.xml share/gnome/help/window-list/C/window-list.xml +share/gnome/help/window-list/ar/window-list.xml share/gnome/help/window-list/ca/window-list.xml share/gnome/help/window-list/da/window-list.xml share/gnome/help/window-list/de/figures/window_list_applet.png @@ -177,6 +198,7 @@ share/gnome/help/window-list/de/legal.xml share/gnome/help/window-list/de/window-list.xml share/gnome/help/window-list/el/window-list.xml share/gnome/help/window-list/es/window-list.xml +share/gnome/help/window-list/fi/window-list.xml share/gnome/help/window-list/fr/window-list.xml share/gnome/help/window-list/it/window-list.xml share/gnome/help/window-list/ja/figures/window_list_applet.png @@ -196,6 +218,7 @@ share/gnome/help/window-list/zh_TW/figures/window_list_group_applet.png share/gnome/help/window-list/zh_TW/legal.xml share/gnome/help/window-list/zh_TW/window-list.xml share/gnome/help/workspace-switcher/C/workspace-switcher.xml +share/gnome/help/workspace-switcher/ar/workspace-switcher.xml share/gnome/help/workspace-switcher/ca/workspace-switcher.xml share/gnome/help/workspace-switcher/da/workspace-switcher.xml share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png @@ -204,6 +227,7 @@ share/gnome/help/workspace-switcher/de/legal.xml share/gnome/help/workspace-switcher/de/workspace-switcher.xml share/gnome/help/workspace-switcher/el/workspace-switcher.xml share/gnome/help/workspace-switcher/es/workspace-switcher.xml +share/gnome/help/workspace-switcher/fi/workspace-switcher.xml share/gnome/help/workspace-switcher/fr/workspace-switcher.xml share/gnome/help/workspace-switcher/it/workspace-switcher.xml share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png @@ -287,6 +311,7 @@ share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo share/locale/as/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ast/LC_MESSAGES/gnome-panel-2.0.mo share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo share/locale/be@latin/LC_MESSAGES/gnome-panel-2.0.mo @@ -296,6 +321,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-panel-2.0.mo share/locale/br/LC_MESSAGES/gnome-panel-2.0.mo share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ca@valencia/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo @@ -321,6 +347,7 @@ share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo @@ -328,9 +355,11 @@ share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/la/LC_MESSAGES/gnome-panel-2.0.mo share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/mai/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mg/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mi/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo @@ -358,8 +387,8 @@ share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo @@ -377,10 +406,12 @@ share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo share/omf/clock/clock-C.omf +share/omf/clock/clock-ar.omf share/omf/clock/clock-ca.omf share/omf/clock/clock-de.omf share/omf/clock/clock-el.omf share/omf/clock/clock-es.omf +share/omf/clock/clock-fi.omf share/omf/clock/clock-fr.omf share/omf/clock/clock-it.omf share/omf/clock/clock-ja.omf @@ -392,18 +423,23 @@ share/omf/clock/clock-pt_BR.omf share/omf/clock/clock-ru.omf share/omf/clock/clock-sr.omf share/omf/clock/clock-sv.omf +share/omf/clock/clock-th.omf share/omf/clock/clock-uk.omf share/omf/clock/clock-zh_CN.omf share/omf/clock/clock-zh_TW.omf share/omf/fish/fish-C.omf share/omf/fish/fish-ca.omf +share/omf/fish/fish-de.omf share/omf/fish/fish-el.omf share/omf/fish/fish-es.omf +share/omf/fish/fish-fi.omf share/omf/fish/fish-fr.omf share/omf/fish/fish-it.omf share/omf/fish/fish-ko.omf share/omf/fish/fish-oc.omf +share/omf/fish/fish-ru.omf share/omf/fish/fish-sv.omf +share/omf/fish/fish-th.omf share/omf/fish/fish-uk.omf share/omf/gnome-panel/fish-applet-2-de.omf share/omf/gnome-panel/fish-applet-2-ja.omf @@ -417,11 +453,13 @@ share/omf/gnome-panel/workspace-switcher-ja.omf share/omf/gnome-panel/workspace-switcher-zh_CN.omf share/omf/gnome-panel/workspace-switcher-zh_TW.omf share/omf/window-list/window-list-C.omf +share/omf/window-list/window-list-ar.omf share/omf/window-list/window-list-ca.omf share/omf/window-list/window-list-da.omf share/omf/window-list/window-list-de.omf share/omf/window-list/window-list-el.omf share/omf/window-list/window-list-es.omf +share/omf/window-list/window-list-fi.omf share/omf/window-list/window-list-fr.omf share/omf/window-list/window-list-it.omf share/omf/window-list/window-list-ko.omf @@ -432,11 +470,13 @@ share/omf/window-list/window-list-sv.omf share/omf/window-list/window-list-uk.omf share/omf/window-list/window-list-zh_CN.omf share/omf/workspace-switcher/workspace-switcher-C.omf +share/omf/workspace-switcher/workspace-switcher-ar.omf share/omf/workspace-switcher/workspace-switcher-ca.omf share/omf/workspace-switcher/workspace-switcher-da.omf share/omf/workspace-switcher/workspace-switcher-de.omf share/omf/workspace-switcher/workspace-switcher-el.omf share/omf/workspace-switcher/workspace-switcher-es.omf +share/omf/workspace-switcher/workspace-switcher-fi.omf share/omf/workspace-switcher/workspace-switcher-fr.omf share/omf/workspace-switcher/workspace-switcher-it.omf share/omf/workspace-switcher/workspace-switcher-ko.omf @@ -471,12 +511,14 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrm share/gnome/help/workspace-switcher/ja @dirrm share/gnome/help/workspace-switcher/it @dirrm share/gnome/help/workspace-switcher/fr +@dirrm share/gnome/help/workspace-switcher/fi @dirrm share/gnome/help/workspace-switcher/es @dirrm share/gnome/help/workspace-switcher/el @dirrm share/gnome/help/workspace-switcher/de/figures @dirrm share/gnome/help/workspace-switcher/de @dirrm share/gnome/help/workspace-switcher/da @dirrm share/gnome/help/workspace-switcher/ca +@dirrm share/gnome/help/workspace-switcher/ar @dirrm share/gnome/help/workspace-switcher/C @dirrm share/gnome/help/workspace-switcher @dirrm share/gnome/help/window-list/zh_TW/figures @@ -492,18 +534,24 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrm share/gnome/help/window-list/ja @dirrm share/gnome/help/window-list/it @dirrm share/gnome/help/window-list/fr +@dirrm share/gnome/help/window-list/fi @dirrm share/gnome/help/window-list/es @dirrm share/gnome/help/window-list/el @dirrm share/gnome/help/window-list/de/figures @dirrm share/gnome/help/window-list/de @dirrm share/gnome/help/window-list/da @dirrm share/gnome/help/window-list/ca +@dirrm share/gnome/help/window-list/ar @dirrm share/gnome/help/window-list/C @dirrm share/gnome/help/window-list @dirrm share/gnome/help/fish/uk/figures @dirrm share/gnome/help/fish/uk +@dirrm share/gnome/help/fish/th/figures +@dirrm share/gnome/help/fish/th @dirrm share/gnome/help/fish/sv/figures @dirrm share/gnome/help/fish/sv +@dirrm share/gnome/help/fish/ru/figures +@dirrm share/gnome/help/fish/ru @dirrm share/gnome/help/fish/oc/figures @dirrm share/gnome/help/fish/oc @dirrm share/gnome/help/fish/ko/figures @@ -512,10 +560,14 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrm share/gnome/help/fish/it @dirrm share/gnome/help/fish/fr/figures @dirrm share/gnome/help/fish/fr +@dirrm share/gnome/help/fish/fi/figures +@dirrm share/gnome/help/fish/fi @dirrm share/gnome/help/fish/es/figures @dirrm share/gnome/help/fish/es @dirrm share/gnome/help/fish/el/figures @dirrm share/gnome/help/fish/el +@dirrm share/gnome/help/fish/de/figures +@dirrm share/gnome/help/fish/de @dirrm share/gnome/help/fish/ca/figures @dirrm share/gnome/help/fish/ca @dirrm share/gnome/help/fish/C/figures @@ -536,6 +588,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrm share/gnome/help/clock/zh_CN @dirrm share/gnome/help/clock/uk/figures @dirrm share/gnome/help/clock/uk +@dirrm share/gnome/help/clock/th/figures +@dirrm share/gnome/help/clock/th @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv @dirrm share/gnome/help/clock/sr/figures @@ -558,6 +612,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrm share/gnome/help/clock/it @dirrm share/gnome/help/clock/fr/figures @dirrm share/gnome/help/clock/fr +@dirrm share/gnome/help/clock/fi/figures +@dirrm share/gnome/help/clock/fi @dirrm share/gnome/help/clock/es/figures @dirrm share/gnome/help/clock/es @dirrm share/gnome/help/clock/el/figures @@ -566,6 +622,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrm share/gnome/help/clock/de @dirrm share/gnome/help/clock/ca/figures @dirrm share/gnome/help/clock/ca +@dirrm share/gnome/help/clock/ar/figures +@dirrm share/gnome/help/clock/ar @dirrm share/gnome/help/clock/C/figures @dirrm share/gnome/help/clock/C @dirrm share/gnome/help/clock @@ -586,6 +644,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrmtry share/locale/uz@cyrillic @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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @@ -604,6 +664,10 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg +@dirrmtry share/locale/mai/LC_MESSAGES +@dirrmtry share/locale/mai +@dirrmtry share/locale/la/LC_MESSAGES +@dirrmtry share/locale/la @dirrmtry share/locale/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @@ -614,9 +678,13 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrmtry share/locale/fur @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 @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 55386b4ce568..c9035bd7bcd1 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.83 2008/03/11 03:13:07 mezz Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.99 2009/01/02 19:17:35 marcus Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.22.2 -PORTREVISION= 7 +PORTVERSION= 2.24.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -23,7 +23,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd +USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \ + gnomedesktop CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index 30c1e46395ef..c788f1277214 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-screensaver-2.22.2.tar.bz2) = 496a2e0cba5c27db57a72ecf2e17f789 -SHA256 (gnome2/gnome-screensaver-2.22.2.tar.bz2) = a686d41f8623dbfc56c2c0bab5517a6380f538ed6ef7478ca51cfb9062e9f15b -SIZE (gnome2/gnome-screensaver-2.22.2.tar.bz2) = 2042396 +MD5 (gnome2/gnome-screensaver-2.24.1.tar.bz2) = f0b9cc3108bb9105141a8c22b56bf615 +SHA256 (gnome2/gnome-screensaver-2.24.1.tar.bz2) = c8cf26fc1d402269b7030abadfdf2c6103391cf30466b3d30bc99671f4c89f7e +SIZE (gnome2/gnome-screensaver-2.24.1.tar.bz2) = 2058780 diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index b54e5ce3589d..97557b557a12 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -19,6 +19,7 @@ share/desktop-directories/gnome-screensaver.directory %%DATADIR%%/lock-dialog-default.glade share/locale/ar/LC_MESSAGES/gnome-screensaver.mo share/locale/as/LC_MESSAGES/gnome-screensaver.mo +share/locale/ast/LC_MESSAGES/gnome-screensaver.mo share/locale/be/LC_MESSAGES/gnome-screensaver.mo share/locale/be@latin/LC_MESSAGES/gnome-screensaver.mo share/locale/bg/LC_MESSAGES/gnome-screensaver.mo @@ -44,11 +45,14 @@ share/locale/gl/LC_MESSAGES/gnome-screensaver.mo share/locale/gu/LC_MESSAGES/gnome-screensaver.mo share/locale/he/LC_MESSAGES/gnome-screensaver.mo share/locale/hi/LC_MESSAGES/gnome-screensaver.mo +share/locale/hr/LC_MESSAGES/gnome-screensaver.mo share/locale/hu/LC_MESSAGES/gnome-screensaver.mo share/locale/id/LC_MESSAGES/gnome-screensaver.mo +share/locale/is/LC_MESSAGES/gnome-screensaver.mo share/locale/it/LC_MESSAGES/gnome-screensaver.mo share/locale/ja/LC_MESSAGES/gnome-screensaver.mo share/locale/ka/LC_MESSAGES/gnome-screensaver.mo +share/locale/kn/LC_MESSAGES/gnome-screensaver.mo share/locale/ko/LC_MESSAGES/gnome-screensaver.mo share/locale/ku/LC_MESSAGES/gnome-screensaver.mo share/locale/lt/LC_MESSAGES/gnome-screensaver.mo @@ -76,7 +80,7 @@ share/locale/sk/LC_MESSAGES/gnome-screensaver.mo share/locale/sl/LC_MESSAGES/gnome-screensaver.mo share/locale/sq/LC_MESSAGES/gnome-screensaver.mo share/locale/sr/LC_MESSAGES/gnome-screensaver.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-screensaver.mo +share/locale/sr@latin/LC_MESSAGES/gnome-screensaver.mo share/locale/sv/LC_MESSAGES/gnome-screensaver.mo share/locale/ta/LC_MESSAGES/gnome-screensaver.mo share/locale/te/LC_MESSAGES/gnome-screensaver.mo @@ -106,6 +110,8 @@ share/pixmaps/gnome-logo-white.svg @dirrmtry share/locale/zh_HK @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/ps/LC_MESSAGES @@ -124,5 +130,7 @@ share/pixmaps/gnome-logo-white.svg @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 453051987f60..bebfa085cb59 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.141 2008/03/10 23:48:33 ahze Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.164 2008/11/25 19:25:49 marcus Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 CATEGORIES= x11 gnome MASTER_SITES= GNOME \ http://www.marcuscom.com/downloads/:local @@ -22,7 +22,8 @@ COMMENT= Session component for the GNOME 2 desktop BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \ - notify.1:${PORTSDIR}/devel/libnotify + notify.1:${PORTSDIR}/devel/libnotify \ + execinfo:${PORTSDIR}/devel/libexecinfo RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo @@ -34,6 +35,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docbook-docs CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -45,7 +47,7 @@ GCONF_SCHEMAS= gnome-session.schemas SPLASHES= freebsd-splashes-gnome-2.18_1.tar post-extract: - cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} + cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} post-install: ${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \ diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index e0168c18970f..2a485ff1bc98 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.22.3.tar.bz2) = 859b61b5368aa000c9bcb8b0d0688ca2 -SHA256 (gnome2/gnome-session-2.22.3.tar.bz2) = 07ec872ae8213c4e92072ff74451caa2b6afb747fd0b07d2cea40cfcd32b7176 -SIZE (gnome2/gnome-session-2.22.3.tar.bz2) = 773853 +MD5 (gnome2/gnome-session-2.24.2.tar.bz2) = 13e882a8c73bebb5403c207da0455156 +SHA256 (gnome2/gnome-session-2.24.2.tar.bz2) = b69216120e0fa972f3fbbff36b5520979974fa665d76d8c7db59970dca61b629 +SIZE (gnome2/gnome-session-2.24.2.tar.bz2) = 800914 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720 diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in deleted file mode 100644 index 82e1ed49f216..000000000000 --- a/x11/gnome-session/files/patch-data_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- data/Makefile.in.orig 2008-03-01 02:09:17.000000000 -0500 -+++ data/Makefile.in 2008-03-01 02:10:21.000000000 -0500 -@@ -258,7 +258,7 @@ default_in_files = default.session.in - default_DATA = $(default_in_files:.session.in=.session) - xsessiondir = $(datadir)/xsessions - xsession_in_files = gnome.desktop.in --xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) -+xsession_DATA = # $(xsession_in_files:.desktop.in=.desktop) - settingsdir = $(datadir)/applications - @SESSION_TRUE@settings_in_files = session-properties.desktop.in - @SESSION_TRUE@settings_DATA = $(settings_in_files:.desktop.in=.desktop) -@@ -280,7 +280,7 @@ CLEANFILES = \ - gnome.desktop \ - session-properties.desktop - --all: all-recursive -+all: all-recursive default.session - - .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) diff --git a/x11/gnome-session/files/patch-disable_debug b/x11/gnome-session/files/patch-disable_debug deleted file mode 100644 index 778d72c9e67f..000000000000 --- a/x11/gnome-session/files/patch-disable_debug +++ /dev/null @@ -1,13 +0,0 @@ ---- gnome-session/main.c.orig 2008-01-16 16:48:55.000000000 -0600 -+++ gnome-session/main.c 2008-01-16 16:50:01.000000000 -0600 -@@ -626,8 +626,8 @@ - major = atoi (versions [1]); - if ((major % 2) != 0) - { -- g_setenv ("G_DEBUG", "fatal_criticals", FALSE); -- g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); -+ /* g_setenv ("G_DEBUG", "fatal_criticals", FALSE); -+ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); */ - } - } - g_strfreev (versions); diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in new file mode 100644 index 000000000000..7e78d6ed5deb --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -0,0 +1,10 @@ +--- gnome-session/Makefile.in.orig 2008-08-20 14:29:34.000000000 -0400 ++++ gnome-session/Makefile.in 2008-08-20 14:29:56.000000000 -0400 +@@ -332,6 +332,7 @@ test_client_dbus_LDADD = \ + + gnome_session_LDADD = \ + -lSM -lICE \ ++ -lexecinfo \ + libgsmutil.la \ + $(top_builddir)/egg/libeggdesktopfile.la \ + $(GNOME_SESSION_LIBS) \ diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c b/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c new file mode 100644 index 000000000000..3044f1b8988f --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gsm-autostart-app.c @@ -0,0 +1,10 @@ +--- gnome-session/gsm-autostart-app.c.orig 2008-08-20 14:18:52.000000000 -0400 ++++ gnome-session/gsm-autostart-app.c 2008-08-20 14:19:02.000000000 -0400 +@@ -25,6 +25,7 @@ + #include <string.h> + #include <sys/wait.h> + #include <errno.h> ++#include <signal.h> + + #include <glib.h> + #include <gio/gio.h> diff --git a/x11/gnome-session/pkg-descr b/x11/gnome-session/pkg-descr index 50986ef910b2..ee3e0826ec85 100644 --- a/x11/gnome-session/pkg-descr +++ b/x11/gnome-session/pkg-descr @@ -1,2 +1,4 @@ This provides session management for the GNOME 2 desktop, and provides the tools used to start the desktop. + +WWW: http://www.gnome.org diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 9c51b437c0e5..6612cb2a9c39 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -1,10 +1,18 @@ bin/gnome-session bin/gnome-session-properties -bin/gnome-session-remove bin/gnome-session-save bin/gnome-wm +lib/gnome-session/helpers/at-spi-registryd-wrapper +lib/gnome-session/helpers/gnome-keyring-daemon-wrapper +lib/gnome-session/helpers/gnome-session-splash +lib/gnome-session/helpers/gnome-settings-daemon-helper share/applications/session-properties.desktop -share/gnome/default.session +%%DATADIR%%/gsm-inhibit-dialog.glade +%%DATADIR%%/session-properties.glade +share/gnome/autostart/at-spi-registryd-wrapper.desktop +share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop +share/gnome/autostart/gnome-session-splash.desktop +share/gnome/autostart/gnome-settings-daemon-helper.desktop share/icons/hicolor/16x16/apps/session-properties.png share/icons/hicolor/22x22/apps/session-properties.png share/icons/hicolor/24x24/apps/session-properties.png @@ -13,6 +21,7 @@ share/icons/hicolor/scalable/apps/session-properties.svg share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo +share/locale/ast/LC_MESSAGES/gnome-session-2.0.mo share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo @@ -81,7 +90,7 @@ share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo +share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo share/locale/te/LC_MESSAGES/gnome-session-2.0.mo @@ -117,8 +126,12 @@ share/pixmaps/splash/original-gnome-splash.png share/pixmaps/splash/tremulant-2.12.png share/pixmaps/splash/tremulant-blood-2.12.png share/pixmaps/splash/tremulant-brushed-metal-2.12.png +share/xsessions/gnome.desktop @dirrmtry share/xsessions +@dirrm %%DATADIR%% @dirrmtry share/applications +@dirrm lib/gnome-session/helpers +@dirrm lib/gnome-session @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -127,6 +140,8 @@ share/pixmaps/splash/tremulant-brushed-metal-2.12.png @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -153,3 +168,5 @@ share/pixmaps/splash/tremulant-brushed-metal-2.12.png @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin +@dirrmtry share/locale/ast/LC_MESSAGES +@dirrmtry share/locale/ast diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index adf1411b5cfd..f4a01ce3972c 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-terminal/Makefile,v 1.101 2008/03/11 02:42:58 mezz Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.113 2008/11/25 05:43:25 mezz Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.22.3 +PORTVERSION= 2.24.2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index e0fbe6d40c65..7e3356076669 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.22.3.tar.bz2) = ef61930fbafe81406c934dcf97efec09 -SHA256 (gnome2/gnome-terminal-2.22.3.tar.bz2) = fffe2b352167fa42680cae79be80c5082cd4a04f712564bc4ae5ff0253509cd7 -SIZE (gnome2/gnome-terminal-2.22.3.tar.bz2) = 1803177 +MD5 (gnome2/gnome-terminal-2.24.2.tar.bz2) = c864ee43335db306e344df41e0090d4f +SHA256 (gnome2/gnome-terminal-2.24.2.tar.bz2) = 849597d79f2dd6eb8d4079bc0b59c0f806a691ac2af360099ef0fa1f6b91e82a +SIZE (gnome2/gnome-terminal-2.24.2.tar.bz2) = 1854226 diff --git a/x11/gnome-terminal/files/patch-src_terminal-screen.c b/x11/gnome-terminal/files/patch-src_terminal-screen.c deleted file mode 100644 index ed0df8903943..000000000000 --- a/x11/gnome-terminal/files/patch-src_terminal-screen.c +++ /dev/null @@ -1,82 +0,0 @@ ---- src/terminal-screen.c.orig Wed Oct 18 15:50:28 2006 -+++ src/terminal-screen.c Wed Oct 18 15:49:42 2006 -@@ -244,6 +244,10 @@ - GtkAllocation *allocation) - { - GtkWidget *child; -+ GtkAllocation old_allocation; -+ -+ old_allocation.width = widget->allocation.width; -+ old_allocation.height = widget->allocation.height; - - widget->allocation = *allocation; - -@@ -251,6 +255,13 @@ - g_assert (child != NULL); - - gtk_widget_size_allocate (child, allocation); -+ -+ if (old_allocation.width != allocation->width || -+ old_allocation.height != allocation->height) -+ { -+ GtkWidget *term = TERMINAL_SCREEN (widget)->priv->term; -+ gtk_widget_queue_resize_no_redraw (term); -+ } - } - - static void -@@ -278,22 +289,22 @@ - #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" - - terminal_widget_match_add (screen->priv->term, -- "\\<" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+" -- "(:[0-9]+)?(" URLPATH ")?\\>/?", FLAVOR_AS_IS); -+ "[[:<:]]" SCHEME "//(" USER "@)?[" HOSTCHARS ".]+" -+ "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?", FLAVOR_AS_IS); - - terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+" -- "(:[0-9]+)?(" URLPATH ")?\\>/?", -+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+" -+ "(:[0-9]+)?(" URLPATH ")?[[:>:]]/?", - FLAVOR_DEFAULT_TO_HTTP); - - terminal_widget_match_add (screen->priv->term, -- "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]" -- "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", -+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9]" -+ "[a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", - FLAVOR_EMAIL); - - terminal_widget_match_add (screen->priv->term, -- "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+" -- "@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); -+ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+" -+ "@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); - - terminal_screen_setup_dnd (screen); - -@@ -548,7 +559,6 @@ - */ - terminal_screen_update_scrollbar (screen); - terminal_window_update_icon (screen->priv->window); -- terminal_window_update_geometry (screen->priv->window); - } - - if (GTK_WIDGET_REALIZED (screen->priv->term)) -@@ -909,7 +919,6 @@ - - terminal_widget_set_allow_bold (term, - terminal_profile_get_allow_bold (profile)); -- terminal_window_set_size (screen->priv->window, screen, TRUE); - } - - static void -@@ -1019,6 +1028,7 @@ - GtkWidget* - terminal_screen_get_widget (TerminalScreen *screen) - { -+ if (screen == NULL) return NULL; - return screen->priv->term; - } - diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 690ad8893f3d..bef6f9e81cc3 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -1,7 +1,13 @@ bin/gnome-terminal libdata/bonobo/servers/gnome-terminal.server share/applications/gnome-terminal.desktop -%%DATADIR%%/glade/gnome-terminal.glade2 +%%DATADIR%%/encodings-dialog.ui +%%DATADIR%%/keybinding-editor.ui +%%DATADIR%%/profile-manager.ui +%%DATADIR%%/profile-new-dialog.ui +%%DATADIR%%/profile-preferences.ui +%%DATADIR%%/skey-challenge.ui +%%DATADIR%%/terminal.xml share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/C/gnome-terminal.xml @@ -13,6 +19,9 @@ share/gnome/help/gnome-terminal/bg/legal.xml share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/ca/gnome-terminal.xml +share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/cs/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/cs/gnome-terminal.xml share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/de/gnome-terminal.xml @@ -97,10 +106,12 @@ share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo share/locale/ka/LC_MESSAGES/gnome-terminal.mo +share/locale/kn/LC_MESSAGES/gnome-terminal.mo share/locale/ko/LC_MESSAGES/gnome-terminal.mo share/locale/ku/LC_MESSAGES/gnome-terminal.mo share/locale/lt/LC_MESSAGES/gnome-terminal.mo share/locale/lv/LC_MESSAGES/gnome-terminal.mo +share/locale/mai/LC_MESSAGES/gnome-terminal.mo share/locale/mg/LC_MESSAGES/gnome-terminal.mo share/locale/mk/LC_MESSAGES/gnome-terminal.mo share/locale/ml/LC_MESSAGES/gnome-terminal.mo @@ -115,6 +126,7 @@ share/locale/oc/LC_MESSAGES/gnome-terminal.mo share/locale/or/LC_MESSAGES/gnome-terminal.mo share/locale/pa/LC_MESSAGES/gnome-terminal.mo share/locale/pl/LC_MESSAGES/gnome-terminal.mo +share/locale/ps/LC_MESSAGES/gnome-terminal.mo share/locale/pt/LC_MESSAGES/gnome-terminal.mo share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo share/locale/ro/LC_MESSAGES/gnome-terminal.mo @@ -125,7 +137,7 @@ share/locale/sk/LC_MESSAGES/gnome-terminal.mo share/locale/sl/LC_MESSAGES/gnome-terminal.mo share/locale/sq/LC_MESSAGES/gnome-terminal.mo share/locale/sr/LC_MESSAGES/gnome-terminal.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo +share/locale/sr@latin/LC_MESSAGES/gnome-terminal.mo share/locale/sv/LC_MESSAGES/gnome-terminal.mo share/locale/ta/LC_MESSAGES/gnome-terminal.mo share/locale/te/LC_MESSAGES/gnome-terminal.mo @@ -141,6 +153,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo share/omf/gnome-terminal/gnome-terminal-C.omf share/omf/gnome-terminal/gnome-terminal-bg.omf share/omf/gnome-terminal/gnome-terminal-ca.omf +share/omf/gnome-terminal/gnome-terminal-cs.omf share/omf/gnome-terminal/gnome-terminal-de.omf share/omf/gnome-terminal/gnome-terminal-es.omf share/omf/gnome-terminal/gnome-terminal-fr.omf @@ -155,7 +168,6 @@ share/omf/gnome-terminal/gnome-terminal-sv.omf share/omf/gnome-terminal/gnome-terminal-uk.omf share/omf/gnome-terminal/gnome-terminal-zh_CN.omf share/omf/gnome-terminal/gnome-terminal-zh_TW.omf -share/pixmaps/gnome-terminal.png @dirrm share/omf/gnome-terminal @dirrm share/gnome/help/gnome-terminal/zh_TW/figures @dirrm share/gnome/help/gnome-terminal/zh_TW @@ -185,6 +197,8 @@ share/pixmaps/gnome-terminal.png @dirrm share/gnome/help/gnome-terminal/es @dirrm share/gnome/help/gnome-terminal/de/figures @dirrm share/gnome/help/gnome-terminal/de +@dirrm share/gnome/help/gnome-terminal/cs/figures +@dirrm share/gnome/help/gnome-terminal/cs @dirrm share/gnome/help/gnome-terminal/ca/figures @dirrm share/gnome/help/gnome-terminal/ca @dirrm share/gnome/help/gnome-terminal/bg/figures @@ -192,7 +206,6 @@ share/pixmaps/gnome-terminal.png @dirrm share/gnome/help/gnome-terminal/C/figures @dirrm share/gnome/help/gnome-terminal/C @dirrm share/gnome/help/gnome-terminal -@dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -201,16 +214,22 @@ share/pixmaps/gnome-terminal.png @dirrmtry share/locale/xh @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @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/hy/LC_MESSAGES diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 9a60d284c61c..8a3840e53147 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.82 2008/03/12 21:19:04 marcus Exp $ +# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.84 2008/09/30 13:18:29 kwm Exp $ # PORTREVISION= 2 @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -power-tools COMMENT= The 'Geektoys' for the GNOME 2 power user -RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.22/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.24/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ ${LOCALBASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index e03957c7112d..f2f5a96a6d29 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.236 2008/03/15 18:40:17 marcus Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.260 2008/11/27 02:18:33 marcus Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.22.3 -PORTREVISION?= 1 +PORTVERSION= 2.24.2 +PORTREVISION?= 0 CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT?= The "meta-port" for the GNOME 2 integrated X11 desktop RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applets \ - gnome-cd:${PORTSDIR}/audio/gnome-media \ + gnome-audio-profiles-properties:${PORTSDIR}/audio/gnome-media \ gnome-dictionary:${PORTSDIR}/deskutils/gnome-utils \ eog:${PORTSDIR}/graphics/eog \ gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ @@ -38,27 +38,20 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple gok:${PORTSDIR}/accessibility/gok \ nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \ gcalctool:${PORTSDIR}/math/gcalctool \ - gucharmap:${PORTSDIR}/deskutils/gucharmap \ - zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ ${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \ dasher:${PORTSDIR}/accessibility/dasher \ evolution:${PORTSDIR}/mail/evolution \ ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnome-system-tools \ - gnome-nettool:${PORTSDIR}/net/gnome-nettool \ - vino-session:${PORTSDIR}/net/vino \ - exchange-connector-setup-2.22:${PORTSDIR}/mail/evolution-exchange \ + vino-passwd:${PORTSDIR}/net/vino \ + exchange-connector-setup-2.24:${PORTSDIR}/mail/evolution-exchange \ ${LOCALBASE}/lib/gstreamer-0.10/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ ${LOCALBASE}/lib/gstreamer-0.10/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \ totem:${PORTSDIR}/multimedia/totem \ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \ - ${LOCALBASE}/share/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ - sound-juicer:${PORTSDIR}/audio/sound-juicer \ - ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \ + ${LOCALBASE}/share/gnome-background-properties/gnome-nature.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ evince:${PORTSDIR}/graphics/evince \ - ${LOCALBASE}/libexec/fast-user-switch-applet:${PORTSDIR}/x11/fast-user-switch-applet \ - ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ alacarte:${PORTSDIR}/deskutils/alacarte \ gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \ ${LOCALBASE}/libexec/gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \ @@ -66,11 +59,9 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \ seahorse:${PORTSDIR}/security/seahorse \ - swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \ mousetweaks:${PORTSDIR}/accessibility/mousetweaks \ - vinagre:${PORTSDIR}/net/vinagre \ - cheese:${PORTSDIR}/multimedia/cheese \ - ${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info + ${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \ + ${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme NO_BUILD= yes @@ -92,8 +83,18 @@ RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp \ epiphany:${PORTSDIR}/www/epiphany .endif .if ${.CURDIR:T}!="gnome2-lite" +RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ + cheese:${PORTSDIR}/multimedia/cheese \ + gucharmap:${PORTSDIR}/deskutils/gucharmap \ + sound-juicer:${PORTSDIR}/audio/sound-juicer \ + zenity:${PORTSDIR}/x11/zenity \ + gnome-nettool:${PORTSDIR}/net/gnome-nettool \ + swfdec-player:${PORTSDIR}/multimedia/swfdec-gnome \ + vinagre:${PORTSDIR}/net/vinagre \ + ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \ + ${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet .if ${ARCH} == "i386" -RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy +#RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy .endif .if ${OSVERSION}>=600000 RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index d50e4ad2a054..71217e722faf 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,12 +3,12 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/x11/libgnome/Makefile,v 1.115 2008/03/10 15:39:00 ahze Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.123 2008/09/22 23:01:20 kwm Exp $ # PORTNAME= libgnome -PORTVERSION= 2.22.0 -PORTREVISION?= 1 +PORTVERSION= 2.24.1 +PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,7 +17,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Libraries for GNOME, a GNU desktop environment -#USE_BZIP2= yes +USE_BZIP2= yes .if !defined(REFERENCE_PORT) @@ -54,6 +54,7 @@ GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \ desktop_gnome_peripherals_keyboard.schemas \ desktop_gnome_peripherals_mouse.schemas \ desktop_gnome_sound.schemas \ + desktop_gnome_thumbnail_cache.schemas \ desktop_gnome_thumbnailers.schemas \ desktop_gnome_typing_break.schemas diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 24ddd0fdd860..e5cf9bc925b2 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnome-2.22.0.tar.gz) = 556dea8d920cb0a20a852ea36c28b58b -SHA256 (gnome2/libgnome-2.22.0.tar.gz) = 5992dcdc6fc0f5385c9b1e6254b7a9c1fb14dc6c53f24a029c818d6519407085 -SIZE (gnome2/libgnome-2.22.0.tar.gz) = 1954010 +MD5 (gnome2/libgnome-2.24.1.tar.bz2) = 3b2a30329898b37b2461b3aa886e5ad9 +SHA256 (gnome2/libgnome-2.24.1.tar.bz2) = 16c05ef6b1bbb057ceea512300de35f2d704609d7a3cacfd5301bc1a138e015a +SIZE (gnome2/libgnome-2.24.1.tar.bz2) = 1416606 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index 7d848a121482..f55e2fb51067 100644 --- a/x11/libgnome/files/pkg-deinstall.in +++ b/x11/libgnome/files/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.14 2008/01/28 17:41:05 mezz Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.17 2008/08/06 04:22:51 mezz Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index cd55ecea0376..d65cdfdd8fa5 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -68,6 +68,7 @@ share/locale/ko/LC_MESSAGES/libgnome-2.0.mo share/locale/ku/LC_MESSAGES/libgnome-2.0.mo share/locale/lt/LC_MESSAGES/libgnome-2.0.mo share/locale/lv/LC_MESSAGES/libgnome-2.0.mo +share/locale/mai/LC_MESSAGES/libgnome-2.0.mo share/locale/mg/LC_MESSAGES/libgnome-2.0.mo share/locale/mk/LC_MESSAGES/libgnome-2.0.mo share/locale/ml/LC_MESSAGES/libgnome-2.0.mo @@ -92,10 +93,11 @@ share/locale/sk/LC_MESSAGES/libgnome-2.0.mo share/locale/sl/LC_MESSAGES/libgnome-2.0.mo share/locale/sq/LC_MESSAGES/libgnome-2.0.mo share/locale/sr/LC_MESSAGES/libgnome-2.0.mo -share/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo +share/locale/sr@latin/LC_MESSAGES/libgnome-2.0.mo share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo share/locale/sv/LC_MESSAGES/libgnome-2.0.mo share/locale/ta/LC_MESSAGES/libgnome-2.0.mo +share/locale/te/LC_MESSAGES/libgnome-2.0.mo share/locale/th/LC_MESSAGES/libgnome-2.0.mo share/locale/tr/LC_MESSAGES/libgnome-2.0.mo share/locale/tt/LC_MESSAGES/libgnome-2.0.mo @@ -121,6 +123,10 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @dirrmtry share/locale/xh @dirrmtry share/locale/tt/LC_MESSAGES @dirrmtry share/locale/tt +@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/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije @dirrmtry share/locale/si/LC_MESSAGES @@ -133,6 +139,8 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @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/fur/LC_MESSAGES diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index f138a102a791..c44b33b8c0be 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -3,12 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libgnomekbd/Makefile,v 1.19 2008/03/20 13:08:28 marcus Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.26 2008/09/23 05:27:25 mezz Exp $ # PORTNAME= libgnomekbd -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.24.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +19,7 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_BZIP2= yes -USE_GNOME= libgnomeui gnometarget gnomeprefix gnomehack ltverhack +USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 libglade2 USE_AUTOTOOLS= libtool:15 INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index a4d5c97e740a..32e53cb8becf 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomekbd-2.22.0.tar.bz2) = a8b64278ae3471583607d734db9347eb -SHA256 (gnome2/libgnomekbd-2.22.0.tar.bz2) = 84ca7c6703909bccab436d631d69675c9815899752ffdf2fe76102a620f723da -SIZE (gnome2/libgnomekbd-2.22.0.tar.bz2) = 406083 +MD5 (gnome2/libgnomekbd-2.24.0.tar.bz2) = 43e4d090bc67a1984bebf551637783fd +SHA256 (gnome2/libgnomekbd-2.24.0.tar.bz2) = 60f093b4fcbdfa12212d6e29dc2f7802a3234d8035f45efed4b426c0bb293c5a +SIZE (gnome2/libgnomekbd-2.24.0.tar.bz2) = 411322 diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist index 5bcddd4508b4..5801f0641b34 100644 --- a/x11/libgnomekbd/pkg-plist +++ b/x11/libgnomekbd/pkg-plist @@ -9,11 +9,11 @@ include/libgnomekbd/gkbd-util.h lib/libgnomekbd.a lib/libgnomekbd.la lib/libgnomekbd.so -lib/libgnomekbd.so.2 +lib/libgnomekbd.so.3 lib/libgnomekbdui.a lib/libgnomekbdui.la lib/libgnomekbdui.so -lib/libgnomekbdui.so.2 +lib/libgnomekbdui.so.3 libdata/pkgconfig/libgnomekbd.pc libdata/pkgconfig/libgnomekbdui.pc share/applications/gkbd-indicator-plugins-capplet.desktop @@ -37,6 +37,7 @@ share/locale/fr/LC_MESSAGES/libgnomekbd.mo share/locale/gl/LC_MESSAGES/libgnomekbd.mo share/locale/gu/LC_MESSAGES/libgnomekbd.mo share/locale/he/LC_MESSAGES/libgnomekbd.mo +share/locale/hi/LC_MESSAGES/libgnomekbd.mo share/locale/hu/LC_MESSAGES/libgnomekbd.mo share/locale/it/LC_MESSAGES/libgnomekbd.mo share/locale/ja/LC_MESSAGES/libgnomekbd.mo @@ -47,8 +48,8 @@ share/locale/mk/LC_MESSAGES/libgnomekbd.mo share/locale/ml/LC_MESSAGES/libgnomekbd.mo share/locale/mr/LC_MESSAGES/libgnomekbd.mo share/locale/nb/LC_MESSAGES/libgnomekbd.mo -share/locale/nn/LC_MESSAGES/libgnomekbd.mo share/locale/nl/LC_MESSAGES/libgnomekbd.mo +share/locale/nn/LC_MESSAGES/libgnomekbd.mo share/locale/oc/LC_MESSAGES/libgnomekbd.mo share/locale/or/LC_MESSAGES/libgnomekbd.mo share/locale/pa/LC_MESSAGES/libgnomekbd.mo @@ -60,9 +61,10 @@ share/locale/si/LC_MESSAGES/libgnomekbd.mo share/locale/sl/LC_MESSAGES/libgnomekbd.mo share/locale/sq/LC_MESSAGES/libgnomekbd.mo share/locale/sr/LC_MESSAGES/libgnomekbd.mo -share/locale/sr@Latn/LC_MESSAGES/libgnomekbd.mo +share/locale/sr@latin/LC_MESSAGES/libgnomekbd.mo share/locale/sv/LC_MESSAGES/libgnomekbd.mo share/locale/ta/LC_MESSAGES/libgnomekbd.mo +share/locale/te/LC_MESSAGES/libgnomekbd.mo share/locale/th/LC_MESSAGES/libgnomekbd.mo share/locale/tr/LC_MESSAGES/libgnomekbd.mo share/locale/uk/LC_MESSAGES/libgnomekbd.mo @@ -72,9 +74,14 @@ share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm include/libgnomekbd @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/oc/LC_MESSAGES diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index b86345be051e..869959c7147e 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -3,12 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11/libgnomemm26/Makefile,v 1.16 2008/03/08 16:50:27 marcus Exp $ +# $MCom: ports/x11/libgnomemm26/Makefile,v 1.18 2008/09/22 11:12:42 kwm Exp $ # PORTNAME= libgnomemm -PORTVERSION= 2.22.0 -PORTREVISION= 2 +PORTVERSION= 2.24.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo index 1de4fb030c27..d3e15fb80280 100644 --- a/x11/libgnomemm26/distinfo +++ b/x11/libgnomemm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomemm-2.22.0.tar.bz2) = a07209b2cfbc630f8c4d46b6a6f1db32 -SHA256 (gnome2/libgnomemm-2.22.0.tar.bz2) = f9d8f5d19a53ec1f0f709adff091b6ea9e5169a09114936ccc6493808b5ddfd0 -SIZE (gnome2/libgnomemm-2.22.0.tar.bz2) = 323427 +MD5 (gnome2/libgnomemm-2.24.0.tar.bz2) = e77dd1df8e2eb1652d28e30d7c5252a4 +SHA256 (gnome2/libgnomemm-2.24.0.tar.bz2) = ef3f8bd78bd17651dc336620c942c57f78ab0fd09ec6d50df27ea90aac6c0ffd +SIZE (gnome2/libgnomemm-2.24.0.tar.bz2) = 311206 diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index c23fef5dd692..f6e56312cb50 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libxklavier/Makefile,v 1.39 2008/03/20 16:07:22 mezz Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.45 2008/09/07 00:58:39 marcus Exp $ # PORTNAME= libxklavier -PORTVERSION= 3.5 -PORTREVISION= 2 +PORTVERSION= 3.7 PORTEPOCH= 1 CATEGORIES= x11 gnome MASTER_SITES= SF @@ -17,13 +16,15 @@ MASTER_SITE_SUBDIR= gswitchit MAINTAINER= gnome@FreeBSD.org COMMENT= An utility library to make XKB stuff easier -RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes +RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \ + ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes USE_XORG= x11 xkbfile USE_GMAKE= yes -USE_GNOME= gnometarget gnomehack libxml2 glib20 +USE_GNOME= gnomehack libxml2 glib20 ltverhack:12 USE_LDCONFIG= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --disable-doxygen \ --with-xkb-base=${LOCALBASE}/share/X11/xkb \ diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 2b2523958002..cf8a701a5c65 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,3 +1,3 @@ -MD5 (libxklavier-3.5.tar.gz) = d0625fdd7e22dbe382af40872fbbe77b -SHA256 (libxklavier-3.5.tar.gz) = adac155e4d6be6b5bf6283eb265048e20c37c1caa49f39845532914151172706 -SIZE (libxklavier-3.5.tar.gz) = 448663 +MD5 (libxklavier-3.7.tar.gz) = 2a6029c6879c0c442528a4c9e9680870 +SHA256 (libxklavier-3.7.tar.gz) = b0acc8f89ea8af332ebbb4cd047c05f72989d92067f88096db6cbb2c93ae87ae +SIZE (libxklavier-3.7.tar.gz) = 416044 diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist index 493ca170ada0..53fb1e871e29 100644 --- a/x11/libxklavier/pkg-plist +++ b/x11/libxklavier/pkg-plist @@ -15,10 +15,10 @@ libdata/pkgconfig/libxklavier.pc %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml %%DOCSDIR%%/left.png -%%DOCSDIR%%/libxklavier-XklConfigItem.html -%%DOCSDIR%%/libxklavier-XklConfigRec.html -%%DOCSDIR%%/libxklavier-XklConfigRegistry.html -%%DOCSDIR%%/libxklavier-XklEngine.html +%%DOCSDIR%%/XklConfigItem.html +%%DOCSDIR%%/XklConfigRec.html +%%DOCSDIR%%/XklConfigRegistry.html +%%DOCSDIR%%/XklEngine.html %%DOCSDIR%%/libxklavier-xklavier.html %%DOCSDIR%%/libxklavier.devhelp %%DOCSDIR%%/libxklavier.devhelp2 diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 1b0b97016526..d86ce102c670 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -6,8 +6,7 @@ # PORTNAME= pixman -PORTVERSION= 0.10.0 -PORTREVISION= 2 +PORTVERSION= 0.12.0 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -15,6 +14,7 @@ COMMENT= Low-level pixel manipulation library XORG_CAT= lib USE_AUTOTOOLS= libtool:15 +USE_PERL5_BUILD=yes USE_GNOME= ltverhack:9 post-patch: diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index a24f00bb7c13..e45e92f7d5db 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/pixman-0.10.0.tar.bz2) = fb23e17a8a0308e8fad6dc153753ba9a -SHA256 (xorg/lib/pixman-0.10.0.tar.bz2) = 2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4 -SIZE (xorg/lib/pixman-0.10.0.tar.bz2) = 312275 +MD5 (xorg/lib/pixman-0.12.0.tar.bz2) = 494af78c1c7d825c9ad6815d7b91f17d +SHA256 (xorg/lib/pixman-0.12.0.tar.bz2) = a82b54382a82c2fb42f7ad2c8f363e945602a5183f6df685b69a584d3b25b228 +SIZE (xorg/lib/pixman-0.12.0.tar.bz2) = 364262 diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 93eb41194983..504dc0087f3d 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,12 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.122 2008/03/09 21:51:58 mezz Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.129 2008/09/23 04:41:44 mezz Exp $ # PORTNAME= yelp -PORTVERSION= 2.22.1 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -34,6 +33,4 @@ MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" GCONF_SCHEMAS= yelp.schemas -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 0cb3f4b7e4aa..95bed6317d13 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.22.1.tar.bz2) = a292c6712bb820e6aa2ade84ebdc9609 -SHA256 (gnome2/yelp-2.22.1.tar.bz2) = 6e990b35d914869dc82ada4790e2215ef71c884f6ccb8acf2e7a1c7d4b6f7614 -SIZE (gnome2/yelp-2.22.1.tar.bz2) = 995734 +MD5 (gnome2/yelp-2.24.0.tar.bz2) = 15eb2f538d970600c1e0a461f7d88b55 +SHA256 (gnome2/yelp-2.24.0.tar.bz2) = 7566177d23c3cac7725981f2d04de22923499318a067044158cff17f43957a0a +SIZE (gnome2/yelp-2.24.0.tar.bz2) = 1023876 diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index b55642d47706..f3a82cdf8807 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -30,6 +30,7 @@ share/locale/eu/LC_MESSAGES/yelp.mo share/locale/fa/LC_MESSAGES/yelp.mo share/locale/fi/LC_MESSAGES/yelp.mo share/locale/fr/LC_MESSAGES/yelp.mo +share/locale/fur/LC_MESSAGES/yelp.mo share/locale/ga/LC_MESSAGES/yelp.mo share/locale/gl/LC_MESSAGES/yelp.mo share/locale/gu/LC_MESSAGES/yelp.mo @@ -44,6 +45,7 @@ share/locale/ja/LC_MESSAGES/yelp.mo share/locale/ka/LC_MESSAGES/yelp.mo share/locale/kn/LC_MESSAGES/yelp.mo share/locale/ko/LC_MESSAGES/yelp.mo +share/locale/ks/LC_MESSAGES/yelp.mo share/locale/ku/LC_MESSAGES/yelp.mo share/locale/ky/LC_MESSAGES/yelp.mo share/locale/li/LC_MESSAGES/yelp.mo @@ -75,7 +77,7 @@ share/locale/sk/LC_MESSAGES/yelp.mo share/locale/sl/LC_MESSAGES/yelp.mo share/locale/sq/LC_MESSAGES/yelp.mo share/locale/sr/LC_MESSAGES/yelp.mo -share/locale/sr@Latn/LC_MESSAGES/yelp.mo +share/locale/sr@latin/LC_MESSAGES/yelp.mo share/locale/sv/LC_MESSAGES/yelp.mo share/locale/ta/LC_MESSAGES/yelp.mo share/locale/te/LC_MESSAGES/yelp.mo @@ -133,6 +135,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/ug @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @@ -151,6 +155,10 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/ks/LC_MESSAGES +@dirrmtry share/locale/ks +@dirrmtry share/locale/fur/LC_MESSAGES +@dirrmtry share/locale/fur @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index dfac6ea55dcc..84c53c113d56 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,12 +3,11 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ -# $MCom: ports/x11/zenity/Makefile,v 1.90 2008/03/10 13:46:16 ahze Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.96 2008/09/23 15:27:31 kwm Exp $ # PORTNAME= zenity -PORTVERSION= 2.22.1 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index 759db273c7d1..432f18412c69 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/zenity-2.22.1.tar.bz2) = 4e1e1f080e7253ee4f6a5cee3306c78d -SHA256 (gnome2/zenity-2.22.1.tar.bz2) = 6a3914b927970467efb5da938c57fbe9c4078cf088e1d2accab5488ff5cba4be -SIZE (gnome2/zenity-2.22.1.tar.bz2) = 1845688 +MD5 (gnome2/zenity-2.24.0.tar.bz2) = aa4486482210856848fa7d6634fc126a +SHA256 (gnome2/zenity-2.24.0.tar.bz2) = ad115104eb0a9007792380857030a49b508d300c46937e330ff2b4e70fb321a7 +SIZE (gnome2/zenity-2.24.0.tar.bz2) = 2236118 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 3ccc853a415e..0be5035d2e48 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -25,6 +25,18 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png share/gnome/help/zenity/bg/zenity.xml +share/gnome/help/zenity/de/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/de/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/de/figures/zenity-error-screenshot.png +share/gnome/help/zenity/de/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/de/figures/zenity-information-screenshot.png +share/gnome/help/zenity/de/figures/zenity-list-screenshot.png +share/gnome/help/zenity/de/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/de/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/de/figures/zenity-question-screenshot.png +share/gnome/help/zenity/de/figures/zenity-text-screenshot.png +share/gnome/help/zenity/de/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/de/zenity.xml share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png @@ -49,6 +61,18 @@ share/gnome/help/zenity/es/figures/zenity-question-screenshot.png share/gnome/help/zenity/es/figures/zenity-text-screenshot.png share/gnome/help/zenity/es/figures/zenity-warning-screenshot.png share/gnome/help/zenity/es/zenity.xml +share/gnome/help/zenity/fi/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-error-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-information-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-list-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-question-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-text-screenshot.png +share/gnome/help/zenity/fi/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/fi/zenity.xml share/gnome/help/zenity/fr/figures/zenity-calendar-screenshot.png share/gnome/help/zenity/fr/figures/zenity-entry-screenshot.png share/gnome/help/zenity/fr/figures/zenity-error-screenshot.png @@ -171,11 +195,12 @@ share/locale/pt_BR/LC_MESSAGES/zenity.mo share/locale/ro/LC_MESSAGES/zenity.mo share/locale/ru/LC_MESSAGES/zenity.mo share/locale/rw/LC_MESSAGES/zenity.mo +share/locale/si/LC_MESSAGES/zenity.mo share/locale/sk/LC_MESSAGES/zenity.mo share/locale/sl/LC_MESSAGES/zenity.mo share/locale/sq/LC_MESSAGES/zenity.mo share/locale/sr/LC_MESSAGES/zenity.mo -share/locale/sr@Latn/LC_MESSAGES/zenity.mo +share/locale/sr@latin/LC_MESSAGES/zenity.mo share/locale/sv/LC_MESSAGES/zenity.mo share/locale/ta/LC_MESSAGES/zenity.mo share/locale/te/LC_MESSAGES/zenity.mo @@ -190,8 +215,10 @@ share/locale/zh_HK/LC_MESSAGES/zenity.mo share/locale/zh_TW/LC_MESSAGES/zenity.mo share/omf/zenity/zenity-C.omf share/omf/zenity/zenity-bg.omf +share/omf/zenity/zenity-de.omf share/omf/zenity/zenity-en_GB.omf share/omf/zenity/zenity-es.omf +share/omf/zenity/zenity-fi.omf share/omf/zenity/zenity-fr.omf share/omf/zenity/zenity-oc.omf share/omf/zenity/zenity-ru.omf @@ -225,10 +252,14 @@ share/omf/zenity/zenity-uk.omf @dirrm share/gnome/help/zenity/oc @dirrm share/gnome/help/zenity/fr/figures @dirrm share/gnome/help/zenity/fr +@dirrm share/gnome/help/zenity/fi/figures +@dirrm share/gnome/help/zenity/fi @dirrm share/gnome/help/zenity/es/figures @dirrm share/gnome/help/zenity/es @dirrm share/gnome/help/zenity/en_GB/figures @dirrm share/gnome/help/zenity/en_GB +@dirrm share/gnome/help/zenity/de/figures +@dirrm share/gnome/help/zenity/de @dirrm share/gnome/help/zenity/bg/figures @dirrm share/gnome/help/zenity/bg @dirrm share/gnome/help/zenity/C/figures @@ -242,6 +273,10 @@ share/omf/zenity/zenity-uk.omf @dirrmtry share/locale/ug @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/si/LC_MESSAGES +@dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES |