diff options
723 files changed, 14974 insertions, 6001 deletions
@@ -3440,3 +3440,5 @@ mail/claws-mail-maildir||2008-03-21|Has expired: no longer supported by develope x11/e17-module-devian||2008-03-21|Has expired: abandoned by developer x11/e17-module-engage||2008-03-21|Has expired: abandoned by developer x11/e17-module-eveil||2008-03-21|Has expired: abandoned by developer +sysutils/hal-device-manager|sysutils/gnome-device-manager|2008-03-23|hal-device-manager has been retired +security/gnome-keyring-manager|security/seahorse|2008-03-23|functionality has been rolled into seahorse diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index ce7bb1291300..c7e2304bcb12 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.429 2007/08/04 22:09:00 marcus Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.447 2008/03/12 03:42:31 marcus Exp $ # # Please view me with 4 column tabs! @@ -46,8 +46,9 @@ Gnome_Pre_Include= bsd.gnome.mk # # non-version specific components -_USE_GNOME_ALL= esound intlhack intltool lthack ltverhack gnomehack \ - referencehack gnomehier gnomemimedata gnomeprefix gnometarget pkgconfig +_USE_GNOME_ALL= esound intlhack intltool ltasneededhack lthack ltverhack \ + gnomehack referencehack gnomehier gnomemimedata gnomeprefix \ + gnometarget pkgconfig # GNOME 1 components _USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 glibwww \ @@ -57,9 +58,9 @@ _USE_GNOME_ALL+= bonobo gal gconf gdkpixbuf glib12 glibwww \ # GNOME 2 components _USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gail \ - gal2 gconf2 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ + gal2 gconf2 _glib20 glib20 gnomecontrolcenter2 gnomedesktop gnomedocutils \ gnomemenus gnomepanel gnomesharp20 gnomespeech gnomevfs2 gtk20 \ - gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 \ + gtkhtml3 gtksharp10 gtksharp20 gtksourceview gtksourceview2 gvfs \ libartlgpl2 libbonobo libbonoboui libgailgnome libgda2 libgda3 \ libglade2 libgnome libgnomecanvas libgnomedb libgnomekbd libgnomeprint \ libgnomeprintui libgnomeui libgsf libgsf_gnome libgtkhtml libidl \ @@ -250,9 +251,13 @@ pygnome_BUILD_DEPENDS= ${pygnome_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome pygnome_RUN_DEPENDS= ${pygnome_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome 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_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_RUN_DEPENDS= ${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend +glib20_DETECT= ${LOCALBASE}/lib/gio/modules/libgiofam.so +glib20_USE_GNOME_IMPL= _glib20 atk_LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/accessibility/atk atk_DETECT= ${LOCALBASE}/libdata/pkgconfig/atk.pc @@ -297,11 +302,11 @@ libbonobo_USE_GNOME_IMPL=libxml2 orbit2 gconf2_LIB_DEPENDS= gconf-2.4:${PORTSDIR}/devel/gconf2 gconf2_DETECT= ${LOCALBASE}/libdata/pkgconfig/gconf-2.0.pc -gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 linc +gconf2_USE_GNOME_IMPL= orbit2 libxml2 gtk20 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 libbonobo gnomemimedata +gnomevfs2_USE_GNOME_IMPL=gconf2 gnomemimedata gail_LIB_DEPENDS= gailutil.18:${PORTSDIR}/accessibility/gail gail_DETECT= ${LOCALBASE}/libdata/pkgconfig/gail.pc @@ -325,7 +330,7 @@ libgnomeprintui_USE_GNOME_IMPL= libgnomeprint libgnomecanvas libgnome_LIB_DEPENDS= gnome-2.0:${PORTSDIR}/x11/libgnome libgnome_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-2.0.pc -libgnome_USE_GNOME_IMPL=libxslt gnomevfs2 esound +libgnome_USE_GNOME_IMPL=gnomevfs2 esound libbonobo libbonoboui_LIB_DEPENDS= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui libbonoboui_DETECT= ${LOCALBASE}/libdata/pkgconfig/libbonoboui-2.0.pc @@ -370,16 +375,16 @@ 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= gnomemenus gnomedesktop gail +eel2_USE_GNOME_IMPL= gnomedesktop gail gnomepanel_LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnome-panel gnomepanel_DETECT= ${LOCALBASE}/libdata/pkgconfig/libpanelapplet-2.0.pc -gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils +gnomepanel_USE_GNOME_IMPL=gnomedesktop libwnck gnomemenus gnomedocutils librsvg2 gnomepanel_GNOME_DESKTOP_VERSION=2 nautilus2_LIB_DEPENDS= nautilus-extension.1:${PORTSDIR}/x11-fm/nautilus nautilus2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libnautilus-extension.pc -nautilus2_USE_GNOME_IMPL=librsvg2 eel2 gnomedesktop desktopfileutils +nautilus2_USE_GNOME_IMPL=librsvg2 eel2 gnomedesktop desktopfileutils gvfs nautilus2_GNOME_DESKTOP_VERSION=2 metacity_LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity @@ -398,11 +403,11 @@ libgda2_LIB_DEPENDS= gda-2.3:${PORTSDIR}/databases/libgda2 libgda2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda.pc libgda2_USE_GNOME_IMPL= glib20 libxslt -libgda3_LIB_DEPENDS= gda-3.3:${PORTSDIR}/databases/libgda3 -libgda3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgda-2.0.pc +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 -libgnomedb_LIB_DEPENDS= gnomedb-3.4:${PORTSDIR}/databases/libgnomedb +libgnomedb_LIB_DEPENDS= gnomedb-3.0.4:${PORTSDIR}/databases/libgnomedb libgnomedb_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomedb.pc libgnomedb_USE_GNOME_IMPL=libgnomeui libgda3 @@ -469,7 +474,7 @@ nautiluscdburner_USE_GNOME_IMPL=nautilus2 desktopfileutils gnomemenus_LIB_DEPENDS= gnome-menu.2:${PORTSDIR}/x11/gnome-menus gnomemenus_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnome-menu.pc -gnomemenus_USE_GNOME_IMPL= gnomevfs2 +gnomemenus_USE_GNOME_IMPL= glib20 pygnomeextras_DETECT= ${LOCALBASE}/libdata/pkgconfig/gnome-python-extras-2.0.pc pygnomeextras_BUILD_DEPENDS= ${pygnomeextras_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome-extras @@ -502,7 +507,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.1:${PORTSDIR}/x11/libgnomekbd +libgnomekbd_LIB_DEPENDS= gnomekbd.2:${PORTSDIR}/x11/libgnomekbd libgnomekbd_USE_GNOME_IMPL= libgnomeui pygtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc @@ -510,6 +515,10 @@ pygtksourceview_BUILD_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkit pygtksourceview_RUN_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview pygtksourceview_USE_GNOME_IMPL= gtksourceview2 pygtk2 +gvfs_DETECT= ${LOCALBASE}/lib/libgvfscommon.so +gvfs_LIB_DEPENDS= gvfscommon.0:${PORTSDIR}/devel/gvfs +gvfs_USE_GNOME_IMPL= glib20 gconf2 + # End component definition section # This section defines tests for optional software. These work off four @@ -602,6 +611,10 @@ HAVE_GNOME+= ${component} Gnome_Post_Include= bsd.gnome.mk +.if !defined(Gnome_Pre_Include) +.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. @@ -654,7 +667,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) -ltverhack_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ +lthacks_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ ${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \ for file in ${LIBTOOLFILES}; do \ ${REINPLACE_CMD} -e \ @@ -663,13 +676,13 @@ ltverhack_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ ${PATCH_WRKSRC}/$$file; \ done; .else -. if ${USE_GNOME:Mltverhack}!="" -IGNORE= cannot install: ${PORTNAME} uses the ltverhack GNOME component but does not use libtool +. if ${USE_GNOME:Mltverhack}!="" || ${USE_GNOME:Mltasneededhack}!="" +IGNORE= cannot install: ${PORTNAME} uses the ltverhack and/or ltasneededhack GNOME components but does not use libtool . endif .endif ltverhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS} -ltverhack_PRE_PATCH+= for file in gnome-ltmain.sh gnome-libtool; do \ +ltverhack_PRE_PATCH= for file in gnome-ltmain.sh gnome-libtool; do \ if [ -f ${WRKDIR}/$$file ]; then \ ${REINPLACE_CMD} -e \ '/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \ @@ -678,17 +691,27 @@ ltverhack_PRE_PATCH+= for file in gnome-ltmain.sh gnome-libtool; do \ fi; \ done +ltasneededhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS} +ltasneededhack_PRE_PATCH= if [ -f ${WRKDIR}/gnome-libtool ]; then \ + ${REINPLACE_CMD} -e \ + '/^archive_cmds=/s/-shared/-shared -Wl,--as-needed/ ; \ + /^archive_expsym_cmds=/s/-shared/-shared -Wl,--as-needed/' \ + ${WRKDIR}/gnome-libtool; \ + fi + # Then traverse through all components, check which of them # exist in ${_USE_GNOME} and set variables accordingly .ifdef _USE_GNOME +. if ${USE_GNOME:Mltverhack}!= "" || ${USE_GNOME:Mltasneededhack}!= "" +GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH} +.endif . for component in ${_USE_GNOME_ALL} . if ${_USE_GNOME:M${component}}!="" PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} FETCH_DEPENDS+= ${${component}_FETCH_DEPENDS} EXTRACT_DEPENDS+=${${component}_EXTRACT_DEPENDS} BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} -LIB_DEPENDS+= ${${component}_LIB_DEPENDS} -RUN_DEPENDS+= ${${component}_RUN_DEPENDS} +####################################################### .if !defined(WITHOUT_HACK) .if defined(${component}_PREFIX) diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk index 73608afbf2eb..601efe93bcba 100644 --- a/Mk/bsd.gstreamer.mk +++ b/Mk/bsd.gstreamer.mk @@ -7,7 +7,7 @@ # Date: 4 Oct 2004 # # $FreeBSD$ -# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.38 2006/10/10 20:22:01 mezz Exp $ +# $MCom: ports/Mk/bsd.gstreamer.mk,v 1.43 2008/03/21 04:14:18 ahze Exp $ .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include) @@ -53,15 +53,16 @@ GST_SHLIB_VERSION= 1 # # These are the current supported gstreamer-plugins modules # -_USE_GSTREAMER10_ALL= a52dec aalib annodex bad bz2 cairo cdaudio cdparanoia dts \ - dv dvd esound faac faad ffmpeg flac gconf gnomevfs \ - gnonlin good gsm hal ivorbis jack jpeg ladspa lame \ - libcaca libmms libpng libvisual mp3 mpeg2enc mpeg2dec \ +_USE_GSTREAMER10_ALL= a52dec aalib annodex bz2 cairo cdaudio cdparanoia dts \ + dv dvd esound faac faad ffmpeg flac gconf gio gnomevfs \ + gnonlin gsm hal ivorbis jack jpeg ladspa lame \ + libcaca libmms libpng libvisual mm mp3 mpeg2enc mpeg2dec \ musepack nas neon ogg pango pulse python sdl shout2 sidplay \ - sndfile spc speex swfdec theora ugly vorbis wavpack x264 xvid + sndfile spc soundtouch soup speex swfdec taglib \ + theora vorbis wavpack x264 xvid # other plugins -OTHER_GSTREAMER_PLUGINS+= core yes ${_USE_GSTREAMER10_ALL} fluendo-mp3 mad +OTHER_GSTREAMER_PLUGINS+=bad good ugly core yes ${_USE_GSTREAMER10_ALL} fluendo-mp3 mad _USE_GSTREAMER_ALL+= ${OTHER_GSTREAMER_PLUGINS} @@ -112,6 +113,11 @@ mad_DEPENDS= audio/gstreamer-plugins-mad mikmod_DEPENDS= audio/gstreamer-plugins-mikmod +mm_DEPENDS= multimedia/gstreamermm +mm_GST_PREFIX= gstreamer +mm_GST_SUFX= # empty +mm_GST_VERSION= 0.9.4 + mp3_DEPENDS= audio/gstreamer-plugins-mp3 musepack_DEPENDS= audio/gstreamer-plugins-musepack @@ -139,19 +145,27 @@ smoothwave_DEPENDS= audio/gstreamer-plugins-smoothwave sndfile_DEPENDS= audio/gstreamer-plugins-sndfile +soundtouch_DEPENDS= audio/gstreamer-plugins-soundtouch + spc_DEPENDS= audio/gstreamer-plugins-spc speex_DEPENDS= audio/gstreamer-plugins-speex +taglib_DEPENDS= audio/gstreamer-plugins-taglib + vorbis_DEPENDS= audio/gstreamer-plugins-vorbis wavpack_DEPENDS= audio/gstreamer-plugins-wavpack # Devel Plugins Section +gio_DEPENDS= devel/gstreamer-plugins-gio + gnomevfs_DEPENDS= devel/gstreamer-plugins-gnomevfs sdl_DEPENDS= devel/gstreamer-plugins-sdl +soup_DEPENDS= devel/gstreamer-plugins-soup + # Graphics Plugins Section aalib_DEPENDS= graphics/gstreamer-plugins-aalib @@ -6,6 +6,39 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20080323: + AFFECTS: Gstreamer users + AUTHOR: multimedia@FreeBSD.org + + Gstreamer is updated. Due to the move of some plugins between ports. You will + have to rebuild the gstreamer-plugins-good port after upgrading. + + Portupgrade users: + # portupgrade -a + # portupgrade -f gstreamer-plugins-good + + Portmaster users: + # portmaster -a + # portmaster gstreamer-plugins-good + +20080323: + AFFECTS: All GNOME users and ports depend on gnomehier + AUTHOR: gnome@FreeBSD.org + + GNOME has been updated to 2.22.0. You have to deinstall a few ports first + before using portupgrade or portmaster in order to successfully upgrade + your GNOME installation. + + Portupgrade users: + # pkgdb -Ff + # pkg_deinstall -fO gnome-applets\* totem\* gnome-control-center\* + # portupgrade -aOW + + Portmaster users: + # pkg_delete -f gnome-applets\* totem\* gnome-control-center\* \ + gnome-keyring-manager\* + # portmaster -a + 20080318: AFFECTS: users of audio/gnump3d AUTHOR: jadawin@FreeBSD.org diff --git a/accessibility/Makefile b/accessibility/Makefile index a818b5e84b26..e6d190cc51f8 100644 --- a/accessibility/Makefile +++ b/accessibility/Makefile @@ -20,6 +20,7 @@ SUBDIR += java-access-bridge SUBDIR += kdeaccessibility SUBDIR += linux-atk + SUBDIR += mousetweaks SUBDIR += orca SUBDIR += py-papi SUBDIR += qt4-accessible diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile index abdccc38f52d..2a2eb2eefc22 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.4 2007/10/13 21:08:59 marcus Exp $ +# $MCom: ports/accessibility/accerciser/Makefile,v 1.13 2008/03/10 21:21:07 mezz Exp $ # PORTNAME= accerciser -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,15 +16,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Interactive Python accessibility explorer for GNOME USE_BZIP2= yes -USE_GNOME= atspi pygnomedesktop -GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +USE_GNOME= pygnomedesktop atspi intlhack USE_PYTHON= yes -MAN1= accerciser.1 -INSTALLS_OMF= yes USE_GETTEXT= yes +INSTALLS_OMF= yes INSTALLS_ICONS= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + GCONF_SCHEMAS= accerciser.schemas +MAN1= accerciser.1 .include <bsd.port.mk> diff --git a/accessibility/accerciser/distinfo b/accessibility/accerciser/distinfo index 681dc74bfba4..ea9a3a35e230 100644 --- a/accessibility/accerciser/distinfo +++ b/accessibility/accerciser/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/accerciser-1.0.1.tar.bz2) = 0bfcef80d75ab5772fca31e5021721c4 -SHA256 (gnome2/accerciser-1.0.1.tar.bz2) = f444711071b15075ddb2c7871b58db3df6c49db62650ee33441d97715e0fdbc9 -SIZE (gnome2/accerciser-1.0.1.tar.bz2) = 858043 +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 diff --git a/accessibility/accerciser/pkg-plist b/accessibility/accerciser/pkg-plist index 8f8a5cdba474..1c004d3c09f4 100644 --- a/accessibility/accerciser/pkg-plist +++ b/accessibility/accerciser/pkg-plist @@ -47,7 +47,6 @@ bin/accerciser %%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.py %%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.pyc %%PYTHON_SITELIBDIR%%/accerciser/prefs_dialog.pyo -%%PYTHON_SITELIBDIR%%/accerciser/pyatspi.zip %%PYTHON_SITELIBDIR%%/accerciser/script_playback.py %%PYTHON_SITELIBDIR%%/accerciser/script_playback.pyc %%PYTHON_SITELIBDIR%%/accerciser/script_playback.pyo @@ -137,6 +136,7 @@ bin/accerciser %%DATADIR%%/pixmaps/hicolor/22x22/tree.png %%DATADIR%%/pixmaps/hicolor/22x22/treetable.png %%DATADIR%%/pixmaps/hicolor/22x22/window.png +%%DATADIR%%/plugindata/validate/basic.py %%DATADIR%%/plugins/api_view.py %%DATADIR%%/plugins/console.py %%DATADIR%%/plugins/event_monitor.glade @@ -147,6 +147,8 @@ bin/accerciser %%DATADIR%%/plugins/quick_select.py %%DATADIR%%/plugins/script_recorder.glade %%DATADIR%%/plugins/script_recorder.py +%%DATADIR%%/plugins/validate.glade +%%DATADIR%%/plugins/validate.py share/applications/accerciser.desktop share/gnome/help/accerciser/C/accerciser.xml share/gnome/help/accerciser/C/figures/accerciser.png @@ -173,6 +175,18 @@ share/gnome/help/accerciser/es/figures/api_browser.png share/gnome/help/accerciser/es/figures/event_monitor.png share/gnome/help/accerciser/es/figures/interface_viewer.png share/gnome/help/accerciser/es/figures/script_recorder.png +share/gnome/help/accerciser/fr/accerciser.xml +share/gnome/help/accerciser/fr/figures/accerciser.png +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 @@ -195,6 +209,7 @@ share/locale/bg/LC_MESSAGES/accerciser.mo share/locale/bn/LC_MESSAGES/accerciser.mo share/locale/bn_IN/LC_MESSAGES/accerciser.mo share/locale/ca/LC_MESSAGES/accerciser.mo +share/locale/cs/LC_MESSAGES/accerciser.mo share/locale/da/LC_MESSAGES/accerciser.mo share/locale/de/LC_MESSAGES/accerciser.mo share/locale/dz/LC_MESSAGES/accerciser.mo @@ -209,11 +224,14 @@ share/locale/gu/LC_MESSAGES/accerciser.mo share/locale/he/LC_MESSAGES/accerciser.mo 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/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/nb/LC_MESSAGES/accerciser.mo +share/locale/nl/LC_MESSAGES/accerciser.mo share/locale/oc/LC_MESSAGES/accerciser.mo share/locale/or/LC_MESSAGES/accerciser.mo share/locale/pa/LC_MESSAGES/accerciser.mo @@ -230,10 +248,13 @@ share/locale/th/LC_MESSAGES/accerciser.mo 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/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 @@ -241,6 +262,10 @@ 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 @dirrm share/gnome/help/accerciser/es @dirrm share/gnome/help/accerciser/en_GB/figures @@ -250,7 +275,10 @@ share/omf/accerciser/accerciser-sv.omf @dirrm share/gnome/help/accerciser/C/figures @dirrm share/gnome/help/accerciser/C @dirrm share/gnome/help/accerciser +@dirrmtry share/applications @dirrm %%DATADIR%%/plugins +@dirrm %%DATADIR%%/plugindata/validate +@dirrm %%DATADIR%%/plugindata @dirrm %%DATADIR%%/pixmaps/hicolor/22x22 @dirrm %%DATADIR%%/pixmaps/hicolor @dirrm %%DATADIR%%/pixmaps @@ -267,4 +295,3 @@ share/omf/accerciser/accerciser-sv.omf @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index c679cda4a1d7..279c7d1a0fb3 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/at-spi/Makefile,v 1.65 2007/10/15 17:22:02 mezz Exp $ +# $MCom: ports/accessibility/at-spi/Makefile,v 1.71 2008/03/10 13:55:24 ahze Exp $ # PORTNAME= at-spi -PORTVERSION= 1.20.1 +PORTVERSION= 1.22.0 PORTREVISION?= 0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo index 373f19b3d3ff..bb23c476d486 100644 --- a/accessibility/at-spi/distinfo +++ b/accessibility/at-spi/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/at-spi-1.20.1.tar.bz2) = 9dc4ce96c17452cd285d006d03574e93 -SHA256 (gnome2/at-spi-1.20.1.tar.bz2) = d592833339a347d6e4b33946b717b7bbe61f7730d714112cd99715c5a3a3714e -SIZE (gnome2/at-spi-1.20.1.tar.bz2) = 842254 +MD5 (gnome2/at-spi-1.22.0.tar.bz2) = 85dc343588016ecf854830fab0cd6fdc +SHA256 (gnome2/at-spi-1.22.0.tar.bz2) = 1e692d44fea3432872af63e757fc0502e5da585b4f77c818982d9ebc3871032e +SIZE (gnome2/at-spi-1.22.0.tar.bz2) = 853631 diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index e128f52c1c3c..6671bb54b8df 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/atk/Makefile,v 1.85 2007/09/17 12:52:17 ahze Exp $ +# $MCom: ports/accessibility/atk/Makefile,v 1.90 2008/03/10 13:51:38 ahze Exp $ # PORTNAME= atk -PORTVERSION= 1.20.0 +PORTVERSION= 1.22.0 PORTREVISION?= 0 CATEGORIES= accessibility devel MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index 4008bfaea678..9f2a06386096 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/atk-1.20.0.tar.bz2) = b1a9e28d9f54ea306bd85a4c84b25fb8 -SHA256 (gnome2/atk-1.20.0.tar.bz2) = 1f3b2f2cbb5b0d8da0924970c66c3ecbfe13c4e4360b0af1db7545401a3747c9 -SIZE (gnome2/atk-1.20.0.tar.bz2) = 705435 +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 diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile index 23f7fdc45427..f4fbfad58320 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.59 2007/10/15 22:05:41 mezz Exp $ +# $MCom: ports/accessibility/dasher/Makefile,v 1.61 2007/11/15 20:54:19 marcus Exp $ # PORTNAME= dasher -PORTVERSION= 4.6.1 +PORTVERSION= 4.7.0 PORTEPOCH= 1 CATEGORIES= accessibility editors x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo index 98ee68b55eb7..f79d6b533199 100644 --- a/accessibility/dasher/distinfo +++ b/accessibility/dasher/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/dasher-4.6.1.tar.bz2) = 1457df5075477d757f7df5693947464d -SHA256 (gnome2/dasher-4.6.1.tar.bz2) = 3f0ee0a37465f5262937e8d2746bf7710cc6505e704e80c318dc3e01806aebc8 -SIZE (gnome2/dasher-4.6.1.tar.bz2) = 6473483 +MD5 (gnome2/dasher-4.7.0.tar.bz2) = 83fe6b7d3327baadcf350da19bfe7ce4 +SHA256 (gnome2/dasher-4.7.0.tar.bz2) = 3c4a8fb69f5710be1ad52c2260d5af49857ca10c4dd66322c70c79c3b701a745 +SIZE (gnome2/dasher-4.7.0.tar.bz2) = 6483077 diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist index 6e65094162d8..90b0fa82ce6b 100644 --- a/accessibility/dasher/pkg-plist +++ b/accessibility/dasher/pkg-plist @@ -152,6 +152,7 @@ share/applications/dasher.desktop %%DATADIR%%/dasher.compose.glade %%DATADIR%%/dasher.direct.glade %%DATADIR%%/dasher.fullscreen.glade +%%DATADIR%%/dasher.gameWIP.glade %%DATADIR%%/dasher.traditional.glade %%DATADIR%%/dashermaemo.glade %%DATADIR%%/dashermaemofullscreen.glade @@ -231,6 +232,22 @@ share/gnome/help/dasher/fr/figures/prefs2.png share/gnome/help/dasher/fr/figures/prefs3.png share/gnome/help/dasher/fr/figures/prefs4.png share/gnome/help/dasher/fr/figures/prefs5.png +share/gnome/help/dasher/oc/dasher.xml +share/gnome/help/dasher/oc/figures/a-z.gif +share/gnome/help/dasher/oc/figures/aa-az.gif +share/gnome/help/dasher/oc/figures/ala-alz.gif +share/gnome/help/dasher/oc/figures/exampleHad2.png +share/gnome/help/dasher/oc/figures/exampleHad2a.png +share/gnome/help/dasher/oc/figures/exampleHad3a.png +share/gnome/help/dasher/oc/figures/exampleHad4.png +share/gnome/help/dasher/oc/figures/figure2.png +share/gnome/help/dasher/oc/figures/main.png +share/gnome/help/dasher/oc/figures/object.gif +share/gnome/help/dasher/oc/figures/prefs1.png +share/gnome/help/dasher/oc/figures/prefs2.png +share/gnome/help/dasher/oc/figures/prefs3.png +share/gnome/help/dasher/oc/figures/prefs4.png +share/gnome/help/dasher/oc/figures/prefs5.png share/gnome/help/dasher/ru/dasher.xml share/gnome/help/dasher/ru/figures/a-z.gif share/gnome/help/dasher/ru/figures/aa-az.gif @@ -344,6 +361,7 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo share/omf/dasher/dasher-C.omf share/omf/dasher/dasher-es.omf share/omf/dasher/dasher-fr.omf +share/omf/dasher/dasher-oc.omf share/omf/dasher/dasher-ru.omf share/omf/dasher/dasher-sv.omf @dirrm share/omf/dasher @@ -351,6 +369,8 @@ share/omf/dasher/dasher-sv.omf @dirrm share/gnome/help/dasher/sv @dirrm share/gnome/help/dasher/ru/figures @dirrm share/gnome/help/dasher/ru +@dirrm share/gnome/help/dasher/oc/figures +@dirrm share/gnome/help/dasher/oc @dirrm share/gnome/help/dasher/fr/figures @dirrm share/gnome/help/dasher/fr @dirrm share/gnome/help/dasher/es/figures @@ -359,6 +379,7 @@ share/omf/dasher/dasher-sv.omf @dirrm share/gnome/help/dasher/C @dirrm share/gnome/help/dasher @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES @@ -385,4 +406,3 @@ share/omf/dasher/dasher-sv.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile index c5223c7f3f41..479d2a047cd9 100644 --- a/accessibility/gail/Makefile +++ b/accessibility/gail/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/accessibility/gail/Makefile,v 1.1 2007/11/30 19:23:48 marcus Exp $ +# $MCom: ports/accessibility/gail/Makefile,v 1.72 2008/03/10 13:58:50 ahze Exp $ # PORTNAME= gail -PORTVERSION= 1.20.2 +PORTVERSION= 1.22.0 PORTREVISION?= 0 CATEGORIES= accessibility x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo index 7795186fc58a..6dfc4e1bd035 100644 --- a/accessibility/gail/distinfo +++ b/accessibility/gail/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gail-1.20.2.tar.bz2) = e805806f897cf6040e1f3e9c0cd2151b -SHA256 (gnome2/gail-1.20.2.tar.bz2) = 5025b13a4f3b960c8ab7c3e5c7d6d86082e2e1af6ee18e61e37fd4ce3dcc0153 -SIZE (gnome2/gail-1.20.2.tar.bz2) = 659556 +MD5 (gnome2/gail-1.22.0.tar.bz2) = ff500cc53d088bb7f13d35a4fcf81e80 +SHA256 (gnome2/gail-1.22.0.tar.bz2) = ecde5368eb46c26365ec264541cd93e2afa481338e56363fbdb8895998df9f05 +SIZE (gnome2/gail-1.22.0.tar.bz2) = 674630 diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist index 6ae9531d56a8..4e53050d11e6 100644 --- a/accessibility/gail/pkg-plist +++ b/accessibility/gail/pkg-plist @@ -46,6 +46,7 @@ share/locale/is/LC_MESSAGES/gail.mo share/locale/it/LC_MESSAGES/gail.mo share/locale/ja/LC_MESSAGES/gail.mo share/locale/ka/LC_MESSAGES/gail.mo +share/locale/kn/LC_MESSAGES/gail.mo share/locale/ko/LC_MESSAGES/gail.mo share/locale/ku/LC_MESSAGES/gail.mo share/locale/lt/LC_MESSAGES/gail.mo @@ -55,6 +56,7 @@ share/locale/mi/LC_MESSAGES/gail.mo share/locale/mk/LC_MESSAGES/gail.mo share/locale/ml/LC_MESSAGES/gail.mo share/locale/mn/LC_MESSAGES/gail.mo +share/locale/mr/LC_MESSAGES/gail.mo share/locale/ms/LC_MESSAGES/gail.mo share/locale/nb/LC_MESSAGES/gail.mo share/locale/ne/LC_MESSAGES/gail.mo @@ -99,6 +101,8 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo @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/mi/LC_MESSAGES @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile new file mode 100644 index 000000000000..4fa6dcad09ae --- /dev/null +++ b/accessibility/mousetweaks/Makefile @@ -0,0 +1,30 @@ +# Ports collection makefile for: mousetweaks +# Date created: 2008 01 10 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.7 2008/03/10 21:35:20 mezz Exp $ +# + +PORTNAME= mousetweaks +PORTVERSION= 2.22.0 +CATEGORIES= accessibility +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Mouse accessibility enhancements for the GNOME desktop + +USE_XORG= xfixes +USE_BZIP2= yes +USE_GNOME= gnomehack gnomeprefix gnomepanel intlhack atspi +USE_GMAKE= yes +USE_GETTEXT= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= mousetweaks.schemas pointer-capture-applet.schemas +MAN1= dwell-click-applet.1 mousetweaks.1 pointer-capture-applet.1 + +.include <bsd.port.mk> diff --git a/accessibility/mousetweaks/distinfo b/accessibility/mousetweaks/distinfo new file mode 100644 index 000000000000..0eb2185c3c06 --- /dev/null +++ b/accessibility/mousetweaks/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/mousetweaks-2.22.0.tar.bz2) = a7715512c7ffdec65ead7a251609d0f5 +SHA256 (gnome2/mousetweaks-2.22.0.tar.bz2) = faa084861a246288397c36f00f36d62b80a48ab141317e50102827d6dbe48f37 +SIZE (gnome2/mousetweaks-2.22.0.tar.bz2) = 762940 diff --git a/accessibility/mousetweaks/pkg-descr b/accessibility/mousetweaks/pkg-descr new file mode 100644 index 000000000000..f5b3b2a9e816 --- /dev/null +++ b/accessibility/mousetweaks/pkg-descr @@ -0,0 +1,17 @@ +The Mousetweaks package provides mouse accessibility enhancements for the +GNOME desktop. + +These enhancements are: + +1. It offers a way to perform the various clicks without using any +hardware button. + +2. It allows users to perform a right click by doing a click&hold of the +left mousebutton. (For a left-handed mouse user, the termes left and right +have to be inverted.) + +3. It provides an applet that the user can install on a panel. This applet +creates an area on the panel into which the pointer can be captured until +the user releases it with a predefined button and modifier combination. + +WWW: https://launchpad.net/mousetweaks/ diff --git a/accessibility/mousetweaks/pkg-plist b/accessibility/mousetweaks/pkg-plist new file mode 100644 index 000000000000..a527cc47fdac --- /dev/null +++ b/accessibility/mousetweaks/pkg-plist @@ -0,0 +1,155 @@ +bin/dwell-click-applet +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 +share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-ctw-checkbox.png +share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-delay-slider.png +share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-gesture-mapping.png +share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-mode-choice.png +share/gnome/help/mousetweaks/C/figures/mouse-a11y-dwell-motion-treshold.png +share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-context-menu.png +share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-locked.png +share/gnome/help/mousetweaks/C/figures/mouse-a11y-pointer-capture-preferences.png +share/gnome/help/mousetweaks/C/figures/mouse-a11y-ssc-checkbox.png +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 +share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-ctw-checkbox.png +share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-delay-slider.png +share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-gesture-mapping.png +share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-mode-choice.png +share/gnome/help/mousetweaks/el/figures/mouse-a11y-dwell-motion-treshold.png +share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-context-menu.png +share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-locked.png +share/gnome/help/mousetweaks/el/figures/mouse-a11y-pointer-capture-preferences.png +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 +share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-ctw-checkbox.png +share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-delay-slider.png +share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-gesture-mapping.png +share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-mode-choice.png +share/gnome/help/mousetweaks/es/figures/mouse-a11y-dwell-motion-treshold.png +share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-context-menu.png +share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-locked.png +share/gnome/help/mousetweaks/es/figures/mouse-a11y-pointer-capture-preferences.png +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 +share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-ctw-checkbox.png +share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-delay-slider.png +share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-gesture-mapping.png +share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-mode-choice.png +share/gnome/help/mousetweaks/oc/figures/mouse-a11y-dwell-motion-treshold.png +share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-context-menu.png +share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-locked.png +share/gnome/help/mousetweaks/oc/figures/mouse-a11y-pointer-capture-preferences.png +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 +share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-ctw-checkbox.png +share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-delay-slider.png +share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-gesture-mapping.png +share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-mode-choice.png +share/gnome/help/mousetweaks/sv/figures/mouse-a11y-dwell-motion-treshold.png +share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-context-menu.png +share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-locked.png +share/gnome/help/mousetweaks/sv/figures/mouse-a11y-pointer-capture-preferences.png +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/ca/LC_MESSAGES/mousetweaks.mo +share/locale/cs/LC_MESSAGES/mousetweaks.mo +share/locale/da/LC_MESSAGES/mousetweaks.mo +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/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/hi/LC_MESSAGES/mousetweaks.mo +share/locale/hu/LC_MESSAGES/mousetweaks.mo +share/locale/it/LC_MESSAGES/mousetweaks.mo +share/locale/ja/LC_MESSAGES/mousetweaks.mo +share/locale/ko/LC_MESSAGES/mousetweaks.mo +share/locale/lt/LC_MESSAGES/mousetweaks.mo +share/locale/mk/LC_MESSAGES/mousetweaks.mo +share/locale/ml/LC_MESSAGES/mousetweaks.mo +share/locale/mr/LC_MESSAGES/mousetweaks.mo +share/locale/nb/LC_MESSAGES/mousetweaks.mo +share/locale/nl/LC_MESSAGES/mousetweaks.mo +share/locale/oc/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/sv/LC_MESSAGES/mousetweaks.mo +share/locale/ta/LC_MESSAGES/mousetweaks.mo +share/locale/th/LC_MESSAGES/mousetweaks.mo +share/locale/tr/LC_MESSAGES/mousetweaks.mo +share/locale/uk/LC_MESSAGES/mousetweaks.mo +share/locale/zh_CN/LC_MESSAGES/mousetweaks.mo +share/locale/zh_HK/LC_MESSAGES/mousetweaks.mo +share/locale/zh_TW/LC_MESSAGES/mousetweaks.mo +%%DATADIR%%/DwellClick.xml +%%DATADIR%%/PointerCapture.xml +%%DATADIR%%/ctw.glade +%%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 +@dirrm %%DATADIR%% +@dirrm share/gnome/help/mousetweaks/sv/figures +@dirrm share/gnome/help/mousetweaks/sv +@dirrm share/gnome/help/mousetweaks/oc/figures +@dirrm share/gnome/help/mousetweaks/oc +@dirrm share/gnome/help/mousetweaks/es/figures +@dirrm share/gnome/help/mousetweaks/es +@dirrm share/gnome/help/mousetweaks/el/figures +@dirrm share/gnome/help/mousetweaks/el +@dirrm share/gnome/help/mousetweaks/C/figures +@dirrm share/gnome/help/mousetweaks/C +@dirrm share/gnome/help/mousetweaks +@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/accessibility/orca/Makefile b/accessibility/orca/Makefile index ea947d98dcf1..9ba6466e9ace 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/accessibility/orca/Makefile,v 1.1 2007/12/01 05:37:44 marcus Exp $ +# $MCom: ports/accessibility/orca/Makefile,v 1.42 2008/03/10 00:56:17 mezz Exp $ # PORTNAME= orca -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 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 @@ -23,7 +22,6 @@ LATEST_LINK= gnome-orca USE_BZIP2= yes USE_GETTEXT= yes -USE_XLIB= yes USE_PYTHON= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2 diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo index 7484247d1ef2..6be199df6ad5 100644 --- a/accessibility/orca/distinfo +++ b/accessibility/orca/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/orca-2.20.3.tar.bz2) = a270df4640493e0a96dc6d363ae800a6 -SHA256 (gnome2/orca-2.20.3.tar.bz2) = 17dd0c42552a1d12005faa7b1366b15a60c8d33563a370d8668c43317bd6667c -SIZE (gnome2/orca-2.20.3.tar.bz2) = 1437345 +MD5 (gnome2/orca-2.22.0.tar.bz2) = a49e1c39261c916e8d9c7bc26740d085 +SHA256 (gnome2/orca-2.22.0.tar.bz2) = 72083afe8db20abd390e6ddbd34ec41e126ed7fd97c97963b1d4b1980fa70d37 +SIZE (gnome2/orca-2.22.0.tar.bz2) = 1730351 diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in index 80da5c7cb189..1aa834d5d041 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 Sun Mar 25 00:58:52 2007 -+++ src/orca/orca.in Sun Mar 25 01:02:09 2007 +--- src/orca/orca.in.orig 2007-11-08 11:02:26.000000000 -0500 ++++ src/orca/orca.in 2007-11-15 15:43:24.000000000 -0500 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash @@ -10,12 +10,12 @@ # Set the user's $PATH for this script. # --export PATH="/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin" -+export PATH="/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/local/bin:/usr/X11R6/bin" +-export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin" ++export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/local/bin:/usr/X11R6/bin" # If you set RUNONCE to "true", then this will just run Orca once and quit. # -@@ -125,7 +125,7 @@ watchdog() +@@ -145,7 +145,7 @@ watchdog() do sleep 5 USERID=`id | cut -f2 -d= | cut -f1 -d\(` diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist index 56202a965b54..e1e62a87eaa3 100644 --- a/accessibility/orca/pkg-plist +++ b/accessibility/orca/pkg-plist @@ -14,9 +14,9 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.py %%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.pyc %%PYTHON_SITELIBDIR%%/orca/app_gui_prefs.pyo -%%PYTHON_SITELIBDIR%%/orca/atspi.py -%%PYTHON_SITELIBDIR%%/orca/atspi.pyc -%%PYTHON_SITELIBDIR%%/orca/atspi.pyo +%%PYTHON_SITELIBDIR%%/orca/app_prefs.py +%%PYTHON_SITELIBDIR%%/orca/app_prefs.pyc +%%PYTHON_SITELIBDIR%%/orca/app_prefs.pyo %%PYTHON_SITELIBDIR%%/orca/bookmarks.py %%PYTHON_SITELIBDIR%%/orca/bookmarks.pyc %%PYTHON_SITELIBDIR%%/orca/bookmarks.pyo @@ -73,6 +73,9 @@ bin/orca %%PYTHON_SITELIBDIR%%/orca/keynames.py %%PYTHON_SITELIBDIR%%/orca/keynames.pyc %%PYTHON_SITELIBDIR%%/orca/keynames.pyo +%%PYTHON_SITELIBDIR%%/orca/liveregions.py +%%PYTHON_SITELIBDIR%%/orca/liveregions.pyc +%%PYTHON_SITELIBDIR%%/orca/liveregions.pyo %%PYTHON_SITELIBDIR%%/orca/mag.py %%PYTHON_SITELIBDIR%%/orca/mag.pyc %%PYTHON_SITELIBDIR%%/orca/mag.pyo @@ -199,6 +202,9 @@ bin/orca %%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/self_voicing.py %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo @@ -251,6 +257,7 @@ share/locale/hi/LC_MESSAGES/orca.mo share/locale/hu/LC_MESSAGES/orca.mo share/locale/it/LC_MESSAGES/orca.mo share/locale/ja/LC_MESSAGES/orca.mo +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 @@ -288,6 +295,7 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo %%DATADIR%%/glade/orca-setup.glade @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts @dirrm %%PYTHON_SITELIBDIR%%/orca @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -304,4 +312,3 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 6496daa4496a..59b8ec65ddf0 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -3,15 +3,15 @@ # Whom: Anders Nordby <anders@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/archivers/file-roller/Makefile,v 1.1 2007/12/01 06:00:43 marcus Exp $ +# $MCom: ports/archivers/file-roller/Makefile,v 1.136 2008/03/11 18:31:35 mezz Exp $ # PORTNAME= file-roller -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers 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/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index 66733c6addcb..603421314cf6 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/file-roller-2.20.3.tar.bz2) = 7af6bac2e96ad9c728d791ce21dba8f5 -SHA256 (gnome2/file-roller-2.20.3.tar.bz2) = a1f7cb6935bfa51fb838406a223e4aaf63a4ae718292fefc1cfd34122b61c56c -SIZE (gnome2/file-roller-2.20.3.tar.bz2) = 1226251 +MD5 (gnome2/file-roller-2.22.0.tar.bz2) = 81836da5b75575c45154ad851da699cb +SHA256 (gnome2/file-roller-2.22.0.tar.bz2) = a4a188c45a000098bfa199aa5de79bae8554300c6fc05efb028e17e5c3027e7e +SIZE (gnome2/file-roller-2.22.0.tar.bz2) = 1268253 diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 11bea8942fd2..344e9daf3e35 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -1,7 +1,7 @@ bin/file-roller -lib/nautilus/extensions-1.0/libnautilus-fileroller.a -lib/nautilus/extensions-1.0/libnautilus-fileroller.la -lib/nautilus/extensions-1.0/libnautilus-fileroller.so +lib/nautilus/extensions-2.0/libnautilus-fileroller.a +lib/nautilus/extensions-2.0/libnautilus-fileroller.la +lib/nautilus/extensions-2.0/libnautilus-fileroller.so libexec/file-roller/isoinfo.sh share/applications/file-roller.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS @@ -15,6 +15,7 @@ share/applications/file-roller.desktop %%DATADIR%%/glade/open-with.glade %%DATADIR%%/glade/password.glade %%DATADIR%%/glade/properties.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 %%DATADIR%%/icons/hicolor/16x16/actions/extract-archive.png @@ -95,6 +96,7 @@ share/icons/hicolor/32x32/apps/file-roller.png share/icons/hicolor/scalable/apps/file-roller.svg share/locale/am/LC_MESSAGES/file-roller.mo share/locale/ar/LC_MESSAGES/file-roller.mo +share/locale/as/LC_MESSAGES/file-roller.mo share/locale/az/LC_MESSAGES/file-roller.mo share/locale/be/LC_MESSAGES/file-roller.mo share/locale/be@latin/LC_MESSAGES/file-roller.mo @@ -169,6 +171,8 @@ share/locale/th/LC_MESSAGES/file-roller.mo share/locale/tk/LC_MESSAGES/file-roller.mo share/locale/tr/LC_MESSAGES/file-roller.mo share/locale/uk/LC_MESSAGES/file-roller.mo +share/locale/ur/LC_MESSAGES/file-roller.mo +share/locale/ur_PK/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo share/locale/xh/LC_MESSAGES/file-roller.mo share/locale/zh_CN/LC_MESSAGES/file-roller.mo @@ -218,6 +222,7 @@ share/omf/file-roller/file-roller-uk.omf @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrmtry share/applications @dirrm libexec/file-roller @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @@ -225,6 +230,10 @@ share/omf/file-roller/file-roller-uk.omf @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/ur_PK/LC_MESSAGES +@dirrmtry share/locale/ur_PK +@dirrmtry share/locale/ur/LC_MESSAGES +@dirrmtry share/locale/ur @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@ije/LC_MESSAGES @@ -249,4 +258,5 @@ share/omf/file-roller/file-roller-uk.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile index 4a212905146c..5fc34e370966 100644 --- a/astro/glunarclock/Makefile +++ b/astro/glunarclock/Makefile @@ -3,11 +3,11 @@ # Whom: Vincent Tantardini <vinc@freebsd-fr.org> # # $FreeBSD$ -# $MCom: ports/astro/glunarclock/Makefile,v 1.5 2007/05/19 21:35:54 marcus Exp $ +# $MCom: ports/astro/glunarclock/Makefile,v 1.8 2008/03/20 18:57:15 mezz Exp $ PORTNAME= glunarclock PORTVERSION= 0.32.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= GNOME applet that displays the current phase of the Moon -LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier -USE_GNOME= gnomehack gnomepanel gnomeprefix gnometarget intlhack +USE_GNOME= gail gnomehack gnomepanel gnomeprefix gnometarget intlhack USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/audio/Makefile b/audio/Makefile index 2f51f8cb4a3b..a8f43b9ce4bd 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -262,8 +262,10 @@ SUBDIR += gstreamer-plugins-shout2 SUBDIR += gstreamer-plugins-sidplay SUBDIR += gstreamer-plugins-sndfile + SUBDIR += gstreamer-plugins-soundtouch SUBDIR += gstreamer-plugins-spc SUBDIR += gstreamer-plugins-speex + SUBDIR += gstreamer-plugins-taglib SUBDIR += gstreamer-plugins-vorbis SUBDIR += gstreamer-plugins-wavpack SUBDIR += gtick diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile index 1d96d30c33aa..1073d141d006 100644 --- a/audio/gnome-audio/Makefile +++ b/audio/gnome-audio/Makefile @@ -3,15 +3,13 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/gnome-audio/Makefile,v 1.6 2007/06/29 22:55:02 mezz Exp $ +# $MCom: ports/audio/gnome-audio/Makefile,v 1.8 2008/03/21 12:32:12 ahze Exp $ # PORTNAME= gnome-audio -PORTVERSION= 2.0.0 -PORTREVISION= 3 +PORTVERSION= 2.22.0 CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-audio/2.0 +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Sound files for use with GNOME 2 @@ -20,7 +18,10 @@ USE_BZIP2= yes USE_XLIB= yes NO_BUILD= yes USE_GNOME= gnomehack gnomeprefix gnomehier -WRKSRC= ${WRKDIR}/${DISTNAME}/sounds MAKE_ENV= prefix=${PREFIX} +post-patch: + @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ + ${WRKSRC}/sounds/Makefile + .include <bsd.port.mk> diff --git a/audio/gnome-audio/distinfo b/audio/gnome-audio/distinfo index 13f93a33f0ac..4e1ba3f05d22 100644 --- a/audio/gnome-audio/distinfo +++ b/audio/gnome-audio/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-audio-2.0.0.tar.bz2) = cd14b84af59fb2ec673527d32f4e379f -SHA256 (gnome-audio-2.0.0.tar.bz2) = b1587b720056f44c2c472f1157fa73b10a7ffe0fd2f68cf105b39b93bcf280f8 -SIZE (gnome-audio-2.0.0.tar.bz2) = 1401319 +MD5 (gnome-audio-2.22.0.tar.bz2) = e80c94dc42e2ccb2e50e74a382eed666 +SHA256 (gnome-audio-2.22.0.tar.bz2) = f51ba55e66c1b17cf7b32e3b47433e2375b3ef51a8559a804800b4dc9369d993 +SIZE (gnome-audio-2.22.0.tar.bz2) = 1000959 diff --git a/audio/gnome-audio/files/patch-Makefile b/audio/gnome-audio/files/patch-Makefile deleted file mode 100644 index 962c506807b6..000000000000 --- a/audio/gnome-audio/files/patch-Makefile +++ /dev/null @@ -1,6 +0,0 @@ ---- Makefile.orig Thu Feb 15 14:40:33 2001 -+++ Makefile Mon Feb 26 19:24:22 2001 -@@ -1,3 +1 @@ --prefix=$(shell gnome-config --prefix) -- - LN_S=ln -sf diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index b1f9e4228684..83340de93218 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/gnome-media/Makefile,v 1.112 2007/09/19 12:22:57 ahze Exp $ +# $MCom: ports/audio/gnome-media/Makefile,v 1.114 2008/03/11 02:39:19 mezz Exp $ # PORTNAME= gnome-media -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.0 CATEGORIES= audio gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,6 +17,7 @@ COMMENT= Multimedia applications for the GNOME 2 desktop USE_BZIP2= yes USE_GETTEXT= yes +INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index 750f2904ad5e..6f477f10616b 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-media-2.20.1.tar.bz2) = 75036a6990725c4323812afd4cd734f5 -SHA256 (gnome2/gnome-media-2.20.1.tar.bz2) = 273b9eb4bc5a0cd7f1589f4eb242b995b05d64db20c05ec379d07af3b90d9c29 -SIZE (gnome2/gnome-media-2.20.1.tar.bz2) = 1927211 +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 diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index 9429ae72b7ae..1174977da17d 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -61,6 +61,19 @@ 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 @@ -87,6 +100,45 @@ 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 @@ -103,12 +155,18 @@ 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/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 share/gnome/help/gnome-sound-recorder/fr/gnome-sound-recorder.xml +share/gnome/help/gnome-sound-recorder/it/figures/grecord_window.png +share/gnome/help/gnome-sound-recorder/it/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/oc/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/oc/gnome-sound-recorder.xml +share/gnome/help/gnome-sound-recorder/ru/figures/grecord_window.png +share/gnome/help/gnome-sound-recorder/ru/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/sv/figures/grecord_window.png share/gnome/help/gnome-sound-recorder/sv/gnome-sound-recorder.xml share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png @@ -116,23 +174,35 @@ share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png 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/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 share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml +share/gnome/help/gnome-volume-control/it/figures/gnome-volume-control_window.png +share/gnome/help/gnome-volume-control/it/gnome-volume-control.xml share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml +share/gnome/help/gnome-volume-control/ru/figures/gnome-volume-control_window.png +share/gnome/help/gnome-volume-control/ru/gnome-volume-control.xml share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png share/gnome/help/gnome-volume-control/sv/gnome-volume-control.xml share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png 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/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 share/gnome/help/gstreamer-properties/fr/gstreamer-properties.xml +share/gnome/help/gstreamer-properties/it/figures/gstreamer_properties_window.png +share/gnome/help/gstreamer-properties/it/gstreamer-properties.xml share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml +share/gnome/help/gstreamer-properties/ru/figures/gstreamer_properties_window.png +share/gnome/help/gstreamer-properties/ru/gstreamer-properties.xml 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 @@ -145,8 +215,10 @@ share/icons/hicolor/48x48/apps/gstreamer-properties.png share/idl/GNOME_Media_CDDBSlave2.idl 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 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo share/locale/be/LC_MESSAGES/gnome-media-2.0.mo +share/locale/be@latin/LC_MESSAGES/gnome-media-2.0.mo share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo share/locale/bn_IN/LC_MESSAGES/gnome-media-2.0.mo @@ -219,6 +291,39 @@ 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-es.omf +share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf +share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf +share/omf/gnome-sound-recorder/gnome-sound-recorder-oc.omf +share/omf/gnome-sound-recorder/gnome-sound-recorder-ru.omf +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-es.omf +share/omf/gnome-volume-control/gnome-volume-control-fr.omf +share/omf/gnome-volume-control/gnome-volume-control-it.omf +share/omf/gnome-volume-control/gnome-volume-control-oc.omf +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-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 @@ -272,25 +377,41 @@ share/pixmaps/gnome-cd/track.png @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/gnome/help/gstreamer-properties/sv/figures @dirrm share/gnome/help/gstreamer-properties/sv +@dirrm share/gnome/help/gstreamer-properties/ru/figures +@dirrm share/gnome/help/gstreamer-properties/ru @dirrm share/gnome/help/gstreamer-properties/oc/figures @dirrm share/gnome/help/gstreamer-properties/oc +@dirrm share/gnome/help/gstreamer-properties/it/figures +@dirrm share/gnome/help/gstreamer-properties/it @dirrm share/gnome/help/gstreamer-properties/fr/figures @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/ca/figures +@dirrm share/gnome/help/gstreamer-properties/ca @dirrm share/gnome/help/gstreamer-properties/C/figures @dirrm share/gnome/help/gstreamer-properties/C @dirrm share/gnome/help/gstreamer-properties @dirrm share/gnome/help/gnome-volume-control/sv/figures @dirrm share/gnome/help/gnome-volume-control/sv +@dirrm share/gnome/help/gnome-volume-control/ru/figures +@dirrm share/gnome/help/gnome-volume-control/ru @dirrm share/gnome/help/gnome-volume-control/oc/figures @dirrm share/gnome/help/gnome-volume-control/oc +@dirrm share/gnome/help/gnome-volume-control/it/figures +@dirrm share/gnome/help/gnome-volume-control/it @dirrm share/gnome/help/gnome-volume-control/fr/figures @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/ca/figures +@dirrm share/gnome/help/gnome-volume-control/ca @dirrm share/gnome/help/gnome-volume-control/C/figures @dirrm share/gnome/help/gnome-volume-control/C @dirrm share/gnome/help/gnome-volume-control @@ -298,21 +419,35 @@ share/pixmaps/gnome-cd/track.png @dirrm share/gnome/help/gnome-sound-recorder/uk @dirrm share/gnome/help/gnome-sound-recorder/sv/figures @dirrm share/gnome/help/gnome-sound-recorder/sv +@dirrm share/gnome/help/gnome-sound-recorder/ru/figures +@dirrm share/gnome/help/gnome-sound-recorder/ru @dirrm share/gnome/help/gnome-sound-recorder/oc/figures @dirrm share/gnome/help/gnome-sound-recorder/oc +@dirrm share/gnome/help/gnome-sound-recorder/it/figures +@dirrm share/gnome/help/gnome-sound-recorder/it @dirrm share/gnome/help/gnome-sound-recorder/fr/figures @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/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 @@ -321,6 +456,7 @@ share/pixmaps/gnome-cd/track.png @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm include/gnome-media/profiles @dirrm include/gnome-media @dirrm include/cddb-slave2 @@ -344,4 +480,7 @@ share/pixmaps/gnome-cd/track.png @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/audio/gstreamer-plugins-a52dec/Makefile b/audio/gstreamer-plugins-a52dec/Makefile index 0c4922c415f8..1b68b3378e50 100644 --- a/audio/gstreamer-plugins-a52dec/Makefile +++ b/audio/gstreamer-plugins-a52dec/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-a52dec/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $ # PORTREVISION= 2 diff --git a/audio/gstreamer-plugins-cdaudio/Makefile b/audio/gstreamer-plugins-cdaudio/Makefile index fbdbf17ff196..15b8be9556db 100644 --- a/audio/gstreamer-plugins-cdaudio/Makefile +++ b/audio/gstreamer-plugins-cdaudio/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-cdaudio/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer frontend to libcdaudio diff --git a/audio/gstreamer-plugins-cdparanoia/Makefile b/audio/gstreamer-plugins-cdparanoia/Makefile index 6a9290a61c2f..2a495af2bbfa 100644 --- a/audio/gstreamer-plugins-cdparanoia/Makefile +++ b/audio/gstreamer-plugins-cdparanoia/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.6 2008/03/21 04:01:31 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= audio COMMENT= Gstreamer CDDA extraction (aka audio ripping) plugin diff --git a/audio/gstreamer-plugins-esound/Makefile b/audio/gstreamer-plugins-esound/Makefile index 88a8cfd50057..92bfd6639b64 100644 --- a/audio/gstreamer-plugins-esound/Makefile +++ b/audio/gstreamer-plugins-esound/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-esound/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $ # PORTREVISION= 2 diff --git a/audio/gstreamer-plugins-faac/Makefile b/audio/gstreamer-plugins-faac/Makefile index 8452fc3e556a..90eea962aa46 100644 --- a/audio/gstreamer-plugins-faac/Makefile +++ b/audio/gstreamer-plugins-faac/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-faac/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $ # PORTREVISION= 2 diff --git a/audio/gstreamer-plugins-faad/Makefile b/audio/gstreamer-plugins-faad/Makefile index 315bcfdc5579..67b243579d4b 100644 --- a/audio/gstreamer-plugins-faad/Makefile +++ b/audio/gstreamer-plugins-faad/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-faad/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $ # -PORTREVISION= 4 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin diff --git a/audio/gstreamer-plugins-flac/Makefile b/audio/gstreamer-plugins-flac/Makefile index d7dc6a1393e6..df14bc479bfa 100644 --- a/audio/gstreamer-plugins-flac/Makefile +++ b/audio/gstreamer-plugins-flac/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-flac/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $ # PORTREVISION= 2 diff --git a/audio/gstreamer-plugins-gsm/Makefile b/audio/gstreamer-plugins-gsm/Makefile index bb3d5de30b48..d03439942825 100644 --- a/audio/gstreamer-plugins-gsm/Makefile +++ b/audio/gstreamer-plugins-gsm/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-gsm/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $ # PORTREVISION= 2 diff --git a/audio/gstreamer-plugins-ivorbis/Makefile b/audio/gstreamer-plugins-ivorbis/Makefile index fe8c8aec4060..331436273481 100644 --- a/audio/gstreamer-plugins-ivorbis/Makefile +++ b/audio/gstreamer-plugins-ivorbis/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-ivorbis/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer integer only Ogg Vorbis decoder plugin diff --git a/audio/gstreamer-plugins-jack/Makefile b/audio/gstreamer-plugins-jack/Makefile index 21b4a4fb62ee..84f2b52bdc54 100644 --- a/audio/gstreamer-plugins-jack/Makefile +++ b/audio/gstreamer-plugins-jack/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-jack/Makefile,v 1.5 2008/03/19 14:05:29 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer low-latency audio server plugin diff --git a/audio/gstreamer-plugins-ladspa/Makefile b/audio/gstreamer-plugins-ladspa/Makefile index cd4350596635..374a3f2a5aa4 100644 --- a/audio/gstreamer-plugins-ladspa/Makefile +++ b/audio/gstreamer-plugins-ladspa/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-ladspa/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $ # PORTREVISION= 2 diff --git a/audio/gstreamer-plugins-lame/Makefile b/audio/gstreamer-plugins-lame/Makefile index 8b4d47c0c171..d07cea049ea0 100644 --- a/audio/gstreamer-plugins-lame/Makefile +++ b/audio/gstreamer-plugins-lame/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-lame/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $ # PORTREVISION= 2 diff --git a/audio/gstreamer-plugins-mad/Makefile b/audio/gstreamer-plugins-mad/Makefile index aa7e2848be00..3158e385c3d5 100644 --- a/audio/gstreamer-plugins-mad/Makefile +++ b/audio/gstreamer-plugins-mad/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-mad/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer mp3 decoder plugin diff --git a/audio/gstreamer-plugins-musepack/Makefile b/audio/gstreamer-plugins-musepack/Makefile index a004376de8e2..5692fefaa178 100644 --- a/audio/gstreamer-plugins-musepack/Makefile +++ b/audio/gstreamer-plugins-musepack/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-musepack/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $ # -PORTREVISION= 5 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer musepack mpc encoder/decoder plugin diff --git a/audio/gstreamer-plugins-musicbrainz/Makefile b/audio/gstreamer-plugins-musicbrainz/Makefile index 4fd0836b8f31..95830ec0d2e7 100644 --- a/audio/gstreamer-plugins-musicbrainz/Makefile +++ b/audio/gstreamer-plugins-musicbrainz/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-musicbrainz/Makefile,v 1.5 2008/03/19 14:05:30 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer CD index/audio metadata plugin diff --git a/audio/gstreamer-plugins-nas/Makefile b/audio/gstreamer-plugins-nas/Makefile index 997daaec8e58..3d2e1a9b14b0 100644 --- a/audio/gstreamer-plugins-nas/Makefile +++ b/audio/gstreamer-plugins-nas/Makefile @@ -3,10 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-nas/Makefile,v 1.5 2008/03/19 14:05:31 ahze Exp $ # CATEGORIES= audio -PORTREVISION= 0 +PORTREVISION= 2 COMMENT= GStreamer NAS (Network Audio System) plugin diff --git a/audio/gstreamer-plugins-ogg/Makefile b/audio/gstreamer-plugins-ogg/Makefile index f909cc02dbef..fb108afb3522 100644 --- a/audio/gstreamer-plugins-ogg/Makefile +++ b/audio/gstreamer-plugins-ogg/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-ogg/Makefile,v 1.6 2008/03/21 04:01:32 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= audio COMMENT= Gstreamer Ogg bitstream plugin diff --git a/audio/gstreamer-plugins-shout2/Makefile b/audio/gstreamer-plugins-shout2/Makefile index 92632368e973..765ba346c217 100644 --- a/audio/gstreamer-plugins-shout2/Makefile +++ b/audio/gstreamer-plugins-shout2/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-shout2/Makefile,v 1.3 2008/03/19 14:05:31 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer icecast plugin diff --git a/audio/gstreamer-plugins-sidplay/Makefile b/audio/gstreamer-plugins-sidplay/Makefile index ec34788bc80d..5a1a71d64a3f 100644 --- a/audio/gstreamer-plugins-sidplay/Makefile +++ b/audio/gstreamer-plugins-sidplay/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-sidplay/Makefile,v 1.5 2008/03/19 14:05:31 ahze Exp $ # PORTREVISION= 2 diff --git a/audio/gstreamer-plugins-soundtouch/Makefile b/audio/gstreamer-plugins-soundtouch/Makefile new file mode 100644 index 000000000000..15b42cf7bc61 --- /dev/null +++ b/audio/gstreamer-plugins-soundtouch/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: gstreamer-plugins-soundtouch +# Date created: 15 Feb 2008 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-soundtouch/Makefile,v 1.3 2008/03/19 14:05:32 ahze Exp $ +# + +CATEGORIES= audio +PORTREVISION= 2 + +COMMENT= GStreamer soundtouch plugin + +GST_PLUGIN= soundtouch + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/audio/gstreamer-plugins-spc/Makefile b/audio/gstreamer-plugins-spc/Makefile index 5c211d80c5bf..4ed6b3bc3f28 100644 --- a/audio/gstreamer-plugins-spc/Makefile +++ b/audio/gstreamer-plugins-spc/Makefile @@ -3,9 +3,9 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/audio/gstreamer-plugins-spc/Makefile,v 1.3 2008/03/19 14:05:32 ahze Exp $ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer OpenSPC frontend diff --git a/audio/gstreamer-plugins-speex/Makefile b/audio/gstreamer-plugins-speex/Makefile index d74c50f7c327..01cc84c35161 100644 --- a/audio/gstreamer-plugins-speex/Makefile +++ b/audio/gstreamer-plugins-speex/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-speex/Makefile,v 1.5 2008/03/19 14:05:32 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer speex voice plugin diff --git a/audio/gstreamer-plugins-taglib/Makefile b/audio/gstreamer-plugins-taglib/Makefile new file mode 100644 index 000000000000..a3efef652806 --- /dev/null +++ b/audio/gstreamer-plugins-taglib/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: gstreamer-plugins-taglib +# Date created: 14 Feb 2008 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-taglib/Makefile,v 1.3 2008/03/19 14:05:32 ahze Exp $ +# + +PORTREVISION= 2 +CATEGORIES= audio + +COMMENT= Gstreamer taglib plugin + +GST_PLUGIN= taglib + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/audio/gstreamer-plugins-vorbis/Makefile b/audio/gstreamer-plugins-vorbis/Makefile index ebbce71d62b9..95bace901cf4 100644 --- a/audio/gstreamer-plugins-vorbis/Makefile +++ b/audio/gstreamer-plugins-vorbis/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-vorbis/Makefile,v 1.6 2008/03/21 04:01:33 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= audio COMMENT= Gstreamer vorbis encoder/decoder plugin diff --git a/audio/gstreamer-plugins-wavpack/Makefile b/audio/gstreamer-plugins-wavpack/Makefile index 9d1d89403f5c..afd0c1fd7579 100644 --- a/audio/gstreamer-plugins-wavpack/Makefile +++ b/audio/gstreamer-plugins-wavpack/Makefile @@ -3,9 +3,10 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/audio/gstreamer-plugins-wavpack/Makefile,v 1.3 2008/03/19 14:05:33 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= audio GST_PLUGIN= wavpack diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile index 9e3a57b824d8..57b51bc75415 100644 --- a/audio/mpdscribble/Makefile +++ b/audio/mpdscribble/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.frob.nl/projects/scribble/ MAINTAINER= ports@FreeBSD.org COMMENT= Mpd last.fm client -LIB_DEPENDS= soup:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup:${PORTSDIR}/devel/libsoup22 GNU_CONFIGURE= yes diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index ecb9bce9b49b..2c9a9e288032 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/pulseaudio/Makefile,v 1.7 2007/09/10 05:10:38 mezz Exp $ +# $MCom: ports/audio/pulseaudio/Makefile,v 1.10 2008/03/20 16:07:21 mezz Exp $ # PORTNAME= pulseaudio PORTVERSION= 0.9.9 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ @@ -15,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Sound server for UNIX LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \ - oil-0.3.1:${PORTSDIR}/devel/liboil + oil-0.3.0:${PORTSDIR}/devel/liboil CONFLICTS= polypaudio-[1-9]* diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index 9ea5d41006b1..fa038463387a 100644 --- a/audio/rhythmbox-devel/Makefile +++ b/audio/rhythmbox-devel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.81 2007/07/30 19:41:19 mezz Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.88 2008/01/29 01:37:44 marcus Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.10.1 -PORTREVISION= 5 +PORTREVISION= 7 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 @@ -19,10 +19,10 @@ COMMENT= Audio player for GNOME LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ id3tag.0:${PORTSDIR}/audio/libid3tag \ - totem-plparser.7:${PORTSDIR}/multimedia/totem \ + totem-plparser.10:${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/libsoup \ + soup-2.2.8:${PORTSDIR}/devel/libsoup22 \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media USE_BZIP2= yes diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist index 8d19a9859d25..333cc64b0358 100644 --- a/audio/rhythmbox-devel/pkg-plist +++ b/audio/rhythmbox-devel/pkg-plist @@ -433,10 +433,10 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo %%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay @dirrm lib/rhythmbox/plugins @dirrm lib/rhythmbox +@dirrmtry share/applications @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/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/applications diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 9ea5d41006b1..fa038463387a 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.81 2007/07/30 19:41:19 mezz Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.88 2008/01/29 01:37:44 marcus Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.10.1 -PORTREVISION= 5 +PORTREVISION= 7 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 @@ -19,10 +19,10 @@ COMMENT= Audio player for GNOME LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ id3tag.0:${PORTSDIR}/audio/libid3tag \ - totem-plparser.7:${PORTSDIR}/multimedia/totem \ + totem-plparser.10:${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/libsoup \ + soup-2.2.8:${PORTSDIR}/devel/libsoup22 \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media USE_BZIP2= yes diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist index 8d19a9859d25..333cc64b0358 100644 --- a/audio/rhythmbox/pkg-plist +++ b/audio/rhythmbox/pkg-plist @@ -433,10 +433,10 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo %%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay @dirrm lib/rhythmbox/plugins @dirrm lib/rhythmbox +@dirrmtry share/applications @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/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/applications diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index 3b25d746a009..fc697d1e590b 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -3,14 +3,13 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/sound-juicer/Makefile,v 1.71 2007/10/15 00:27:00 marcus Exp $ +# $MCom: ports/audio/sound-juicer/Makefile,v 1.79 2008/03/10 20:39:31 mezz Exp $ # PORTNAME= sound-juicer -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.0 CATEGORIES= audio 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 @@ -42,4 +41,7 @@ post-patch: @${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)tests\(.*\)|\1\2|' \ ${WRKSRC}/Makefile.in +post-install: + @-update-desktop-database + .include <bsd.port.mk> diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo index cc9d09126b7b..cd51269a0247 100644 --- a/audio/sound-juicer/distinfo +++ b/audio/sound-juicer/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/sound-juicer-2.20.1.tar.bz2) = cea3c67215c99acf513ee7ea4b5eba7b -SHA256 (gnome2/sound-juicer-2.20.1.tar.bz2) = 6ac84544386ef7f690330d7f92f6c2f64da752c0f5cd60501a792b23f325a9ab -SIZE (gnome2/sound-juicer-2.20.1.tar.bz2) = 1412335 +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 diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist index 9b4c1e883cb3..d530d0daa54a 100644 --- a/audio/sound-juicer/pkg-plist +++ b/audio/sound-juicer/pkg-plist @@ -40,6 +40,21 @@ 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 @@ -53,8 +68,11 @@ share/gnome/help/sound-juicer/uk/sound-juicer.xml share/icons/hicolor/16x16/apps/sound-juicer.png share/icons/hicolor/22x22/apps/sound-juicer.png share/icons/hicolor/24x24/apps/sound-juicer.png +share/icons/hicolor/32x32/apps/sound-juicer.png +share/icons/hicolor/48x48/apps/sound-juicer.png share/icons/hicolor/scalable/apps/sound-juicer.svg share/locale/ar/LC_MESSAGES/sound-juicer.mo +share/locale/as/LC_MESSAGES/sound-juicer.mo share/locale/az/LC_MESSAGES/sound-juicer.mo share/locale/be/LC_MESSAGES/sound-juicer.mo share/locale/be@latin/LC_MESSAGES/sound-juicer.mo @@ -94,6 +112,7 @@ share/locale/lv/LC_MESSAGES/sound-juicer.mo share/locale/mk/LC_MESSAGES/sound-juicer.mo share/locale/ml/LC_MESSAGES/sound-juicer.mo share/locale/mn/LC_MESSAGES/sound-juicer.mo +share/locale/mr/LC_MESSAGES/sound-juicer.mo share/locale/ms/LC_MESSAGES/sound-juicer.mo share/locale/nb/LC_MESSAGES/sound-juicer.mo share/locale/ne/LC_MESSAGES/sound-juicer.mo @@ -116,6 +135,7 @@ share/locale/sr/LC_MESSAGES/sound-juicer.mo share/locale/sr@Latn/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 share/locale/th/LC_MESSAGES/sound-juicer.mo share/locale/tr/LC_MESSAGES/sound-juicer.mo share/locale/ug/LC_MESSAGES/sound-juicer.mo @@ -133,10 +153,11 @@ share/omf/sound-juicer/sound-juicer-es.omf share/omf/sound-juicer/sound-juicer-fr.omf share/omf/sound-juicer/sound-juicer-nl.omf share/omf/sound-juicer/sound-juicer-oc.omf +share/omf/sound-juicer/sound-juicer-pl.omf +share/omf/sound-juicer/sound-juicer-pt_BR.omf +share/omf/sound-juicer/sound-juicer-ru.omf share/omf/sound-juicer/sound-juicer-sv.omf share/omf/sound-juicer/sound-juicer-uk.omf -%%DATADIR%%/sj-play.png -%%DATADIR%%/sj-record.png %%DATADIR%%/sound-juicer.glade @dirrm %%DATADIR%% @dirrm share/omf/sound-juicer @@ -144,6 +165,12 @@ share/omf/sound-juicer/sound-juicer-uk.omf @dirrm share/gnome/help/sound-juicer/uk @dirrm share/gnome/help/sound-juicer/sv/figures @dirrm share/gnome/help/sound-juicer/sv +@dirrm share/gnome/help/sound-juicer/ru/figures +@dirrm share/gnome/help/sound-juicer/ru +@dirrm share/gnome/help/sound-juicer/pt_BR/figures +@dirrm share/gnome/help/sound-juicer/pt_BR +@dirrm share/gnome/help/sound-juicer/pl/figures +@dirrm share/gnome/help/sound-juicer/pl @dirrm share/gnome/help/sound-juicer/oc/figures @dirrm share/gnome/help/sound-juicer/oc @dirrm share/gnome/help/sound-juicer/nl/figures @@ -161,24 +188,32 @@ share/omf/sound-juicer/sound-juicer-uk.omf @dirrm share/gnome/help/sound-juicer/C/figures @dirrm share/gnome/help/sound-juicer/C @dirrm share/gnome/help/sound-juicer +@dirrmtry share/applications +@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/xh/LC_MESSAGES @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/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/ku/LC_MESSAGES @dirrmtry share/locale/ku @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/locale/be@latin/LC_MESSAGES -@dirrmtry share/locale/be@latin @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/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 4ab1fb9b2fec..ac7b667f7fdd 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,21 +3,19 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.3 2007/11/30 20:10:35 marcus Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.142 2008/03/10 20:33:29 mezz Exp $ # PORTNAME= evolution-data-server -PORTVERSION= 1.12.3 -PORTREVISION= 1 +PORTVERSION= 2.22.0 CATEGORIES= databases 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 COMMENT= The data backends for the Evolution integrated mail/PIM suite -LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup \ +LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ nss3.1:${PORTSDIR}/security/nss \ tasn1.3:${PORTSDIR}/security/libtasn1 @@ -39,7 +37,7 @@ 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="1.12" EVO_VERSION="1.2" +PLIST_SUB= VERSION="2.22" EVO_VERSION="1.2" OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index b4c898664ff0..c31a13b36470 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-data-server-1.12.3.tar.bz2) = 9a04e379c34ad538764866dfd4eb2931 -SHA256 (gnome2/evolution-data-server-1.12.3.tar.bz2) = e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5 -SIZE (gnome2/evolution-data-server-1.12.3.tar.bz2) = 7447166 +MD5 (gnome2/evolution-data-server-2.22.0.tar.bz2) = 0f29044dc21a4bfb915cafafde8f4d6b +SHA256 (gnome2/evolution-data-server-2.22.0.tar.bz2) = ff1b3540234296e1ffe52ddde48b67d93a261ee06f2eef865a47c4fbcfdc8724 +SIZE (gnome2/evolution-data-server-2.22.0.tar.bz2) = 7575575 diff --git a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c deleted file mode 100644 index b39a8fe3cc88..000000000000 --- a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c +++ /dev/null @@ -1,53 +0,0 @@ ---- libedataserver/e-msgport.c.orig Sat Dec 10 07:31:28 2005 -+++ libedataserver/e-msgport.c Mon Dec 19 02:19:10 2005 -@@ -1069,9 +1069,18 @@ thread_dispatch(void *din) - void e_thread_put(EThread *e, EMsg *msg) - { - pthread_t id; -+ pthread_attr_t attr; - EMsg *dmsg = NULL; - - pthread_mutex_lock(&e->mutex); -+ pthread_attr_init(&attr); -+ /* Give us a 1 MB thread stacksize on 32-bit architectures, and -+ * a 2 MB thread stacksize on 64-bit architectures. */ -+ if (sizeof (void *) == 8) { -+ pthread_attr_setstacksize(&attr, 0x200000); -+ } else { -+ pthread_attr_setstacksize(&attr, 0x100000); -+ } - - /* the caller forgot to tell us what to do, well, we can't do anything can we */ - if (e->received == NULL) { -@@ -1110,13 +1119,14 @@ void e_thread_put(EThread *e, EMsg *msg) - e_msgport_put(e->server_port, msg); - if (e->waiting == 0 - && g_list_length(e->id_list) < e->queue_limit -- && pthread_create(&id, NULL, thread_dispatch, e) == 0) { -+ && pthread_create(&id, &attr, thread_dispatch, e) == 0) { - struct _thread_info *info = g_malloc0(sizeof(*info)); - t(printf("created NEW thread %" G_GUINT64_FORMAT "\n", e_util_pthread_id(id))); - info->id = id; - info->busy = TRUE; - e->id_list = g_list_append(e->id_list, info); - } -+ pthread_attr_destroy(&attr); - pthread_mutex_unlock(&e->mutex); - return; - } -@@ -1125,13 +1135,14 @@ void e_thread_put(EThread *e, EMsg *msg) - if (!e->have_thread) { - int err; - -- if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) { -+ if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) { - g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err)); - } else { - e->have_thread = TRUE; - } - } - -+ pthread_attr_destroy(&attr); - pthread_mutex_unlock(&e->mutex); - - if (dmsg) { diff --git a/databases/evolution-data-server/files/patch-Makefile.in b/databases/evolution-data-server/files/patch-Makefile.in deleted file mode 100644 index ec1efa7ac942..000000000000 --- a/databases/evolution-data-server/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2008-01-14 19:13:06.000000000 -0500 -+++ Makefile.in 2008-01-14 19:13:15.000000000 -0500 -@@ -353,7 +353,7 @@ AUTOMAKE_OPTIONS = 1.6 - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc - @WITH_LIBDB_FALSE@LIBDB = libdb - @ENABLE_CALENDAR_TRUE@CALENDAR_DIR = calendar --SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po -+SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src art po - DIST_SUBDIRS = win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po - changelogs = \ - ChangeLog 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 index 51f468867330..b7266a514fb5 100644 --- 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 @@ -1,6 +1,6 @@ ---- addressbook/backends/ldap/e-book-backend-ldap.c.orig Fri Sep 9 16:06:37 2005 -+++ addressbook/backends/ldap/e-book-backend-ldap.c Fri Sep 9 16:08:21 2005 -@@ -301,8 +301,8 @@ struct prop_info { +--- 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"), @@ -8,6 +8,6 @@ - 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), + 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-calendar_libical_src_libical_icaltz-util.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c index c183e3b79a94..766abb5425d9 100644 --- a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c +++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c @@ -1,5 +1,5 @@ ---- calendar/libical/src/libical/icaltz-util.c.orig 2007-11-25 21:29:25.000000000 -0500 -+++ calendar/libical/src/libical/icaltz-util.c 2008-01-07 20:24:12.000000000 -0500 +--- calendar/libical/src/libical/icaltz-util.c.orig 2007-08-24 02:48:28.000000000 -0400 ++++ calendar/libical/src/libical/icaltz-util.c 2007-08-27 16:23:59.000000000 -0400 @@ -23,6 +23,15 @@ #include <string.h> #if defined(sun) && defined(__SVR4) @@ -16,27 +16,3 @@ #else #include <byteswap.h> #include <endian.h> -@@ -328,7 +337,10 @@ icaltzutil_fetch_timezone (const char *l - icalprop = icalproperty_new_tzname (types [zidx].zname); - icalcomponent_add_property (std_comp, icalprop); - -- trans = transitions [stdidx] + types [zidx].gmtoff; -+ if (num_trans) -+ trans = transitions [stdidx] + types [zidx].gmtoff; -+ else -+ trans = types [zidx].gmtoff; - icaltime = icaltime_from_timet (trans, 0); - dtstart = icaltime; - dtstart.year = 1970; -@@ -369,7 +381,10 @@ icaltzutil_fetch_timezone (const char *l - icalprop = icalproperty_new_tzname (types [zidx].zname); - icalcomponent_add_property (dst_comp, icalprop); - -- trans = transitions [dstidx] + types [zidx].gmtoff; -+ if (num_trans) -+ trans = transitions [dstidx] + types [zidx].gmtoff; -+ else -+ trans = types [zidx].gmtoff; - icaltime = icaltime_from_timet (trans, 0); - dtstart = icaltime; - dtstart.year = 1970; 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 new file mode 100644 index 000000000000..f5b6fa2735d8 --- /dev/null +++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in @@ -0,0 +1,22 @@ +--- 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 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + HAVE_JW = @HAVE_JW@ +-HTML_DIR = $(datadir)/gtk-doc/html ++HTML_DIR = $(prefix)/share/doc + ICONV_CFLAGS = @ICONV_CFLAGS@ + ICONV_LIBS = @ICONV_LIBS@ + IDL_INCLUDES = @IDL_INCLUDES@ +@@ -690,8 +690,8 @@ + 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 && \ ++# gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + uninstall-local: diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index ace913945cd2..44c825ef86e1 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -148,6 +148,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%%/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 @@ -156,6 +160,8 @@ include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-proxy.h 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%%/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 @@ -224,6 +230,7 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-utils.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 +include/evolution-data-server-%%VERSION%%/libedataserverui/e-cell-renderer-color.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h @@ -232,6 +239,7 @@ include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-list. include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-combo-box.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h @@ -338,6 +346,9 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.so lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.a lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.la lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.so +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.a +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.la +lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgoogle.so lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.a lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.la lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so @@ -350,11 +361,11 @@ 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.10 +lib/libcamel-%%EVO_VERSION%%.so.11 lib/libcamel-provider-%%EVO_VERSION%%.a lib/libcamel-provider-%%EVO_VERSION%%.la lib/libcamel-provider-%%EVO_VERSION%%.so -lib/libcamel-provider-%%EVO_VERSION%%.so.10 +lib/libcamel-provider-%%EVO_VERSION%%.so.11 lib/libebook-%%EVO_VERSION%%.a lib/libebook-%%EVO_VERSION%%.la lib/libebook-%%EVO_VERSION%%.so @@ -387,6 +398,14 @@ lib/libexchange-storage-%%EVO_VERSION%%.a lib/libexchange-storage-%%EVO_VERSION%%.la lib/libexchange-storage-%%EVO_VERSION%%.so lib/libexchange-storage-%%EVO_VERSION%%.so.3 +lib/libgdata-%%EVO_VERSION%%.a +lib/libgdata-%%EVO_VERSION%%.la +lib/libgdata-%%EVO_VERSION%%.so +lib/libgdata-%%EVO_VERSION%%.so.1 +lib/libgdata-google-%%EVO_VERSION%%.a +lib/libgdata-google-%%EVO_VERSION%%.la +lib/libgdata-google-%%EVO_VERSION%%.so +lib/libgdata-google-%%EVO_VERSION%%.so.1 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server libdata/pkgconfig/camel-%%EVO_VERSION%%.pc libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc @@ -399,9 +418,245 @@ libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc libdata/pkgconfig/libegroupwise-%%EVO_VERSION%%.pc libdata/pkgconfig/libexchange-storage-%%EVO_VERSION%%.pc +libdata/pkgconfig/libgdata-%%EVO_VERSION%%.pc +libdata/pkgconfig/libgdata-google-%%EVO_VERSION%%.pc libexec/camel-index-control-%%EVO_VERSION%% libexec/camel-lock-helper-%%EVO_VERSION%% libexec/evolution-data-server-%%VERSION%% +share/doc/camel/Addresses.html +share/doc/camel/ClassTree.html +share/doc/camel/Crypto.html +share/doc/camel/Filters.html +share/doc/camel/Folders.html +share/doc/camel/Fundamentals.html +share/doc/camel/MIME.html +share/doc/camel/Services.html +share/doc/camel/Streams.html +share/doc/camel/camel-CamelAddress.html +share/doc/camel/camel-CamelCipherContext.html +share/doc/camel/camel-CamelDataWrapper.html +share/doc/camel/camel-CamelFolder.html +share/doc/camel/camel-CamelFolderSummary.html +share/doc/camel/camel-CamelGpgContext.html +share/doc/camel/camel-CamelInternetAddress.html +share/doc/camel/camel-CamelMedium.html +share/doc/camel/camel-CamelMimeFilter.html +share/doc/camel/camel-CamelMimeFilterBasic.html +share/doc/camel/camel-CamelMimeFilterBestenc.html +share/doc/camel/camel-CamelMimeFilterCRLF.html +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-CamelMimeFilterHTML.html +share/doc/camel/camel-CamelMimeFilterIndex.html +share/doc/camel/camel-CamelMimeFilterPgp.html +share/doc/camel/camel-CamelMimeFilterSave.html +share/doc/camel/camel-CamelMimeFilterToHTML.html +share/doc/camel/camel-CamelMimeFilterWindows.html +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-CamelMultipart.html +share/doc/camel/camel-CamelMultipartEncrypted.html +share/doc/camel/camel-CamelMultipartSigned.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-CamelSasl.html +share/doc/camel/camel-CamelSaslAnonymous.html +share/doc/camel/camel-CamelSaslCramMd5.html +share/doc/camel/camel-CamelSaslDigestMd5.html +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-CamelSaslPlain.html +share/doc/camel/camel-CamelSeekableStream.html +share/doc/camel/camel-CamelSeekableSubstream.html +share/doc/camel/camel-CamelService.html +share/doc/camel/camel-CamelSession.html +share/doc/camel/camel-CamelStore.html +share/doc/camel/camel-CamelStoreSummary.html +share/doc/camel/camel-CamelStream.html +share/doc/camel/camel-CamelStreamBuffer.html +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-CamelStreamVFS.html +share/doc/camel/camel-CamelTcpStream.html +share/doc/camel/camel-CamelTcpStreamRaw.html +share/doc/camel/camel-CamelTcpStreamSSL.html +share/doc/camel/camel-CamelTransport.html +share/doc/camel/camel-CamelVTrashFolder.html +share/doc/camel/camel-CamelVeeFolder.html +share/doc/camel/camel-camel-exception.html +share/doc/camel/camel-camel-operation.html +share/doc/camel/camel-camel-provider.html +share/doc/camel/camel-camel-url.html +share/doc/camel/camel.devhelp +share/doc/camel/camel.devhelp2 +share/doc/camel/classes.html +share/doc/camel/home.png +share/doc/camel/index.html +share/doc/camel/index.sgml +share/doc/camel/ix01.html +share/doc/camel/left.png +share/doc/camel/right.png +share/doc/camel/style.css +share/doc/camel/up.png +share/doc/libebook/EBook.html +share/doc/libebook/EBookListener.html +share/doc/libebook/EBookView.html +share/doc/libebook/EBookViewListener.html +share/doc/libebook/EContact.html +share/doc/libebook/EDestination.html +share/doc/libebook/EVCard.html +share/doc/libebook/ch01.html +share/doc/libebook/home.png +share/doc/libebook/index.html +share/doc/libebook/index.sgml +share/doc/libebook/ix01.html +share/doc/libebook/left.png +share/doc/libebook/libebook-EAddressWestern.html +share/doc/libebook/libebook-ENameWestern.html +share/doc/libebook/libebook-e-book-query.html +share/doc/libebook/libebook-e-book-types.html +share/doc/libebook/libebook.devhelp +share/doc/libebook/libebook.devhelp2 +share/doc/libebook/right.png +share/doc/libebook/style.css +share/doc/libebook/up.png +share/doc/libecal/ECal.html +share/doc/libecal/ECalComponent.html +share/doc/libecal/ECalListener.html +share/doc/libecal/ECalView.html +share/doc/libecal/ECalViewListener.html +share/doc/libecal/ch01.html +share/doc/libecal/home.png +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-recur.html +share/doc/libecal/libecal-e-cal-time-util.html +share/doc/libecal/libecal-e-cal-types.html +share/doc/libecal/libecal-e-cal-util.html +share/doc/libecal/libecal.devhelp +share/doc/libecal/libecal.devhelp2 +share/doc/libecal/right.png +share/doc/libecal/style.css +share/doc/libecal/up.png +share/doc/libedata-book/EBookBackend.html +share/doc/libedata-book/EBookBackendCache.html +share/doc/libedata-book/EBookBackendFactory.html +share/doc/libedata-book/EBookBackendSExp.html +share/doc/libedata-book/EBookBackendSummary.html +share/doc/libedata-book/EBookBackendSync.html +share/doc/libedata-book/EDataBook.html +share/doc/libedata-book/EDataBookView.html +share/doc/libedata-book/ch01.html +share/doc/libedata-book/home.png +share/doc/libedata-book/index.html +share/doc/libedata-book/index.sgml +share/doc/libedata-book/ix01.html +share/doc/libedata-book/left.png +share/doc/libedata-book/libedata-book-EDataBookFactory.html +share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html +share/doc/libedata-book/libedata-book-ximian-vcard.html +share/doc/libedata-book/libedata-book.devhelp +share/doc/libedata-book/libedata-book.devhelp2 +share/doc/libedata-book/right.png +share/doc/libedata-book/style.css +share/doc/libedata-book/up.png +share/doc/libedata-cal/ECalBackend.html +share/doc/libedata-cal/ECalBackendCache.html +share/doc/libedata-cal/ECalBackendFactory.html +share/doc/libedata-cal/ECalBackendSExp.html +share/doc/libedata-cal/ECalBackendSync.html +share/doc/libedata-cal/EDataCal.html +share/doc/libedata-cal/EDataCalFactory.html +share/doc/libedata-cal/EDataCalView.html +share/doc/libedata-cal/ch01.html +share/doc/libedata-cal/home.png +share/doc/libedata-cal/index.html +share/doc/libedata-cal/index.sgml +share/doc/libedata-cal/ix01.html +share/doc/libedata-cal/left.png +share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html +share/doc/libedata-cal/libedata-cal.devhelp +share/doc/libedata-cal/libedata-cal.devhelp2 +share/doc/libedata-cal/right.png +share/doc/libedata-cal/style.css +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 +share/doc/libedataserver/ESource.html +share/doc/libedataserver/ESourceGroup.html +share/doc/libedataserver/ESourceList.html +share/doc/libedataserver/ch01.html +share/doc/libedataserver/home.png +share/doc/libedataserver/index.html +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-ESExp.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 +share/doc/libedataserver/libedataserver-e-time-utils.html +share/doc/libedataserver/libedataserver-e-trie.html +share/doc/libedataserver/libedataserver-e-uid.html +share/doc/libedataserver/libedataserver-e-url.html +share/doc/libedataserver/libedataserver-e-util.html +share/doc/libedataserver/libedataserver-e-xml-hash-utils.html +share/doc/libedataserver/libedataserver-md5-utils.html +share/doc/libedataserver/libedataserver.devhelp +share/doc/libedataserver/libedataserver.devhelp2 +share/doc/libedataserver/right.png +share/doc/libedataserver/style.css +share/doc/libedataserver/up.png +share/doc/libedataserverui/ECategoriesDialog.html +share/doc/libedataserverui/EContactStore.html +share/doc/libedataserverui/EDestinationStore.html +share/doc/libedataserverui/ENameSelector.html +share/doc/libedataserverui/ENameSelectorDialog.html +share/doc/libedataserverui/ENameSelectorEntry.html +share/doc/libedataserverui/ENameSelectorList.html +share/doc/libedataserverui/ENameSelectorModel.html +share/doc/libedataserverui/ESourceComboBox.html +share/doc/libedataserverui/ESourceOptionMenu.html +share/doc/libedataserverui/ESourceSelector.html +share/doc/libedataserverui/ESourceSelectorDialog.html +share/doc/libedataserverui/ETreeModelGenerator.html +share/doc/libedataserverui/ch01.html +share/doc/libedataserverui/home.png +share/doc/libedataserverui/index.html +share/doc/libedataserverui/index.sgml +share/doc/libedataserverui/ix01.html +share/doc/libedataserverui/left.png +share/doc/libedataserverui/libedataserverui-ECellRendererColor.html +share/doc/libedataserverui/libedataserverui-e-book-auth-util.html +share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html +share/doc/libedataserverui/libedataserverui-e-passwords.html +share/doc/libedataserverui/libedataserverui.devhelp +share/doc/libedataserverui/libedataserverui.devhelp2 +share/doc/libedataserverui/right.png +share/doc/libedataserverui/style.css +share/doc/libedataserverui/up.png share/evolution-data-server-%%VERSION%%/evolutionperson.schema share/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade share/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade @@ -446,6 +701,7 @@ share/locale/is/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/it/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo 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/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo @@ -468,6 +724,7 @@ share/locale/pt_BR/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ro/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/ru/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo share/locale/rw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo +share/locale/si/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo 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 @@ -508,6 +765,13 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrm share/evolution-data-server-%%VERSION%%/weather @dirrm share/evolution-data-server-%%VERSION%%/glade @dirrm share/evolution-data-server-%%VERSION%% +@dirrm share/doc/libedataserverui +@dirrm share/doc/libedataserver +@dirrm share/doc/libedata-cal +@dirrm share/doc/libedata-book +@dirrm share/doc/libecal +@dirrm share/doc/libebook +@dirrm share/doc/camel @dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions @dirrm lib/evolution-data-server-%%EVO_VERSION%%/camel-providers @dirrm lib/evolution-data-server-%%EVO_VERSION%% @@ -519,6 +783,9 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png @dirrm include/evolution-data-server-%%VERSION%%/libecal @dirrm include/evolution-data-server-%%VERSION%%/libebook @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 @dirrm include/evolution-data-server-%%VERSION%%/exchange @dirrm include/evolution-data-server-%%VERSION%%/camel @dirrm include/evolution-data-server-%%VERSION%% @@ -528,6 +795,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/si/LC_MESSAGES +@dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES diff --git a/deskutils/buoh/Makefile b/deskutils/buoh/Makefile index cbdc01458ed4..0bd11f5135ed 100644 --- a/deskutils/buoh/Makefile +++ b/deskutils/buoh/Makefile @@ -3,19 +3,19 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/deskutils/buoh/Makefile,v 1.1 2006/10/23 21:43:08 mezz Exp $ +# $MCom: ports/deskutils/buoh/Makefile,v 1.5 2008/03/22 00:42:46 mezz Exp $ # PORTNAME= buoh PORTVERSION= 0.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils www gnome MASTER_SITES= http://buoh.steve-o.org/downloads/ MAINTAINER= mezz@FreeBSD.org COMMENT= A reader for online strips comics -LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup22 USE_BZIP2= yes USE_GMAKE= yes diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile index f9ea6ac0f726..d8a588588572 100644 --- a/deskutils/conduit/Makefile +++ b/deskutils/conduit/Makefile @@ -3,37 +3,61 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/conduit/Makefile,v 1.3 2006/10/11 20:26:26 ahze Exp $ +# $MCom: ports/deskutils/conduit/Makefile,v 1.7 2008/03/18 14:53:42 ahze Exp $ PORTNAME= conduit -PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTVERSION= 0.3.9 CATEGORIES= deskutils -MASTER_SITES= http://files.conduit-project.org/releases/ +MASTER_SITES= GNOME -MAINTAINER= ahze@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org COMMENT= Synchronization application for GNOME +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \ + ${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree \ + ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \ + xmlproc_parse:${PORTSDIR}/textproc/py-xml \ + ${PYTHON_SITELIBDIR}/vobject/__init__.py:${PORTSDIR}/deskutils/py-vobject \ + ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus +LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \ ${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree \ ${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \ - xmlproc_parse:${PORTSDIR}/textproc/py-xml + xmlproc_parse:${PORTSDIR}/textproc/py-xml \ + ${PYTHON_SITELIBDIR}/vobject/__init__.py:${PORTSDIR}/deskutils/py-vobject \ + firefox:${PORTSDIR}/www/firefox \ + ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus -NO_WRKSUBDIR= yes USE_PYTHON= 2.4+ -MAKE_ENV= DESTDIR="" -USE_GNOME= pygnome2 -DESKTOP_ENTRIES= "Conduit" "${COMMENT}" "conduit-icon.png" \ - "${PORTNAME}" "GNOME;Application;Office;" true +USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_GETTEXT= yes +INSTALLS_OMF= yes +INSTALLS_ICONS= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +USE_GNOME= pygnome2 gnomeprefix +OPTIONS= NAUTILUS "Enable Nautilus Plugin" On \ + EOG "Enable Eye-Of-Gnome Plugin" On .include <bsd.port.pre.mk> -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|; \ - s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}|' \ - ${WRKSRC}/Makefile +.if defined(WITH_NAUTILUS) +USE_GNOME+= nautilus2 +CONFIGURE_ARGS+= --enable-nautilus-extension +.endif -pre-install: - ${MKDIR} ${PREFIX}/share/applications +.if defined(WITH_EOG) +BUILD_DEPENDS+= eog:${PORTSDIR}/graphics/eog +RUN_DEPENDS+= eog:${PORTSDIR}/graphics/eog +CONFIGURE_ARGS+= --enable-eog-plugin +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/data/Makefile.in + @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \ + -e 's|/usr/bin/python|${LOCALBASE}/bin/python|' \ + -e 's|/usr/lib/firefox*|${LOCALBASE}/lib/firefox|' .include <bsd.port.post.mk> diff --git a/deskutils/conduit/distinfo b/deskutils/conduit/distinfo index f0440d95048e..f0b202122914 100644 --- a/deskutils/conduit/distinfo +++ b/deskutils/conduit/distinfo @@ -1,3 +1,3 @@ -MD5 (conduit-0.2.0.tar.gz) = 4f27b6ae1c416da186e58cf27175f598 -SHA256 (conduit-0.2.0.tar.gz) = 01b74297d701858fd800161facea5682f6e03b7bc7320140c8e236c98a8587ce -SIZE (conduit-0.2.0.tar.gz) = 211110 +MD5 (conduit-0.3.9.tar.gz) = b04cd4b39ad0a689bff020ba23dd69b7 +SHA256 (conduit-0.3.9.tar.gz) = 04e6b207a73c140b09a96a32e81d470a46b414cc9f6022a2d4a4c0f8c59fb104 +SIZE (conduit-0.3.9.tar.gz) = 893253 diff --git a/deskutils/conduit/files/patch-Makefile b/deskutils/conduit/files/patch-Makefile deleted file mode 100644 index d042246883a7..000000000000 --- a/deskutils/conduit/files/patch-Makefile +++ /dev/null @@ -1,52 +0,0 @@ ---- Makefile.orig Wed Sep 20 05:08:31 2006 -+++ Makefile Tue Oct 10 21:01:22 2006 -@@ -2,13 +2,13 @@ - VERSION=`cat conduit/__init__.py | grep 'APPVERSION=\"' | sed -e 's/APPVERSION=//' -e 's/\"//g'` - - #Install prefix, can be overridden by setting DESTDIR --PREFIX=/usr -+PREFIX=%%PREFIX%% - CWD=`pwd` - - #Python version for installation into python dir - PYTHON_VERSION=2.4 - #PYTHON_VERSION=`python -V 2>&1 | sed -e "s/Python //" | cut --bytes=1-3` --PYTHON_PATH=$(DESTDIR)$(PREFIX)/lib/python$(PYTHON_VERSION)/site-packages -+PYTHON_PATH=%%PYTHON_SITELIBDIR%% - - #Source Files - SRC=conduit/*.py conduit/dataproviders/*.py conduit/datatypes/*.py -@@ -40,8 +40,8 @@ - mkdir -p $(DESTDIR)$(PREFIX)/share/conduit/dataproviders - mkdir -p $(PYTHON_PATH)/conduit - mkdir -p $(PYTHON_PATH)/conduit/datatypes -- mkdir -p ~/.conduit -- mkdir -p ~/.conduit/modules -+ mkdir -p .conduit -+ mkdir -p .conduit/modules - @for i in `ls contrib`; do \ - ( mkdir -p $(DESTDIR)$(PREFIX)/share/conduit/contrib/$$i ) \ - done -@@ -52,14 +52,14 @@ - install -m 644 conduit/data/conduit-icon.png $(DESTDIR)$(PREFIX)/share/pixmaps - install -m 644 conduit/data/conduit.glade $(DESTDIR)$(PREFIX)/share/conduit/data - install -m 644 conduit/dataproviders/*.py $(DESTDIR)$(PREFIX)/share/conduit/dataproviders -- install -m 644 conduit.desktop $(DESTDIR)$(PREFIX)/share/applications/ -+# install -m 644 conduit.desktop $(DESTDIR)$(PREFIX)/share/applications/ - install -m 644 conduit/*.py $(PYTHON_PATH)/conduit - install -m 644 conduit/datatypes/*.py $(PYTHON_PATH)/conduit/datatypes - install -m 755 conduit/start_conduit.py $(DESTDIR)$(PREFIX)/bin/conduit - @for i in `ls contrib`; do \ - ( install -m 644 contrib/$$i/*.py $(DESTDIR)$(PREFIX)/share/conduit/contrib/$$i ) \ - done -- ln -sf $(CWD)/doc/ExampleModule.py ~/.conduit/modules/MoinModule.py -+ ln -sf $(CWD)/doc/ExampleModule.py .conduit/modules/MoinModule.py - - clean: clean-bin - -rm dist-stamp -@@ -101,4 +101,4 @@ - rm -r $(DESTDIR)$(PREFIX)/share/applications/conduit.desktop - rm -r $(PYTHON_PATH)/conduit - rm -r $(DESTDIR)$(PREFIX)/bin/conduit -- rm ~/.conduit/modules/MoinModule.py -+ rm .conduit/modules/MoinModule.py diff --git a/deskutils/conduit/files/patch-configure b/deskutils/conduit/files/patch-configure new file mode 100644 index 000000000000..c7c260c8802f --- /dev/null +++ b/deskutils/conduit/files/patch-configure @@ -0,0 +1,38 @@ +--- configure.orig 2008-03-18 09:06:41.000000000 -0400 ++++ configure 2008-03-18 10:48:08.000000000 -0400 +@@ -6447,24 +6447,8 @@ + v=`echo 0.9.0 | sed -e "s/\./,/g"` + { echo "$as_me:$LINENO: checking for 0.9.0 of goocanvas" >&5 + echo $ECHO_N "checking for 0.9.0 of goocanvas... $ECHO_C" >&6; } +-prog=" +-import goocanvas +-ver = goocanvas.pygoocanvas_version +- +-if type(ver) == str: +- ver = ver.split('.') +- ver = map(int,ver) +- ver = tuple(ver) +-elif type(ver) == tuple: +- pass +-else: +- raise Exception +- +-if ver >= ($v): +- print 'yes' +-" +-out=`$PYTHON -c "$prog"` +-if test "x$out" == xyes; then ++out=yes ++if test "x$out" = xyes; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + else +@@ -6496,7 +6480,7 @@ + print 'yes' + " + out=`$PYTHON -c "$prog"` +-if test "x$out" == xyes; then ++if test "x$out" = xyes; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + else diff --git a/deskutils/conduit/pkg-plist b/deskutils/conduit/pkg-plist index bf5c39d8f88b..810dce4ae2c4 100644 --- a/deskutils/conduit/pkg-plist +++ b/deskutils/conduit/pkg-plist @@ -1,64 +1,443 @@ bin/conduit -%%PYTHON_SITELIBDIR%%/conduit/Canvas.py +bin/conduit-client +bin/conduit.real +lib/conduit/modules/AudioVideoConverterModule.py +lib/conduit/modules/AudioVideoConverterModule.pyc +lib/conduit/modules/AudioVideoConverterModule.pyo +lib/conduit/modules/BackpackModule/BackpackModule.py +lib/conduit/modules/BackpackModule/BackpackModule.pyc +lib/conduit/modules/BackpackModule/BackpackModule.pyo +lib/conduit/modules/BackpackModule/backpack/backpack.py +lib/conduit/modules/BackpackModule/backpack/backpack.pyc +lib/conduit/modules/BackpackModule/backpack/backpack.pyo +lib/conduit/modules/BackpackModule/config.glade +lib/conduit/modules/BansheeModule/BansheeModule.py +lib/conduit/modules/BansheeModule/BansheeModule.pyc +lib/conduit/modules/BansheeModule/BansheeModule.pyo +lib/conduit/modules/BansheeModule/config.glade +lib/conduit/modules/BoxDotNetModule/BoxDotNetAPI/boxdotnet.py +lib/conduit/modules/BoxDotNetModule/BoxDotNetAPI/boxdotnet.pyc +lib/conduit/modules/BoxDotNetModule/BoxDotNetAPI/boxdotnet.pyo +lib/conduit/modules/BoxDotNetModule/BoxDotNetModule.py +lib/conduit/modules/BoxDotNetModule/BoxDotNetModule.pyc +lib/conduit/modules/BoxDotNetModule/BoxDotNetModule.pyo +lib/conduit/modules/BoxDotNetModule/config.glade +lib/conduit/modules/ConverterModule.py +lib/conduit/modules/ConverterModule.pyc +lib/conduit/modules/ConverterModule.pyo +lib/conduit/modules/EvolutionModule/EvolutionModule.py +lib/conduit/modules/EvolutionModule/EvolutionModule.pyc +lib/conduit/modules/EvolutionModule/EvolutionModule.pyo +lib/conduit/modules/EvolutionModule/config.glade +lib/conduit/modules/FacebookModule/FacebookModule.py +lib/conduit/modules/FacebookModule/FacebookModule.pyc +lib/conduit/modules/FacebookModule/FacebookModule.pyo +lib/conduit/modules/FacebookModule/pyfacebook/__init__.py +lib/conduit/modules/FacebookModule/pyfacebook/__init__.pyc +lib/conduit/modules/FacebookModule/pyfacebook/__init__.pyo +lib/conduit/modules/FeedModule/FeedModule.py +lib/conduit/modules/FeedModule/FeedModule.pyc +lib/conduit/modules/FeedModule/FeedModule.pyo +lib/conduit/modules/FeedModule/config.glade +lib/conduit/modules/FileModule/FileConfiguration.py +lib/conduit/modules/FileModule/FileConfiguration.pyc +lib/conduit/modules/FileModule/FileConfiguration.pyo +lib/conduit/modules/FileModule/FileModule.py +lib/conduit/modules/FileModule/FileModule.pyc +lib/conduit/modules/FileModule/FileModule.pyo +lib/conduit/modules/FileModule/config.glade +lib/conduit/modules/FlickrModule/FlickrModule.py +lib/conduit/modules/FlickrModule/FlickrModule.pyc +lib/conduit/modules/FlickrModule/FlickrModule.pyo +lib/conduit/modules/FlickrModule/config.glade +lib/conduit/modules/FlickrModule/flickrapi/__init__.py +lib/conduit/modules/FlickrModule/flickrapi/__init__.pyc +lib/conduit/modules/FlickrModule/flickrapi/__init__.pyo +lib/conduit/modules/FlickrModule/flickrapi/multipart.py +lib/conduit/modules/FlickrModule/flickrapi/multipart.pyc +lib/conduit/modules/FlickrModule/flickrapi/multipart.pyo +lib/conduit/modules/FlickrModule/flickrapi/reportinghttp.py +lib/conduit/modules/FlickrModule/flickrapi/reportinghttp.pyc +lib/conduit/modules/FlickrModule/flickrapi/reportinghttp.pyo +lib/conduit/modules/FlickrModule/flickrapi/tokencache.py +lib/conduit/modules/FlickrModule/flickrapi/tokencache.pyc +lib/conduit/modules/FlickrModule/flickrapi/tokencache.pyo +lib/conduit/modules/FlickrModule/flickrapi/xmlnode.py +lib/conduit/modules/FlickrModule/flickrapi/xmlnode.pyc +lib/conduit/modules/FlickrModule/flickrapi/xmlnode.pyo +lib/conduit/modules/FspotModule/FspotModule.py +lib/conduit/modules/FspotModule/FspotModule.pyc +lib/conduit/modules/FspotModule/FspotModule.pyo +lib/conduit/modules/FspotModule/config.glade +lib/conduit/modules/GConfModule/GConfModule.py +lib/conduit/modules/GConfModule/GConfModule.pyc +lib/conduit/modules/GConfModule/GConfModule.pyo +lib/conduit/modules/GmailModule/GmailModule.py +lib/conduit/modules/GmailModule/GmailModule.pyc +lib/conduit/modules/GmailModule/GmailModule.pyo +lib/conduit/modules/GmailModule/config.glade +lib/conduit/modules/GmailModule/libgmail/gmail_transport.py +lib/conduit/modules/GmailModule/libgmail/gmail_transport.pyc +lib/conduit/modules/GmailModule/libgmail/gmail_transport.pyo +lib/conduit/modules/GmailModule/libgmail/lgconstants.py +lib/conduit/modules/GmailModule/libgmail/lgconstants.pyc +lib/conduit/modules/GmailModule/libgmail/lgconstants.pyo +lib/conduit/modules/GmailModule/libgmail/libgmail.py +lib/conduit/modules/GmailModule/libgmail/libgmail.pyc +lib/conduit/modules/GmailModule/libgmail/libgmail.pyo +lib/conduit/modules/GoogleModule/GoogleModule.py +lib/conduit/modules/GoogleModule/GoogleModule.pyc +lib/conduit/modules/GoogleModule/GoogleModule.pyo +lib/conduit/modules/GoogleModule/atom/__init__.py +lib/conduit/modules/GoogleModule/atom/__init__.pyc +lib/conduit/modules/GoogleModule/atom/__init__.pyo +lib/conduit/modules/GoogleModule/atom/service.py +lib/conduit/modules/GoogleModule/atom/service.pyc +lib/conduit/modules/GoogleModule/atom/service.pyo +lib/conduit/modules/GoogleModule/calendar-config.glade +lib/conduit/modules/GoogleModule/gdata/__init__.py +lib/conduit/modules/GoogleModule/gdata/__init__.pyc +lib/conduit/modules/GoogleModule/gdata/__init__.pyo +lib/conduit/modules/GoogleModule/gdata/auth.py +lib/conduit/modules/GoogleModule/gdata/auth.pyc +lib/conduit/modules/GoogleModule/gdata/auth.pyo +lib/conduit/modules/GoogleModule/gdata/calendar/__init__.py +lib/conduit/modules/GoogleModule/gdata/calendar/__init__.pyc +lib/conduit/modules/GoogleModule/gdata/calendar/__init__.pyo +lib/conduit/modules/GoogleModule/gdata/calendar/service.py +lib/conduit/modules/GoogleModule/gdata/calendar/service.pyc +lib/conduit/modules/GoogleModule/gdata/calendar/service.pyo +lib/conduit/modules/GoogleModule/gdata/exif/__init__.py +lib/conduit/modules/GoogleModule/gdata/exif/__init__.pyc +lib/conduit/modules/GoogleModule/gdata/exif/__init__.pyo +lib/conduit/modules/GoogleModule/gdata/geo/__init__.py +lib/conduit/modules/GoogleModule/gdata/geo/__init__.pyc +lib/conduit/modules/GoogleModule/gdata/geo/__init__.pyo +lib/conduit/modules/GoogleModule/gdata/media/__init__.py +lib/conduit/modules/GoogleModule/gdata/media/__init__.pyc +lib/conduit/modules/GoogleModule/gdata/media/__init__.pyo +lib/conduit/modules/GoogleModule/gdata/photos/__init__.py +lib/conduit/modules/GoogleModule/gdata/photos/__init__.pyc +lib/conduit/modules/GoogleModule/gdata/photos/__init__.pyo +lib/conduit/modules/GoogleModule/gdata/photos/service.py +lib/conduit/modules/GoogleModule/gdata/photos/service.pyc +lib/conduit/modules/GoogleModule/gdata/photos/service.pyo +lib/conduit/modules/GoogleModule/gdata/service.py +lib/conduit/modules/GoogleModule/gdata/service.pyc +lib/conduit/modules/GoogleModule/gdata/service.pyo +lib/conduit/modules/GoogleModule/picasa-config.glade +lib/conduit/modules/GoogleModule/youtube-config.glade +lib/conduit/modules/N800Module/N800Module.py +lib/conduit/modules/N800Module/N800Module.pyc +lib/conduit/modules/N800Module/N800Module.pyo +lib/conduit/modules/NetworkModule/Client.py +lib/conduit/modules/NetworkModule/Client.pyc +lib/conduit/modules/NetworkModule/Client.pyo +lib/conduit/modules/NetworkModule/NetworkModule.py +lib/conduit/modules/NetworkModule/NetworkModule.pyc +lib/conduit/modules/NetworkModule/NetworkModule.pyo +lib/conduit/modules/NetworkModule/Peers.py +lib/conduit/modules/NetworkModule/Peers.pyc +lib/conduit/modules/NetworkModule/Peers.pyo +lib/conduit/modules/NetworkModule/Server.py +lib/conduit/modules/NetworkModule/Server.pyc +lib/conduit/modules/NetworkModule/Server.pyo +lib/conduit/modules/NetworkModule/XMLRPCUtils.py +lib/conduit/modules/NetworkModule/XMLRPCUtils.pyc +lib/conduit/modules/NetworkModule/XMLRPCUtils.pyo +lib/conduit/modules/NetworkModule/__init__.py +lib/conduit/modules/NetworkModule/__init__.pyc +lib/conduit/modules/NetworkModule/__init__.pyo +lib/conduit/modules/PhotoConverterModule.py +lib/conduit/modules/PhotoConverterModule.pyc +lib/conduit/modules/PhotoConverterModule.pyo +lib/conduit/modules/RhythmboxModule/RhythmboxModule.py +lib/conduit/modules/RhythmboxModule/RhythmboxModule.pyc +lib/conduit/modules/RhythmboxModule/RhythmboxModule.pyo +lib/conduit/modules/RhythmboxModule/config.glade +lib/conduit/modules/ShutterflyModule/ShutterflyModule.py +lib/conduit/modules/ShutterflyModule/ShutterflyModule.pyc +lib/conduit/modules/ShutterflyModule/ShutterflyModule.pyo +lib/conduit/modules/ShutterflyModule/shutterfly.glade +lib/conduit/modules/ShutterflyModule/shutterfly/shutterfly.py +lib/conduit/modules/ShutterflyModule/shutterfly/shutterfly.pyc +lib/conduit/modules/ShutterflyModule/shutterfly/shutterfly.pyo +lib/conduit/modules/SmugMugModule/SmugMugAPI/smugmug.py +lib/conduit/modules/SmugMugModule/SmugMugAPI/smugmug.pyc +lib/conduit/modules/SmugMugModule/SmugMugAPI/smugmug.pyo +lib/conduit/modules/SmugMugModule/SmugMugModule.py +lib/conduit/modules/SmugMugModule/SmugMugModule.pyc +lib/conduit/modules/SmugMugModule/SmugMugModule.pyo +lib/conduit/modules/SmugMugModule/config.glade +lib/conduit/modules/TomboyModule.py +lib/conduit/modules/TomboyModule.pyc +lib/conduit/modules/TomboyModule.pyo +lib/conduit/modules/__init__.py +lib/conduit/modules/__init__.pyc +lib/conduit/modules/__init__.pyo +lib/conduit/modules/iPodModule.py +lib/conduit/modules/iPodModule.pyc +lib/conduit/modules/iPodModule.pyo %%PYTHON_SITELIBDIR%%/conduit/Conduit.py -%%PYTHON_SITELIBDIR%%/conduit/DataProvider.py +%%PYTHON_SITELIBDIR%%/conduit/Conduit.pyc +%%PYTHON_SITELIBDIR%%/conduit/Conduit.pyo +%%PYTHON_SITELIBDIR%%/conduit/Conflict.py +%%PYTHON_SITELIBDIR%%/conduit/Conflict.pyc +%%PYTHON_SITELIBDIR%%/conduit/Conflict.pyo +%%PYTHON_SITELIBDIR%%/conduit/DBus.py +%%PYTHON_SITELIBDIR%%/conduit/DBus.pyc +%%PYTHON_SITELIBDIR%%/conduit/DBus.pyo +%%PYTHON_SITELIBDIR%%/conduit/Database.py +%%PYTHON_SITELIBDIR%%/conduit/Database.pyc +%%PYTHON_SITELIBDIR%%/conduit/Database.pyo +%%PYTHON_SITELIBDIR%%/conduit/DeltaProvider.py +%%PYTHON_SITELIBDIR%%/conduit/DeltaProvider.pyc +%%PYTHON_SITELIBDIR%%/conduit/DeltaProvider.pyo %%PYTHON_SITELIBDIR%%/conduit/Exceptions.py -%%PYTHON_SITELIBDIR%%/conduit/MainWindow.py +%%PYTHON_SITELIBDIR%%/conduit/Exceptions.pyc +%%PYTHON_SITELIBDIR%%/conduit/Exceptions.pyo +%%PYTHON_SITELIBDIR%%/conduit/Globals.py +%%PYTHON_SITELIBDIR%%/conduit/Globals.pyc +%%PYTHON_SITELIBDIR%%/conduit/Globals.pyo +%%PYTHON_SITELIBDIR%%/conduit/Logging.py +%%PYTHON_SITELIBDIR%%/conduit/Logging.pyc +%%PYTHON_SITELIBDIR%%/conduit/Logging.pyo +%%PYTHON_SITELIBDIR%%/conduit/Main.py +%%PYTHON_SITELIBDIR%%/conduit/Main.pyc +%%PYTHON_SITELIBDIR%%/conduit/Main.pyo +%%PYTHON_SITELIBDIR%%/conduit/MappingDB.py +%%PYTHON_SITELIBDIR%%/conduit/MappingDB.pyc +%%PYTHON_SITELIBDIR%%/conduit/MappingDB.pyo %%PYTHON_SITELIBDIR%%/conduit/Module.py +%%PYTHON_SITELIBDIR%%/conduit/Module.pyc +%%PYTHON_SITELIBDIR%%/conduit/Module.pyo +%%PYTHON_SITELIBDIR%%/conduit/ModuleWrapper.py +%%PYTHON_SITELIBDIR%%/conduit/ModuleWrapper.pyc +%%PYTHON_SITELIBDIR%%/conduit/ModuleWrapper.pyo %%PYTHON_SITELIBDIR%%/conduit/Settings.py +%%PYTHON_SITELIBDIR%%/conduit/Settings.pyc +%%PYTHON_SITELIBDIR%%/conduit/Settings.pyo +%%PYTHON_SITELIBDIR%%/conduit/SyncSet.py +%%PYTHON_SITELIBDIR%%/conduit/SyncSet.pyc +%%PYTHON_SITELIBDIR%%/conduit/SyncSet.pyo %%PYTHON_SITELIBDIR%%/conduit/Synchronization.py +%%PYTHON_SITELIBDIR%%/conduit/Synchronization.pyc +%%PYTHON_SITELIBDIR%%/conduit/Synchronization.pyo %%PYTHON_SITELIBDIR%%/conduit/TypeConverter.py +%%PYTHON_SITELIBDIR%%/conduit/TypeConverter.pyc +%%PYTHON_SITELIBDIR%%/conduit/TypeConverter.pyo %%PYTHON_SITELIBDIR%%/conduit/Utils.py +%%PYTHON_SITELIBDIR%%/conduit/Utils.pyc +%%PYTHON_SITELIBDIR%%/conduit/Utils.pyo +%%PYTHON_SITELIBDIR%%/conduit/Vfs.py +%%PYTHON_SITELIBDIR%%/conduit/Vfs.pyc +%%PYTHON_SITELIBDIR%%/conduit/Vfs.pyo +%%PYTHON_SITELIBDIR%%/conduit/Web.py +%%PYTHON_SITELIBDIR%%/conduit/Web.pyc +%%PYTHON_SITELIBDIR%%/conduit/Web.pyo %%PYTHON_SITELIBDIR%%/conduit/__init__.py +%%PYTHON_SITELIBDIR%%/conduit/__init__.pyc +%%PYTHON_SITELIBDIR%%/conduit/__init__.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/AutoSync.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/AutoSync.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/AutoSync.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProvider.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProvider.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProvider.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProviderCategory.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProviderCategory.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProviderCategory.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/File.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/File.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/File.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/HalFactory.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/HalFactory.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/HalFactory.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/Image.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/Image.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/Image.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/SimpleFactory.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/SimpleFactory.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/SimpleFactory.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/VolumeFactory.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/VolumeFactory.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/VolumeFactory.pyo +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/__init__.py +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/__init__.pyc +%%PYTHON_SITELIBDIR%%/conduit/dataproviders/__init__.pyo +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Audio.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Audio.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Audio.pyo +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Contact.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Contact.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Contact.pyo %%PYTHON_SITELIBDIR%%/conduit/datatypes/DataType.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/DataType.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/DataType.pyo %%PYTHON_SITELIBDIR%%/conduit/datatypes/Email.py -%%PYTHON_SITELIBDIR%%/conduit/datatypes/Feed.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Email.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Email.pyo +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Event.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Event.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Event.pyo %%PYTHON_SITELIBDIR%%/conduit/datatypes/File.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/File.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/File.pyo %%PYTHON_SITELIBDIR%%/conduit/datatypes/Note.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Note.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Note.pyo +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Photo.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Photo.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Photo.pyo +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Setting.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Setting.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Setting.pyo %%PYTHON_SITELIBDIR%%/conduit/datatypes/Text.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Text.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Text.pyo +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Video.py +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Video.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/Video.pyo %%PYTHON_SITELIBDIR%%/conduit/datatypes/__init__.py -%%PYTHON_SITELIBDIR%%/conduit/start_conduit.py -%%DATADIR%%/contrib/EXIF-15-FEB-04/EXIF.py -%%DATADIR%%/contrib/FlickrAPI-8/flickrapi.py -%%DATADIR%%/contrib/FlickrAPI-8/setup.py -%%DATADIR%%/contrib/backpack-1.1/backpack.py -%%DATADIR%%/contrib/backpack-1.1/bptest.py -%%DATADIR%%/contrib/backpack-1.1/wapsupport.py -%%DATADIR%%/contrib/httplib2/__init__.py -%%DATADIR%%/contrib/libgmail-0.1.5/lgconstants.py -%%DATADIR%%/contrib/libgmail-0.1.5/libgmail.py -%%DATADIR%%/contrib/libgmail-0.1.5/setup.py -%%DATADIR%%/contrib/python-opml-0.5/OPML.py -%%DATADIR%%/data/backpack.png -%%DATADIR%%/data/conduit-icon.png -%%DATADIR%%/data/conduit-splash.png -%%DATADIR%%/data/conduit.glade -%%DATADIR%%/data/f-spot.png -%%DATADIR%%/data/feed-icon.png -%%DATADIR%%/data/liferea.png -%%DATADIR%%/data/tomboy.png -%%DATADIR%%/dataproviders/BackpackModule.py -%%DATADIR%%/dataproviders/FeedModule.py -%%DATADIR%%/dataproviders/FileModule.py -%%DATADIR%%/dataproviders/FlickrModule.py -%%DATADIR%%/dataproviders/FspotModule.py -%%DATADIR%%/dataproviders/GmailModule.py -%%DATADIR%%/dataproviders/LifereaModule.py -%%DATADIR%%/dataproviders/NotesModule.py -%%DATADIR%%/dataproviders/TestModule.py -%%DATADIR%%/dataproviders/TextConverterModule.py -%%DATADIR%%/dataproviders/__init__.py -share/pixmaps/conduit-icon.png -@dirrm %%DATADIR%%/dataproviders -@dirrm %%DATADIR%%/data -@dirrm %%DATADIR%%/contrib/python-opml-0.5 -@dirrm %%DATADIR%%/contrib/libgmail-0.1.5 -@dirrm %%DATADIR%%/contrib/httplib2 -@dirrm %%DATADIR%%/contrib/backpack-1.1 -@dirrm %%DATADIR%%/contrib/FlickrAPI-8 -@dirrm %%DATADIR%%/contrib/EXIF-15-FEB-04 -@dirrm %%DATADIR%%/contrib +%%PYTHON_SITELIBDIR%%/conduit/datatypes/__init__.pyc +%%PYTHON_SITELIBDIR%%/conduit/datatypes/__init__.pyo +%%PYTHON_SITELIBDIR%%/conduit/defs.py +%%PYTHON_SITELIBDIR%%/conduit/defs.pyc +%%PYTHON_SITELIBDIR%%/conduit/defs.pyo +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Canvas.py +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Canvas.pyc +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Canvas.pyo +%%PYTHON_SITELIBDIR%%/conduit/gtkui/ConflictResolver.py +%%PYTHON_SITELIBDIR%%/conduit/gtkui/ConflictResolver.pyc +%%PYTHON_SITELIBDIR%%/conduit/gtkui/ConflictResolver.pyo +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Database.py +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Database.pyc +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Database.pyo +%%PYTHON_SITELIBDIR%%/conduit/gtkui/SimpleConfigurator.py +%%PYTHON_SITELIBDIR%%/conduit/gtkui/SimpleConfigurator.pyc +%%PYTHON_SITELIBDIR%%/conduit/gtkui/SimpleConfigurator.pyo +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Tree.py +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Tree.pyc +%%PYTHON_SITELIBDIR%%/conduit/gtkui/Tree.pyo +%%PYTHON_SITELIBDIR%%/conduit/gtkui/UI.py +%%PYTHON_SITELIBDIR%%/conduit/gtkui/UI.pyc +%%PYTHON_SITELIBDIR%%/conduit/gtkui/UI.pyo +%%PYTHON_SITELIBDIR%%/conduit/gtkui/__init__.py +%%PYTHON_SITELIBDIR%%/conduit/gtkui/__init__.pyc +%%PYTHON_SITELIBDIR%%/conduit/gtkui/__init__.pyo +%%PYTHON_SITELIBDIR%%/conduit/hildonui/Canvas.py +%%PYTHON_SITELIBDIR%%/conduit/hildonui/Canvas.pyc +%%PYTHON_SITELIBDIR%%/conduit/hildonui/Canvas.pyo +%%PYTHON_SITELIBDIR%%/conduit/hildonui/List.py +%%PYTHON_SITELIBDIR%%/conduit/hildonui/List.pyc +%%PYTHON_SITELIBDIR%%/conduit/hildonui/List.pyo +%%PYTHON_SITELIBDIR%%/conduit/hildonui/UI.py +%%PYTHON_SITELIBDIR%%/conduit/hildonui/UI.pyc +%%PYTHON_SITELIBDIR%%/conduit/hildonui/UI.pyo +%%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.py +%%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.pyc +%%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.pyo +libdata/pkgconfig/conduit.pc +share/applications/conduit.desktop +%%DATADIR%%/backpack.png +%%DATADIR%%/boxdotnet.png +%%DATADIR%%/conduit-splash.png +%%DATADIR%%/conduit.glade +%%DATADIR%%/f-spot.png +%%DATADIR%%/facebook.png +%%DATADIR%%/feed.png +%%DATADIR%%/flickr.png +%%DATADIR%%/liferea.png +%%DATADIR%%/picasa.png +%%DATADIR%%/shutterfly.png +%%DATADIR%%/smugmug.png +%%DATADIR%%/tomboy.png +%%DATADIR%%/youtube.png +share/dbus-1/services/org.conduit.service +share/gnome/autostart/conduit-autostart.desktop +share/gnome/help/conduit/C/conduit.xml +share/gnome/help/conduit/C/figures/conduit-dp.png +share/gnome/help/conduit/C/figures/conduit-folder-configuration.png +share/gnome/help/conduit/C/figures/conduit-gui-parts.png +share/icons/hicolor/16x16/actions/conduit-conflict-ask.png +share/icons/hicolor/16x16/actions/conduit-conflict-delete.png +share/icons/hicolor/16x16/actions/conduit-conflict-left.png +share/icons/hicolor/16x16/actions/conduit-conflict-right.png +share/icons/hicolor/16x16/actions/conduit-conflict-skip.png +share/icons/hicolor/16x16/apps/conduit-sink.png +share/icons/hicolor/16x16/apps/conduit-source.png +share/icons/hicolor/16x16/apps/conduit-twoway.png +share/icons/hicolor/16x16/apps/conduit.png +share/icons/hicolor/16x16/status/conduit-progress-1.png +share/icons/hicolor/16x16/status/conduit-progress-2.png +share/icons/hicolor/16x16/status/conduit-progress-3.png +share/icons/hicolor/16x16/status/conduit-progress-4.png +share/icons/hicolor/16x16/status/conduit-progress-5.png +share/icons/hicolor/16x16/status/conduit-progress-6.png +share/icons/hicolor/16x16/status/conduit-progress-7.png +share/icons/hicolor/16x16/status/conduit-progress-8.png +share/icons/hicolor/16x16/status/conduit-sink.png +share/icons/hicolor/16x16/status/conduit-source.png +share/icons/hicolor/16x16/status/conduit-twoway.png +share/icons/hicolor/22x22/apps/conduit.png +share/icons/hicolor/24x24/apps/conduit.png +share/icons/hicolor/26x26/apps/conduit.png +share/icons/hicolor/32x32/apps/conduit.png +share/icons/hicolor/48x48/apps/conduit.png +share/icons/hicolor/scalable/apps/conduit.svg +share/locale/ar/LC_MESSAGES/conduit.mo +share/locale/ca/LC_MESSAGES/conduit.mo +share/locale/en_GB/LC_MESSAGES/conduit.mo +share/locale/es/LC_MESSAGES/conduit.mo +share/locale/fr/LC_MESSAGES/conduit.mo +share/locale/it/LC_MESSAGES/conduit.mo +share/locale/nb/LC_MESSAGES/conduit.mo +share/locale/pt/LC_MESSAGES/conduit.mo +share/locale/pt_BR/LC_MESSAGES/conduit.mo +share/locale/ru/LC_MESSAGES/conduit.mo +share/locale/sv/LC_MESSAGES/conduit.mo +share/omf/conduit/conduit-C.omf +@dirrm share/omf/conduit +@dirrm share/gnome/help/conduit/C/figures +@dirrm share/gnome/help/conduit/C +@dirrm share/gnome/help/conduit @dirrm %%DATADIR%% @dirrmtry share/applications +@dirrm %%PYTHON_SITELIBDIR%%/conduit/hildonui +@dirrm %%PYTHON_SITELIBDIR%%/conduit/gtkui @dirrm %%PYTHON_SITELIBDIR%%/conduit/datatypes +@dirrm %%PYTHON_SITELIBDIR%%/conduit/dataproviders @dirrm %%PYTHON_SITELIBDIR%%/conduit +@dirrm lib/conduit/modules/SmugMugModule/SmugMugAPI +@dirrm lib/conduit/modules/SmugMugModule +@dirrm lib/conduit/modules/ShutterflyModule/shutterfly +@dirrm lib/conduit/modules/ShutterflyModule +@dirrm lib/conduit/modules/RhythmboxModule +@dirrm lib/conduit/modules/NetworkModule +@dirrm lib/conduit/modules/N800Module +@dirrm lib/conduit/modules/GoogleModule/gdata/photos +@dirrm lib/conduit/modules/GoogleModule/gdata/media +@dirrm lib/conduit/modules/GoogleModule/gdata/geo +@dirrm lib/conduit/modules/GoogleModule/gdata/exif +@dirrm lib/conduit/modules/GoogleModule/gdata/calendar +@dirrm lib/conduit/modules/GoogleModule/gdata +@dirrm lib/conduit/modules/GoogleModule/atom +@dirrm lib/conduit/modules/GoogleModule +@dirrm lib/conduit/modules/GmailModule/libgmail +@dirrm lib/conduit/modules/GmailModule +@dirrm lib/conduit/modules/GConfModule +@dirrm lib/conduit/modules/FspotModule +@dirrm lib/conduit/modules/FlickrModule/flickrapi +@dirrm lib/conduit/modules/FlickrModule +@dirrm lib/conduit/modules/FileModule +@dirrm lib/conduit/modules/FeedModule +@dirrm lib/conduit/modules/FacebookModule/pyfacebook +@dirrm lib/conduit/modules/FacebookModule +@dirrm lib/conduit/modules/EvolutionModule +@dirrm lib/conduit/modules/BoxDotNetModule/BoxDotNetAPI +@dirrm lib/conduit/modules/BoxDotNetModule +@dirrm lib/conduit/modules/BansheeModule +@dirrm lib/conduit/modules/BackpackModule/backpack +@dirrm lib/conduit/modules/BackpackModule +@dirrm lib/conduit/modules +@dirrm lib/conduit diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 54e7acc0a509..c40a498a36e1 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,14 +3,13 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/deskutils/deskbar-applet/Makefile,v 1.1 2007/11/30 22:05:58 marcus Exp $ +# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.80 2008/03/11 14:26:12 ahze Exp $ # PORTNAME= deskbar-applet -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0.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/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo index 65eaa2aff59b..6766564fdf25 100644 --- a/deskutils/deskbar-applet/distinfo +++ b/deskutils/deskbar-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/deskbar-applet-2.20.3.tar.bz2) = f84abfede0bbe5b172b24f581550e4a0 -SHA256 (gnome2/deskbar-applet-2.20.3.tar.bz2) = 20c4af80682c1a9018f70d33bde4a27dc87c8b5d37ba558c8db4218017414d8c -SIZE (gnome2/deskbar-applet-2.20.3.tar.bz2) = 753652 +MD5 (gnome2/deskbar-applet-2.22.0.1.tar.bz2) = ec335345998e5ca6c71b058904a264e4 +SHA256 (gnome2/deskbar-applet-2.22.0.1.tar.bz2) = 6f17abbf17dc6206bb6041876a54590bf5180b90664b04d49a2c3111ff509c91 +SIZE (gnome2/deskbar-applet-2.22.0.1.tar.bz2) = 836470 diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist index 7f33564c8998..b018ec0a8829 100644 --- a/deskutils/deskbar-applet/pkg-plist +++ b/deskutils/deskbar-applet/pkg-plist @@ -35,6 +35,12 @@ lib/deskbar-applet/modules-2.20-compatible/programs.pyo lib/deskbar-applet/modules-2.20-compatible/recent.py lib/deskbar-applet/modules-2.20-compatible/recent.pyc lib/deskbar-applet/modules-2.20-compatible/recent.pyo +lib/deskbar-applet/modules-2.20-compatible/templates.py +lib/deskbar-applet/modules-2.20-compatible/templates.pyc +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/web_address.py lib/deskbar-applet/modules-2.20-compatible/web_address.pyc lib/deskbar-applet/modules-2.20-compatible/web_address.pyo @@ -86,6 +92,11 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo %%PYTHON_SITELIBDIR%%/deskbar/core/__init__.py %%PYTHON_SITELIBDIR%%/deskbar/core/__init__.pyc %%PYTHON_SITELIBDIR%%/deskbar/core/__init__.pyo +%%PYTHON_SITELIBDIR%%/deskbar/core/_userdirs/__init__.py +%%PYTHON_SITELIBDIR%%/deskbar/core/_userdirs/__init__.pyc +%%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 @@ -183,21 +194,27 @@ 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/CuemiacAlignedView.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacAlignedView.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacAlignedView.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.py %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowController.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.py %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/CuemiacWindowView.pyo -%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.py -%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.pyc -%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarApplet.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarTray.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarTray.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/DeskbarTray.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.py %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/__init__.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.py %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacActionsTreeView.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/CuemiacEntry.py %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacEntry.pyo @@ -216,6 +233,9 @@ lib/deskbar-applet/modules-2.20-compatible/yahoo.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.py %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/CuemiacTreeView.pyo +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.py +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.pyc +%%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/LingeringSelectionWindow.pyo %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.py %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyc %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac/__init__.pyo @@ -254,6 +274,8 @@ libdata/pkgconfig/deskbar-applet.pc %%DATADIR%%/art/generic.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/yahoo.png %%DATADIR%%/mozilla-search.glade @@ -265,6 +287,9 @@ share/gnome/help/deskbar/C/legal.xml share/gnome/help/deskbar/ca/deskbar.xml share/gnome/help/deskbar/ca/figures/deskbar-applet.png share/gnome/help/deskbar/ca/legal.xml +share/gnome/help/deskbar/el/deskbar.xml +share/gnome/help/deskbar/el/figures/deskbar-applet.png +share/gnome/help/deskbar/el/legal.xml share/gnome/help/deskbar/en_GB/deskbar.xml share/gnome/help/deskbar/en_GB/figures/deskbar-applet.png share/gnome/help/deskbar/en_GB/legal.xml @@ -289,6 +314,7 @@ 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/ar/LC_MESSAGES/deskbar-applet.mo +share/locale/as/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 @@ -318,6 +344,7 @@ share/locale/id/LC_MESSAGES/deskbar-applet.mo share/locale/it/LC_MESSAGES/deskbar-applet.mo share/locale/ja/LC_MESSAGES/deskbar-applet.mo share/locale/ka/LC_MESSAGES/deskbar-applet.mo +share/locale/kn/LC_MESSAGES/deskbar-applet.mo share/locale/ko/LC_MESSAGES/deskbar-applet.mo share/locale/ku/LC_MESSAGES/deskbar-applet.mo share/locale/lt/LC_MESSAGES/deskbar-applet.mo @@ -330,6 +357,7 @@ share/locale/mr/LC_MESSAGES/deskbar-applet.mo share/locale/nb/LC_MESSAGES/deskbar-applet.mo share/locale/ne/LC_MESSAGES/deskbar-applet.mo share/locale/nl/LC_MESSAGES/deskbar-applet.mo +share/locale/nn/LC_MESSAGES/deskbar-applet.mo share/locale/oc/LC_MESSAGES/deskbar-applet.mo share/locale/or/LC_MESSAGES/deskbar-applet.mo share/locale/pa/LC_MESSAGES/deskbar-applet.mo @@ -349,14 +377,13 @@ share/locale/ta/LC_MESSAGES/deskbar-applet.mo share/locale/th/LC_MESSAGES/deskbar-applet.mo share/locale/tr/LC_MESSAGES/deskbar-applet.mo share/locale/uk/LC_MESSAGES/deskbar-applet.mo -share/locale/uz/LC_MESSAGES/deskbar-applet.mo -share/locale/uz@cyrillic/LC_MESSAGES/deskbar-applet.mo share/locale/vi/LC_MESSAGES/deskbar-applet.mo share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo share/omf/deskbar/deskbar-C.omf share/omf/deskbar/deskbar-ca.omf +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 @@ -376,6 +403,8 @@ share/omf/deskbar/deskbar-uk.omf @dirrm share/gnome/help/deskbar/es @dirrm share/gnome/help/deskbar/en_GB/figures @dirrm share/gnome/help/deskbar/en_GB +@dirrm share/gnome/help/deskbar/el/figures +@dirrm share/gnome/help/deskbar/el @dirrm share/gnome/help/deskbar/ca/figures @dirrm share/gnome/help/deskbar/ca @dirrm share/gnome/help/deskbar/C/figures @@ -396,14 +425,13 @@ share/omf/deskbar/deskbar-uk.omf @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 @dirrm lib/deskbar-applet/modules-2.20-compatible @dirrm lib/deskbar-applet @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/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/oc/LC_MESSAGES @@ -420,3 +448,5 @@ 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/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile index 368a58caf6d4..e08023336f7e 100644 --- a/deskutils/evolution-jescs/Makefile +++ b/deskutils/evolution-jescs/Makefile @@ -3,17 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.23 2007/09/17 12:31:53 ahze Exp $ +# $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.29 2008/03/11 18:33:24 mezz Exp $ # -PORTNAME= jescs -PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTNAME= evolution-jescs +PORTVERSION= 2.22 CATEGORIES= deskutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PKGNAMEPREFIX= evolution- -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Sun Java Enterprise System Calendar Server provider for Evolution @@ -30,8 +27,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -EVO_VERSION= 2.12 -PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.12" +EVO_VERSION= 2.22 +PLIST_SUB= EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.22" 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 4bf4c49b80c6..1e141a8837ff 100644 --- a/deskutils/evolution-jescs/distinfo +++ b/deskutils/evolution-jescs/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-jescs-2.12.0.tar.bz2) = 3b26fb74086a9146648e0e3fda66c209 -SHA256 (evolution-jescs-2.12.0.tar.bz2) = 6b120a754ec08531ff22158581590df49d5ce58438374403f905ff073764c8ba -SIZE (evolution-jescs-2.12.0.tar.bz2) = 529901 +MD5 (gnome2/evolution-jescs-2.22.tar.bz2) = a0d7c00e83e40f02d12645259ef366dc +SHA256 (gnome2/evolution-jescs-2.22.tar.bz2) = 7bb9806b18cb97215e3944303376c9359c1b61eae4b1cad15fc88c5cbf357928 +SIZE (gnome2/evolution-jescs-2.22.tar.bz2) = 533692 diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile index 71c541a8df78..22f5fb90f69b 100644 --- a/deskutils/gucharmap/Makefile +++ b/deskutils/gucharmap/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/gucharmap/Makefile,v 1.41 2007/09/18 12:13:31 ahze Exp $ +# $MCom: ports/deskutils/gucharmap/Makefile,v 1.47 2008/03/09 22:24:55 mezz Exp $ # PORTNAME= gucharmap -PORTVERSION= 1.10.2 +PORTVERSION= 2.22.0 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 @@ -22,7 +21,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_XLIB= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils +USE_GNOME= gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2 WANT_GNOME= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes @@ -31,19 +30,6 @@ INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.if defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME -.undef WITHOUT_ALL -WITH_GNOME= yes -.endif +GCONF_SCHEMAS= gucharmap.schemas -.include <bsd.port.pre.mk> - -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -PKGNAMESUFFIX:= -gnome -.else -CONFIGURE_ARGS= --disable-gnome -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/gucharmap/distinfo b/deskutils/gucharmap/distinfo index 5503b9bd0dc8..c0e2163fab85 100644 --- a/deskutils/gucharmap/distinfo +++ b/deskutils/gucharmap/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gucharmap-1.10.2.tar.bz2) = 0a81695c916b2dbae2392f4bcb8c4e22 -SHA256 (gnome2/gucharmap-1.10.2.tar.bz2) = 586d55f1c61b5daa2237159aa8e7c80a397dcd3c4b7f4fdab4cd6356af808dc6 -SIZE (gnome2/gucharmap-1.10.2.tar.bz2) = 2514969 +MD5 (gnome2/gucharmap-2.22.0.tar.bz2) = aff0c556ab360e0d6c63be911260637e +SHA256 (gnome2/gucharmap-2.22.0.tar.bz2) = d2e0d4e027f67ef310d3bee3d36ad22d99337723e6e7df862b0e1bd254302008 +SIZE (gnome2/gucharmap-2.22.0.tar.bz2) = 2624670 diff --git a/deskutils/gucharmap/pkg-plist b/deskutils/gucharmap/pkg-plist index a9f1da2dd817..7bf41a2c8449 100644 --- a/deskutils/gucharmap/pkg-plist +++ b/deskutils/gucharmap/pkg-plist @@ -1,14 +1,19 @@ 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 @@ -52,6 +57,9 @@ share/gnome/help/gucharmap/ko/gucharmap.xml share/gnome/help/gucharmap/oc/figures/gucharmap_start_window.png share/gnome/help/gucharmap/oc/figures/gucharmap_window.png share/gnome/help/gucharmap/oc/gucharmap.xml +share/gnome/help/gucharmap/pt_BR/figures/gucharmap_start_window.png +share/gnome/help/gucharmap/pt_BR/figures/gucharmap_window.png +share/gnome/help/gucharmap/pt_BR/gucharmap.xml share/gnome/help/gucharmap/ru/figures/gucharmap_start_window.png share/gnome/help/gucharmap/ru/figures/gucharmap_window.png share/gnome/help/gucharmap/ru/gucharmap.xml @@ -69,6 +77,7 @@ share/locale/am/LC_MESSAGES/gucharmap.mo share/locale/ar/LC_MESSAGES/gucharmap.mo share/locale/az/LC_MESSAGES/gucharmap.mo share/locale/be/LC_MESSAGES/gucharmap.mo +share/locale/be@latin/LC_MESSAGES/gucharmap.mo share/locale/bg/LC_MESSAGES/gucharmap.mo share/locale/bn/LC_MESSAGES/gucharmap.mo share/locale/bn_IN/LC_MESSAGES/gucharmap.mo @@ -92,6 +101,7 @@ share/locale/fr/LC_MESSAGES/gucharmap.mo share/locale/ga/LC_MESSAGES/gucharmap.mo share/locale/gl/LC_MESSAGES/gucharmap.mo share/locale/gu/LC_MESSAGES/gucharmap.mo +share/locale/he/LC_MESSAGES/gucharmap.mo share/locale/hi/LC_MESSAGES/gucharmap.mo share/locale/hr/LC_MESSAGES/gucharmap.mo share/locale/hu/LC_MESSAGES/gucharmap.mo @@ -150,6 +160,7 @@ share/omf/gucharmap/gucharmap-it.omf share/omf/gucharmap/gucharmap-ja.omf share/omf/gucharmap/gucharmap-ko.omf 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-zh_CN.omf @@ -163,6 +174,8 @@ share/omf/gucharmap/gucharmap-zh_TW.omf @dirrm share/gnome/help/gucharmap/sv @dirrm share/gnome/help/gucharmap/ru/figures @dirrm share/gnome/help/gucharmap/ru +@dirrm share/gnome/help/gucharmap/pt_BR/figures +@dirrm share/gnome/help/gucharmap/pt_BR @dirrm share/gnome/help/gucharmap/oc/figures @dirrm share/gnome/help/gucharmap/oc @dirrm share/gnome/help/gucharmap/ko/figures @@ -186,6 +199,7 @@ share/omf/gucharmap/gucharmap-zh_TW.omf @dirrm share/gnome/help/gucharmap/C/figures @dirrm share/gnome/help/gucharmap/C @dirrm share/gnome/help/gucharmap +@dirrmtry share/applications @dirrm include/gucharmap @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @@ -205,4 +219,5 @@ share/omf/gucharmap/gucharmap-zh_TW.omf @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 diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile index 1315d8e6f50e..eb1cd9625e36 100644 --- a/deskutils/nautilus-actions/Makefile +++ b/deskutils/nautilus-actions/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.4 2006/10/01 02:12:23 ahze Exp $ +# $MCom: ports/deskutils/nautilus-actions/Makefile,v 1.7 2008/03/18 14:45:27 ahze Exp $ +# PORTNAME= nautilus-actions -PORTVERSION= 1.4 -PORTREVISION= 2 +PORTVERSION= 1.4.1 CATEGORIES= deskutils MASTER_SITES= ftp://ftp2.grumz.net/grumz/ @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-1.0 +CONFIGURE_ARGS= --with-nautilus-extdir=${LOCALBASE}/lib/nautilus/extensions-2.0 post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure diff --git a/deskutils/nautilus-actions/distinfo b/deskutils/nautilus-actions/distinfo index 4c043f918a91..1e16b870728d 100644 --- a/deskutils/nautilus-actions/distinfo +++ b/deskutils/nautilus-actions/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-actions-1.4.tar.gz) = c3434900718401e13432533eab10e681 -SHA256 (nautilus-actions-1.4.tar.gz) = 61f05fcf7557eda96c9f275de5fb132858e80c8b7a33b04fbd06caafff4b056b -SIZE (nautilus-actions-1.4.tar.gz) = 800222 +MD5 (nautilus-actions-1.4.1.tar.gz) = 3e4af1af386bc2141dc509999767b207 +SHA256 (nautilus-actions-1.4.1.tar.gz) = d481748d64b606f6412b8a3b0701070a8989440f28bb370f392f20d6f3a3cd69 +SIZE (nautilus-actions-1.4.1.tar.gz) = 866736 diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist index 3ca1f4709e3f..d6cc9f69fcc7 100644 --- a/deskutils/nautilus-actions/pkg-plist +++ b/deskutils/nautilus-actions/pkg-plist @@ -1,20 +1,24 @@ bin/nautilus-actions-config bin/nautilus-actions-convert bin/nautilus-actions-new-config -lib/nautilus/extensions-1.0/libnautilus-actions.la -lib/nautilus/extensions-1.0/libnautilus-actions.so +lib/nautilus/extensions-2.0/libnautilus-actions.la +lib/nautilus/extensions-2.0/libnautilus-actions.so share/applications/nact.desktop share/icons/hicolor/16x16/apps/nautilus-actions.png share/icons/hicolor/22x22/apps/nautilus-actions.png +share/icons/hicolor/32x32/apps/nautilus-actions.png share/icons/hicolor/48x48/apps/nautilus-actions.png share/icons/hicolor/scalable/apps/nautilus-actions.svg +share/locale/ar/LC_MESSAGES/nautilus-actions.mo share/locale/bg/LC_MESSAGES/nautilus-actions.mo share/locale/bn/LC_MESSAGES/nautilus-actions.mo share/locale/ca/LC_MESSAGES/nautilus-actions.mo share/locale/cs/LC_MESSAGES/nautilus-actions.mo share/locale/da/LC_MESSAGES/nautilus-actions.mo share/locale/de/LC_MESSAGES/nautilus-actions.mo +share/locale/dz/LC_MESSAGES/nautilus-actions.mo share/locale/en_CA/LC_MESSAGES/nautilus-actions.mo +share/locale/en_GB/LC_MESSAGES/nautilus-actions.mo share/locale/es/LC_MESSAGES/nautilus-actions.mo share/locale/fi/LC_MESSAGES/nautilus-actions.mo share/locale/fr/LC_MESSAGES/nautilus-actions.mo @@ -39,3 +43,5 @@ share/nautilus-actions/nact/nautilus-actions-config.glade @dirrm share/nautilus-actions @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile index f93174e5114c..43eccc8f39c9 100644 --- a/deskutils/nautilus-locked-folder/Makefile +++ b/deskutils/nautilus-locked-folder/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.4 2006/07/18 12:22:24 ahze Exp $ +# $MCom: ports/deskutils/nautilus-locked-folder/Makefile,v 1.7 2008/03/18 15:20:20 ahze Exp $ # PORTNAME= nautilus-locked-folder PORTVERSION= 1.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils security MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav @@ -23,9 +23,9 @@ PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include `pkg-config --cflags ${PKGCONFIGS}`" \ LDFLASG="-L${LOCALBASE}/lib -L${X11BASE}/lib `pkg-config --libs ${PKGCONFIGS}`" \ LIBS="-lssl" -PLIST_FILES= lib/nautilus/extensions-1.0/libnautilus-locked-folder.a \ - lib/nautilus/extensions-1.0/libnautilus-locked-folder.la \ - lib/nautilus/extensions-1.0/libnautilus-locked-folder.so +PLIST_FILES= lib/nautilus/extensions-2.0/libnautilus-locked-folder.a \ + lib/nautilus/extensions-2.0/libnautilus-locked-folder.la \ + lib/nautilus/extensions-2.0/libnautilus-locked-folder.so post-patch: @${REINPLACE_CMD} -e 's|/usr/share/icons/hicolor/32x32/stock/data/|${LOCALBASE}/share/icons/hicolor/32x32/stock/data/|' \ diff --git a/deskutils/nautilus-locked-folder/files/patch-src_Makefile.in b/deskutils/nautilus-locked-folder/files/patch-src_Makefile.in new file mode 100644 index 000000000000..8e8f2e24a889 --- /dev/null +++ b/deskutils/nautilus-locked-folder/files/patch-src_Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2008-03-18 11:10:04.000000000 -0400 ++++ src/Makefile.in 2008-03-18 11:10:10.000000000 -0400 +@@ -229,7 +229,7 @@ + + + # FIXME: get this from the .pc file +-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0 ++nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0 + nautilus_extension_LTLIBRARIES = libnautilus-locked-folder.la + libnautilus_locked_folder_la_SOURCES = \ + encrypt.c decrypt.c lockedfolder-extension.c lockedfolder.h diff --git a/deskutils/nautilus-open-terminal/Makefile b/deskutils/nautilus-open-terminal/Makefile index 7ca2bd329d2a..8da39977b451 100644 --- a/deskutils/nautilus-open-terminal/Makefile +++ b/deskutils/nautilus-open-terminal/Makefile @@ -3,18 +3,18 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.9 2007/03/05 13:36:03 ahze Exp $ +# $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.12 2008/02/28 18:19:56 kwm Exp $ # PORTNAME= nautilus-open-terminal -PORTVERSION= 0.8 -PORTREVISION= 1 +PORTVERSION= 0.9 CATEGORIES= deskutils MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Nautilus extension which allows you to open a terminal +USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= nautilus2 gnomeprefix intlhack gnomehack @@ -23,5 +23,6 @@ USE_LDCONFIG= yes USE_XLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= nautilus-open-terminal.schemas .include <bsd.port.mk> diff --git a/deskutils/nautilus-open-terminal/distinfo b/deskutils/nautilus-open-terminal/distinfo index 2152a2b7089d..b5d08e55389d 100644 --- a/deskutils/nautilus-open-terminal/distinfo +++ b/deskutils/nautilus-open-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-open-terminal-0.8.tar.gz) = 4f335934935e2d53ebb893e7ad2bd9bd -SHA256 (nautilus-open-terminal-0.8.tar.gz) = 3650860cacdaa0f2e3f97f7aca2620fd50163d12aca40d2fb48ba7e7581e854d -SIZE (nautilus-open-terminal-0.8.tar.gz) = 365879 +MD5 (nautilus-open-terminal-0.9.tar.bz2) = b2dfbba5357524341157b00ea7a4291a +SHA256 (nautilus-open-terminal-0.9.tar.bz2) = c6fbcdf3248ab6a30cc8b9771acf703f2111872ae7ee2bad5a01f31efc4828b0 +SIZE (nautilus-open-terminal-0.9.tar.bz2) = 273099 diff --git a/deskutils/nautilus-open-terminal/pkg-plist b/deskutils/nautilus-open-terminal/pkg-plist index 897bd8ab2880..10c9d0d011bd 100644 --- a/deskutils/nautilus-open-terminal/pkg-plist +++ b/deskutils/nautilus-open-terminal/pkg-plist @@ -1,7 +1,8 @@ -lib/nautilus/extensions-1.0/libnautilus-open-terminal.a -lib/nautilus/extensions-1.0/libnautilus-open-terminal.la -lib/nautilus/extensions-1.0/libnautilus-open-terminal.so +lib/nautilus/extensions-2.0/libnautilus-open-terminal.a +lib/nautilus/extensions-2.0/libnautilus-open-terminal.la +lib/nautilus/extensions-2.0/libnautilus-open-terminal.so share/locale/ar/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/be@latin/LC_MESSAGES/nautilus-open-terminal.mo share/locale/be/LC_MESSAGES/nautilus-open-terminal.mo share/locale/bg/LC_MESSAGES/nautilus-open-terminal.mo share/locale/bn_IN/LC_MESSAGES/nautilus-open-terminal.mo @@ -10,6 +11,7 @@ share/locale/cs/LC_MESSAGES/nautilus-open-terminal.mo share/locale/da/LC_MESSAGES/nautilus-open-terminal.mo share/locale/de/LC_MESSAGES/nautilus-open-terminal.mo share/locale/dz/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/el/LC_MESSAGES/nautilus-open-terminal.mo share/locale/en_CA/LC_MESSAGES/nautilus-open-terminal.mo share/locale/en_GB/LC_MESSAGES/nautilus-open-terminal.mo share/locale/es/LC_MESSAGES/nautilus-open-terminal.mo @@ -23,16 +25,20 @@ share/locale/he/LC_MESSAGES/nautilus-open-terminal.mo share/locale/hu/LC_MESSAGES/nautilus-open-terminal.mo share/locale/it/LC_MESSAGES/nautilus-open-terminal.mo share/locale/ja/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/ka/LC_MESSAGES/nautilus-open-terminal.mo share/locale/ko/LC_MESSAGES/nautilus-open-terminal.mo share/locale/lt/LC_MESSAGES/nautilus-open-terminal.mo share/locale/mk/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/ml/LC_MESSAGES/nautilus-open-terminal.mo share/locale/nb/LC_MESSAGES/nautilus-open-terminal.mo share/locale/ne/LC_MESSAGES/nautilus-open-terminal.mo share/locale/nl/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/oc/LC_MESSAGES/nautilus-open-terminal.mo share/locale/or/LC_MESSAGES/nautilus-open-terminal.mo share/locale/pa/LC_MESSAGES/nautilus-open-terminal.mo share/locale/pl/LC_MESSAGES/nautilus-open-terminal.mo share/locale/pt_BR/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/pt/LC_MESSAGES/nautilus-open-terminal.mo share/locale/ro/LC_MESSAGES/nautilus-open-terminal.mo share/locale/ru/LC_MESSAGES/nautilus-open-terminal.mo share/locale/rw/LC_MESSAGES/nautilus-open-terminal.mo @@ -41,6 +47,7 @@ share/locale/sl/LC_MESSAGES/nautilus-open-terminal.mo share/locale/sr/LC_MESSAGES/nautilus-open-terminal.mo share/locale/sr@Latn/LC_MESSAGES/nautilus-open-terminal.mo share/locale/sv/LC_MESSAGES/nautilus-open-terminal.mo +share/locale/ta/LC_MESSAGES/nautilus-open-terminal.mo share/locale/th/LC_MESSAGES/nautilus-open-terminal.mo share/locale/tr/LC_MESSAGES/nautilus-open-terminal.mo share/locale/uk/LC_MESSAGES/nautilus-open-terminal.mo @@ -49,7 +56,11 @@ share/locale/zh_CN/LC_MESSAGES/nautilus-open-terminal.mo share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo @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 @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/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile index 00f6e59897fe..512b1a070cb6 100644 --- a/deskutils/nautilus-sendto/Makefile +++ b/deskutils/nautilus-sendto/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.13 2007/08/14 17:53:30 marcus Exp $ +# $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.16 2008/02/10 19:57:54 marcus Exp $ PORTNAME= nautilus-sendto -PORTVERSION= 0.12 -PORTREVISION= 1 +PORTVERSION= 0.13.2 CATEGORIES= deskutils MASTER_SITES= GNOME diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo index 9a1e3f3613c4..98fafc1a54fa 100644 --- a/deskutils/nautilus-sendto/distinfo +++ b/deskutils/nautilus-sendto/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-sendto-0.12.tar.bz2) = 9ec9a476be9a1c24ceddcfd76c6b3be2 -SHA256 (nautilus-sendto-0.12.tar.bz2) = e91af28d5473997836e85aa5eabb39e53f88fdc7cc535d2b0399afdaee1184ab -SIZE (nautilus-sendto-0.12.tar.bz2) = 336188 +MD5 (nautilus-sendto-0.13.2.tar.bz2) = 7e8a79e6e51e4bf96318aa8f9a37044b +SHA256 (nautilus-sendto-0.13.2.tar.bz2) = 1459ee5a7409fbe2ac32f27c38ff8359b8c104deec2ff41fc5aa245d5e3ef956 +SIZE (nautilus-sendto-0.13.2.tar.bz2) = 353248 diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist index 72c159a3c241..825ec9ce879b 100644 --- a/deskutils/nautilus-sendto/pkg-plist +++ b/deskutils/nautilus-sendto/pkg-plist @@ -7,12 +7,13 @@ lib/nautilus-sendto/plugins/libnstevolution.so %%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.so lib/nautilus-sendto/plugins/libnstsylpheed.la lib/nautilus-sendto/plugins/libnstsylpheed.so -lib/nautilus/extensions-1.0/libnautilus-sendto.la -lib/nautilus/extensions-1.0/libnautilus-sendto.so +lib/nautilus/extensions-2.0/libnautilus-sendto.la +lib/nautilus/extensions-2.0/libnautilus-sendto.so %%PIDGIN%%lib/pidgin/nautilus.la %%PIDGIN%%lib/pidgin/nautilus.so share/nautilus-sendto/glade/nautilus-sendto.glade share/locale/ar/LC_MESSAGES/nautilus-sendto.mo +share/locale/be@latin/LC_MESSAGES/nautilus-sendto.mo share/locale/be/LC_MESSAGES/nautilus-sendto.mo share/locale/bg/LC_MESSAGES/nautilus-sendto.mo share/locale/ca/LC_MESSAGES/nautilus-sendto.mo @@ -46,6 +47,7 @@ share/locale/pa/LC_MESSAGES/nautilus-sendto.mo share/locale/pl/LC_MESSAGES/nautilus-sendto.mo share/locale/pt/LC_MESSAGES/nautilus-sendto.mo share/locale/pt_BR/LC_MESSAGES/nautilus-sendto.mo +share/locale/ro/LC_MESSAGES/nautilus-sendto.mo share/locale/ru/LC_MESSAGES/nautilus-sendto.mo share/locale/rw/LC_MESSAGES/nautilus-sendto.mo share/locale/sk/LC_MESSAGES/nautilus-sendto.mo @@ -67,3 +69,5 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo @dirrmtry share/locale/oc @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile index 71edbd032d70..dec76cff9e7d 100644 --- a/deskutils/tomboy/Makefile +++ b/deskutils/tomboy/Makefile @@ -7,24 +7,23 @@ # PORTNAME= tomboy -PORTVERSION= 0.8.0 -PORTREVISION= 1 +PORTVERSION= 0.10.0 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= bsd-sharp-list@forge.novell.com COMMENT= Personal note taking system for the GNOME desktop LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell -BUILD_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp +BUILD_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp \ + ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib RUN_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp \ - dbus-daemon:${PORTSDIR}/devel/dbus + ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= gnomehack gnometarget intltool gnomeprefix gnomesharp20 +USE_GNOME= gnomehack gnometarget intlhack gnomeprefix gnomesharp20 GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_ICONS= yes @@ -48,6 +47,8 @@ post-patch: s|PANELAPPLET_SERVER_DIR="$$libdir|PANELAPPLET_SERVER_DIR="$$prefix/libdata|g; \ s|PANELAPPLET_SERVER_DIR="$$PANELAPPLET_LIBDIR|PANELAPPLET_SERVER_DIR="$$prefix/libdata|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} 's|/bin/bash|/bin/sh|g' \ + ${WRKSRC}/Tomboy/tomboy*.in .include "${.CURDIR}/../../lang/mono/bsd.mono.mk" .include <bsd.port.post.mk> diff --git a/deskutils/tomboy/distinfo b/deskutils/tomboy/distinfo index bca254995b37..e8c7afe20b01 100644 --- a/deskutils/tomboy/distinfo +++ b/deskutils/tomboy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/tomboy-0.8.0.tar.bz2) = b95c8ce7da7571583f33e80d25ac87e6 -SHA256 (gnome2/tomboy-0.8.0.tar.bz2) = 45cd1e66b699e3e021db3138aa11e7dc5fe9a05f20ccb290d3e04bb35fbbc958 -SIZE (gnome2/tomboy-0.8.0.tar.bz2) = 1863811 +MD5 (gnome2/tomboy-0.10.0.tar.bz2) = cf200d49beae64260b9e029b6dcc579a +SHA256 (gnome2/tomboy-0.10.0.tar.bz2) = 470a86ed40d24bc404ee07a6541c95245f96e281f78f448434378ab53d550960 +SIZE (gnome2/tomboy-0.10.0.tar.bz2) = 3283254 diff --git a/deskutils/tomboy/files/patch-Tomboy_Utils.cs b/deskutils/tomboy/files/patch-Tomboy_Utils.cs deleted file mode 100644 index 83f99b06e145..000000000000 --- a/deskutils/tomboy/files/patch-Tomboy_Utils.cs +++ /dev/null @@ -1,28 +0,0 @@ ---- Tomboy/Utils.cs.orig Sun Feb 25 02:24:01 2007 -+++ Tomboy/Utils.cs Mon Mar 26 20:06:25 2007 -@@ -801,23 +801,12 @@ - } - - [DllImport("libc")] -- private static extern int prctl (int option, -- byte [] arg2, -- IntPtr arg3, -- IntPtr arg4, -- IntPtr arg5); -+ private static extern void setproctitle(byte [] fmt, byte [] str_arg); - - // From Banshee: Banshee.Base/Utilities.cs - public static void SetProcessName (string name) - { -- if (prctl (15 /* PR_SET_NAME */, -- Encoding.ASCII.GetBytes (name + "\0"), -- IntPtr.Zero, -- IntPtr.Zero, -- IntPtr.Zero) != 0) -- throw new ApplicationException ( -- "Error setting process name: " + -- Mono.Unix.Native.Stdlib.GetLastError ()); -+ setproctitle(Encoding.ASCII.GetBytes("%s\0"), Encoding.ASCII.GetBytes(name + "\0")); - } - - static void RegisterSignalHandlers () diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist index 1bde9307f1a6..32c3ec54cba4 100644 --- a/deskutils/tomboy/pkg-plist +++ b/deskutils/tomboy/pkg-plist @@ -1,32 +1,38 @@ bin/tomboy bin/tomboy-panel +lib/tomboy/Mono.Addins.Gui.dll +lib/tomboy/Mono.Addins.Setup.dll +lib/tomboy/Mono.Addins.dll +lib/tomboy/Mono.Addins.dll.config +lib/tomboy/Tomboy.exe +lib/tomboy/Tomboy.exe.config lib/tomboy/addins/Backlinks.dll lib/tomboy/addins/Bugzilla.dll lib/tomboy/addins/Evolution.dll lib/tomboy/addins/ExportToHtml.dll lib/tomboy/addins/FileSystemSyncService.dll lib/tomboy/addins/FixedWidth.dll +lib/tomboy/addins/InsertTimestamp.dll lib/tomboy/addins/NoteOfTheDay.dll lib/tomboy/addins/PrintNotes.dll lib/tomboy/addins/SshSyncServiceAddin.dll lib/tomboy/addins/StickyNoteImport.dll lib/tomboy/addins/WebDavSyncService.dll -lib/tomboy/Mono.Addins.dll -lib/tomboy/Mono.Addins.dll.config -lib/tomboy/Mono.Addins.Setup.dll -lib/tomboy/Mono.Addins.Gui.dll -lib/tomboy/Tomboy.exe -lib/tomboy/Tomboy.exe.config lib/tomboy/libprintnotes.la lib/tomboy/libprintnotes.so lib/tomboy/libtomboy.la lib/tomboy/libtomboy.so libdata/bonobo/servers/GNOME_TomboyApplet.server libdata/pkgconfig/tomboy-addins.pc -share/dbus-1/services/org.gnome.Tomboy.service share/applications/tomboy.desktop -share/gnome/help/tomboy/C/legal.xml -share/gnome/help/tomboy/C/tomboy.xml +share/dbus-1/services/org.gnome.Tomboy.service +share/gnome/help/tomboy/C/figures/add-notebook-search.png +share/gnome/help/tomboy/C/figures/add-to-notebook.png +share/gnome/help/tomboy/C/figures/delete-notebook.png +share/gnome/help/tomboy/C/figures/move-notes-search.png +share/gnome/help/tomboy/C/figures/new-notebook.png +share/gnome/help/tomboy/C/figures/note-template.png +share/gnome/help/tomboy/C/figures/notebook-icon.png share/gnome/help/tomboy/C/figures/tomboy-main-menu.png share/gnome/help/tomboy/C/figures/tomboy-new-note.png share/gnome/help/tomboy/C/figures/tomboy-panel.png @@ -37,8 +43,15 @@ share/gnome/help/tomboy/C/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/C/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/C/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/C/figures/tomboy-tools.png -share/gnome/help/tomboy/ca/tomboy.xml -share/gnome/help/tomboy/ca/legal.xml +share/gnome/help/tomboy/C/legal.xml +share/gnome/help/tomboy/C/tomboy.xml +share/gnome/help/tomboy/ca/figures/add-notebook-search.png +share/gnome/help/tomboy/ca/figures/add-to-notebook.png +share/gnome/help/tomboy/ca/figures/delete-notebook.png +share/gnome/help/tomboy/ca/figures/move-notes-search.png +share/gnome/help/tomboy/ca/figures/new-notebook.png +share/gnome/help/tomboy/ca/figures/note-template.png +share/gnome/help/tomboy/ca/figures/notebook-icon.png share/gnome/help/tomboy/ca/figures/tomboy-main-menu.png share/gnome/help/tomboy/ca/figures/tomboy-new-note.png share/gnome/help/tomboy/ca/figures/tomboy-panel.png @@ -49,8 +62,34 @@ share/gnome/help/tomboy/ca/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/ca/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/ca/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/ca/figures/tomboy-tools.png -share/gnome/help/tomboy/en_GB/tomboy.xml -share/gnome/help/tomboy/en_GB/legal.xml +share/gnome/help/tomboy/ca/legal.xml +share/gnome/help/tomboy/ca/tomboy.xml +share/gnome/help/tomboy/de/figures/add-notebook-search.png +share/gnome/help/tomboy/de/figures/add-to-notebook.png +share/gnome/help/tomboy/de/figures/delete-notebook.png +share/gnome/help/tomboy/de/figures/move-notes-search.png +share/gnome/help/tomboy/de/figures/new-notebook.png +share/gnome/help/tomboy/de/figures/note-template.png +share/gnome/help/tomboy/de/figures/notebook-icon.png +share/gnome/help/tomboy/de/figures/tomboy-main-menu.png +share/gnome/help/tomboy/de/figures/tomboy-new-note.png +share/gnome/help/tomboy/de/figures/tomboy-panel.png +share/gnome/help/tomboy/de/figures/tomboy-pindown.png +share/gnome/help/tomboy/de/figures/tomboy-pinup.png +share/gnome/help/tomboy/de/figures/tomboy-preferences-add-ins.png +share/gnome/help/tomboy/de/figures/tomboy-preferences-editing.png +share/gnome/help/tomboy/de/figures/tomboy-preferences-hotkeys.png +share/gnome/help/tomboy/de/figures/tomboy-preferences-synchronization.png +share/gnome/help/tomboy/de/figures/tomboy-tools.png +share/gnome/help/tomboy/de/legal.xml +share/gnome/help/tomboy/de/tomboy.xml +share/gnome/help/tomboy/en_GB/figures/add-notebook-search.png +share/gnome/help/tomboy/en_GB/figures/add-to-notebook.png +share/gnome/help/tomboy/en_GB/figures/delete-notebook.png +share/gnome/help/tomboy/en_GB/figures/move-notes-search.png +share/gnome/help/tomboy/en_GB/figures/new-notebook.png +share/gnome/help/tomboy/en_GB/figures/note-template.png +share/gnome/help/tomboy/en_GB/figures/notebook-icon.png share/gnome/help/tomboy/en_GB/figures/tomboy-main-menu.png share/gnome/help/tomboy/en_GB/figures/tomboy-new-note.png share/gnome/help/tomboy/en_GB/figures/tomboy-panel.png @@ -61,8 +100,15 @@ share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/en_GB/figures/tomboy-tools.png -share/gnome/help/tomboy/es/tomboy.xml -share/gnome/help/tomboy/es/legal.xml +share/gnome/help/tomboy/en_GB/legal.xml +share/gnome/help/tomboy/en_GB/tomboy.xml +share/gnome/help/tomboy/es/figures/add-notebook-search.png +share/gnome/help/tomboy/es/figures/add-to-notebook.png +share/gnome/help/tomboy/es/figures/delete-notebook.png +share/gnome/help/tomboy/es/figures/move-notes-search.png +share/gnome/help/tomboy/es/figures/new-notebook.png +share/gnome/help/tomboy/es/figures/note-template.png +share/gnome/help/tomboy/es/figures/notebook-icon.png share/gnome/help/tomboy/es/figures/tomboy-main-menu.png share/gnome/help/tomboy/es/figures/tomboy-new-note.png share/gnome/help/tomboy/es/figures/tomboy-panel.png @@ -73,8 +119,15 @@ share/gnome/help/tomboy/es/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/es/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/es/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/es/figures/tomboy-tools.png -share/gnome/help/tomboy/fr/tomboy.xml -share/gnome/help/tomboy/fr/legal.xml +share/gnome/help/tomboy/es/legal.xml +share/gnome/help/tomboy/es/tomboy.xml +share/gnome/help/tomboy/fr/figures/add-notebook-search.png +share/gnome/help/tomboy/fr/figures/add-to-notebook.png +share/gnome/help/tomboy/fr/figures/delete-notebook.png +share/gnome/help/tomboy/fr/figures/move-notes-search.png +share/gnome/help/tomboy/fr/figures/new-notebook.png +share/gnome/help/tomboy/fr/figures/note-template.png +share/gnome/help/tomboy/fr/figures/notebook-icon.png share/gnome/help/tomboy/fr/figures/tomboy-main-menu.png share/gnome/help/tomboy/fr/figures/tomboy-new-note.png share/gnome/help/tomboy/fr/figures/tomboy-panel.png @@ -85,8 +138,15 @@ share/gnome/help/tomboy/fr/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/fr/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/fr/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/fr/figures/tomboy-tools.png -share/gnome/help/tomboy/oc/tomboy.xml -share/gnome/help/tomboy/oc/legal.xml +share/gnome/help/tomboy/fr/legal.xml +share/gnome/help/tomboy/fr/tomboy.xml +share/gnome/help/tomboy/oc/figures/add-notebook-search.png +share/gnome/help/tomboy/oc/figures/add-to-notebook.png +share/gnome/help/tomboy/oc/figures/delete-notebook.png +share/gnome/help/tomboy/oc/figures/move-notes-search.png +share/gnome/help/tomboy/oc/figures/new-notebook.png +share/gnome/help/tomboy/oc/figures/note-template.png +share/gnome/help/tomboy/oc/figures/notebook-icon.png share/gnome/help/tomboy/oc/figures/tomboy-main-menu.png share/gnome/help/tomboy/oc/figures/tomboy-new-note.png share/gnome/help/tomboy/oc/figures/tomboy-panel.png @@ -97,8 +157,15 @@ share/gnome/help/tomboy/oc/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/oc/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/oc/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/oc/figures/tomboy-tools.png -share/gnome/help/tomboy/pt_BR/tomboy.xml -share/gnome/help/tomboy/pt_BR/legal.xml +share/gnome/help/tomboy/oc/legal.xml +share/gnome/help/tomboy/oc/tomboy.xml +share/gnome/help/tomboy/pt_BR/figures/add-notebook-search.png +share/gnome/help/tomboy/pt_BR/figures/add-to-notebook.png +share/gnome/help/tomboy/pt_BR/figures/delete-notebook.png +share/gnome/help/tomboy/pt_BR/figures/move-notes-search.png +share/gnome/help/tomboy/pt_BR/figures/new-notebook.png +share/gnome/help/tomboy/pt_BR/figures/note-template.png +share/gnome/help/tomboy/pt_BR/figures/notebook-icon.png share/gnome/help/tomboy/pt_BR/figures/tomboy-main-menu.png share/gnome/help/tomboy/pt_BR/figures/tomboy-new-note.png share/gnome/help/tomboy/pt_BR/figures/tomboy-panel.png @@ -109,8 +176,15 @@ share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/pt_BR/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/pt_BR/figures/tomboy-tools.png -share/gnome/help/tomboy/ru/tomboy.xml -share/gnome/help/tomboy/ru/legal.xml +share/gnome/help/tomboy/pt_BR/legal.xml +share/gnome/help/tomboy/pt_BR/tomboy.xml +share/gnome/help/tomboy/ru/figures/add-notebook-search.png +share/gnome/help/tomboy/ru/figures/add-to-notebook.png +share/gnome/help/tomboy/ru/figures/delete-notebook.png +share/gnome/help/tomboy/ru/figures/move-notes-search.png +share/gnome/help/tomboy/ru/figures/new-notebook.png +share/gnome/help/tomboy/ru/figures/note-template.png +share/gnome/help/tomboy/ru/figures/notebook-icon.png share/gnome/help/tomboy/ru/figures/tomboy-main-menu.png share/gnome/help/tomboy/ru/figures/tomboy-new-note.png share/gnome/help/tomboy/ru/figures/tomboy-panel.png @@ -121,8 +195,15 @@ share/gnome/help/tomboy/ru/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/ru/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/ru/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/ru/figures/tomboy-tools.png -share/gnome/help/tomboy/sv/tomboy.xml -share/gnome/help/tomboy/sv/legal.xml +share/gnome/help/tomboy/ru/legal.xml +share/gnome/help/tomboy/ru/tomboy.xml +share/gnome/help/tomboy/sv/figures/add-notebook-search.png +share/gnome/help/tomboy/sv/figures/add-to-notebook.png +share/gnome/help/tomboy/sv/figures/delete-notebook.png +share/gnome/help/tomboy/sv/figures/move-notes-search.png +share/gnome/help/tomboy/sv/figures/new-notebook.png +share/gnome/help/tomboy/sv/figures/note-template.png +share/gnome/help/tomboy/sv/figures/notebook-icon.png share/gnome/help/tomboy/sv/figures/tomboy-main-menu.png share/gnome/help/tomboy/sv/figures/tomboy-new-note.png share/gnome/help/tomboy/sv/figures/tomboy-panel.png @@ -133,8 +214,15 @@ share/gnome/help/tomboy/sv/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/sv/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/sv/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/sv/figures/tomboy-tools.png -share/gnome/help/tomboy/uk/tomboy.xml -share/gnome/help/tomboy/uk/legal.xml +share/gnome/help/tomboy/sv/legal.xml +share/gnome/help/tomboy/sv/tomboy.xml +share/gnome/help/tomboy/uk/figures/add-notebook-search.png +share/gnome/help/tomboy/uk/figures/add-to-notebook.png +share/gnome/help/tomboy/uk/figures/delete-notebook.png +share/gnome/help/tomboy/uk/figures/move-notes-search.png +share/gnome/help/tomboy/uk/figures/new-notebook.png +share/gnome/help/tomboy/uk/figures/note-template.png +share/gnome/help/tomboy/uk/figures/notebook-icon.png share/gnome/help/tomboy/uk/figures/tomboy-main-menu.png share/gnome/help/tomboy/uk/figures/tomboy-new-note.png share/gnome/help/tomboy/uk/figures/tomboy-panel.png @@ -145,30 +233,18 @@ share/gnome/help/tomboy/uk/figures/tomboy-preferences-editing.png share/gnome/help/tomboy/uk/figures/tomboy-preferences-hotkeys.png share/gnome/help/tomboy/uk/figures/tomboy-preferences-synchronization.png share/gnome/help/tomboy/uk/figures/tomboy-tools.png -share/omf/tomboy/tomboy-C.omf -share/omf/tomboy/tomboy-ca.omf -share/omf/tomboy/tomboy-en_GB.omf -share/omf/tomboy/tomboy-es.omf -share/omf/tomboy/tomboy-fr.omf -share/omf/tomboy/tomboy-pt_BR.omf -share/omf/tomboy/tomboy-ru.omf -share/omf/tomboy/tomboy-oc.omf -share/omf/tomboy/tomboy-sv.omf -share/omf/tomboy/tomboy-uk.omf -share/pixmaps/tomboy.png -share/icons/hicolor/16x16/apps/tomboy-tag.png -share/icons/hicolor/16x16/apps/tomboy-note.png +share/gnome/help/tomboy/uk/legal.xml +share/gnome/help/tomboy/uk/tomboy.xml share/icons/hicolor/16x16/apps/tomboy.png -share/icons/hicolor/22x22/apps/tomboy-tag.png -share/icons/hicolor/22x22/apps/tomboy-note.png share/icons/hicolor/22x22/apps/tomboy.png -share/icons/hicolor/32x32/apps/tomboy-tag.png +share/icons/hicolor/24x24/apps/tomboy.png share/icons/hicolor/32x32/apps/tomboy.png share/icons/hicolor/48x48/apps/tomboy.png -share/icons/hicolor/scalable/apps/tomboy-tag.svg share/icons/hicolor/scalable/apps/tomboy.svg share/locale/ar/LC_MESSAGES/tomboy.mo +share/locale/as/LC_MESSAGES/tomboy.mo share/locale/be/LC_MESSAGES/tomboy.mo +share/locale/be@latin/LC_MESSAGES/tomboy.mo share/locale/bg/LC_MESSAGES/tomboy.mo share/locale/bn/LC_MESSAGES/tomboy.mo share/locale/bn_IN/LC_MESSAGES/tomboy.mo @@ -193,6 +269,7 @@ share/locale/hu/LC_MESSAGES/tomboy.mo share/locale/is/LC_MESSAGES/tomboy.mo share/locale/it/LC_MESSAGES/tomboy.mo share/locale/ja/LC_MESSAGES/tomboy.mo +share/locale/kn/LC_MESSAGES/tomboy.mo share/locale/ko/LC_MESSAGES/tomboy.mo share/locale/ku/LC_MESSAGES/tomboy.mo share/locale/lt/LC_MESSAGES/tomboy.mo @@ -202,8 +279,8 @@ share/locale/ml/LC_MESSAGES/tomboy.mo share/locale/nb/LC_MESSAGES/tomboy.mo share/locale/ne/LC_MESSAGES/tomboy.mo share/locale/nl/LC_MESSAGES/tomboy.mo -share/locale/or/LC_MESSAGES/tomboy.mo share/locale/oc/LC_MESSAGES/tomboy.mo +share/locale/or/LC_MESSAGES/tomboy.mo share/locale/pa/LC_MESSAGES/tomboy.mo share/locale/pl/LC_MESSAGES/tomboy.mo share/locale/pt/LC_MESSAGES/tomboy.mo @@ -211,12 +288,15 @@ share/locale/pt_BR/LC_MESSAGES/tomboy.mo share/locale/ro/LC_MESSAGES/tomboy.mo share/locale/ru/LC_MESSAGES/tomboy.mo share/locale/rw/LC_MESSAGES/tomboy.mo +share/locale/si/LC_MESSAGES/tomboy.mo +share/locale/sk/LC_MESSAGES/tomboy.mo share/locale/sl/LC_MESSAGES/tomboy.mo share/locale/sq/LC_MESSAGES/tomboy.mo share/locale/sr/LC_MESSAGES/tomboy.mo share/locale/sr@Latn/LC_MESSAGES/tomboy.mo share/locale/sv/LC_MESSAGES/tomboy.mo share/locale/ta/LC_MESSAGES/tomboy.mo +share/locale/te/LC_MESSAGES/tomboy.mo share/locale/th/LC_MESSAGES/tomboy.mo share/locale/tr/LC_MESSAGES/tomboy.mo share/locale/uk/LC_MESSAGES/tomboy.mo @@ -224,70 +304,99 @@ share/locale/vi/LC_MESSAGES/tomboy.mo share/locale/zh_CN/LC_MESSAGES/tomboy.mo share/locale/zh_HK/LC_MESSAGES/tomboy.mo share/locale/zh_TW/LC_MESSAGES/tomboy.mo -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW -@dirrmtry share/locale/zh_HK/LC_MESSAGES -@dirrmtry share/locale/zh_HK -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk -@dirrmtry share/locale/sr/LC_MESSAGES -@dirrmtry share/locale/sr -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/ro/LC_MESSAGES -@dirrmtry share/locale/ro -@dirrmtry share/locale/pt/LC_MESSAGES -@dirrmtry share/locale/pt -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl -@dirrmtry share/locale/ne/LC_MESSAGES -@dirrmtry share/locale/ne -@dirrmtry share/locale/ku/LC_MESSAGES -@dirrmtry share/locale/ku -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko -@dirrmtry share/locale/gl/LC_MESSAGES -@dirrmtry share/locale/gl -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/dz/LC_MESSAGES -@dirrmtry share/locale/dz -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca -@dirrmtry share/locale/bn_IN/LC_MESSAGES -@dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be +share/omf/tomboy/tomboy-C.omf +share/omf/tomboy/tomboy-ca.omf +share/omf/tomboy/tomboy-de.omf +share/omf/tomboy/tomboy-en_GB.omf +share/omf/tomboy/tomboy-es.omf +share/omf/tomboy/tomboy-fr.omf +share/omf/tomboy/tomboy-oc.omf +share/omf/tomboy/tomboy-pt_BR.omf +share/omf/tomboy/tomboy-ru.omf +share/omf/tomboy/tomboy-sv.omf +share/omf/tomboy/tomboy-uk.omf +%%DATADIR%%/icons/hicolor/16x16/actions/note-new.png +%%DATADIR%%/icons/hicolor/16x16/actions/notebook-new.png +%%DATADIR%%/icons/hicolor/16x16/places/note.png +%%DATADIR%%/icons/hicolor/16x16/places/notebook.png +%%DATADIR%%/icons/hicolor/16x16/status/pin-active.png +%%DATADIR%%/icons/hicolor/16x16/status/pin-down.png +%%DATADIR%%/icons/hicolor/16x16/status/pin-up.png +%%DATADIR%%/icons/hicolor/22x22/actions/filter-note-all.png +%%DATADIR%%/icons/hicolor/22x22/actions/filter-note-unfiled.png +%%DATADIR%%/icons/hicolor/22x22/actions/note-new.png +%%DATADIR%%/icons/hicolor/22x22/actions/notebook-new.png +%%DATADIR%%/icons/hicolor/22x22/places/note.png +%%DATADIR%%/icons/hicolor/22x22/places/notebook.png +%%DATADIR%%/icons/hicolor/24x24/actions/filter-note-all.png +%%DATADIR%%/icons/hicolor/24x24/actions/filter-note-unfiled.png +%%DATADIR%%/icons/hicolor/24x24/actions/note-new.png +%%DATADIR%%/icons/hicolor/24x24/actions/notebook-new.png +%%DATADIR%%/icons/hicolor/24x24/places/note.png +%%DATADIR%%/icons/hicolor/24x24/places/notebook.png +%%DATADIR%%/icons/hicolor/48x48/actions/notebook-new.png +%%DATADIR%%/icons/hicolor/scalable/actions/notebook-new.svg +@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/24x24/places +@dirrm %%DATADIR%%/icons/hicolor/24x24/actions +@dirrm %%DATADIR%%/icons/hicolor/24x24 +@dirrm %%DATADIR%%/icons/hicolor/22x22/places +@dirrm %%DATADIR%%/icons/hicolor/22x22/actions +@dirrm %%DATADIR%%/icons/hicolor/22x22 +@dirrm %%DATADIR%%/icons/hicolor/16x16/status +@dirrm %%DATADIR%%/icons/hicolor/16x16/places +@dirrm %%DATADIR%%/icons/hicolor/16x16/actions +@dirrm %%DATADIR%%/icons/hicolor/16x16 +@dirrm %%DATADIR%%/icons/hicolor +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%% @dirrm share/omf/tomboy @dirrm share/gnome/help/tomboy/uk/figures @dirrm share/gnome/help/tomboy/uk @dirrm share/gnome/help/tomboy/sv/figures @dirrm share/gnome/help/tomboy/sv +@dirrm share/gnome/help/tomboy/ru/figures +@dirrm share/gnome/help/tomboy/ru @dirrm share/gnome/help/tomboy/pt_BR/figures @dirrm share/gnome/help/tomboy/pt_BR @dirrm share/gnome/help/tomboy/oc/figures @dirrm share/gnome/help/tomboy/oc -@dirrm share/gnome/help/tomboy/ru/figures -@dirrm share/gnome/help/tomboy/ru @dirrm share/gnome/help/tomboy/fr/figures @dirrm share/gnome/help/tomboy/fr @dirrm share/gnome/help/tomboy/es/figures @dirrm share/gnome/help/tomboy/es @dirrm share/gnome/help/tomboy/en_GB/figures @dirrm share/gnome/help/tomboy/en_GB +@dirrm share/gnome/help/tomboy/de/figures +@dirrm share/gnome/help/tomboy/de @dirrm share/gnome/help/tomboy/ca/figures @dirrm share/gnome/help/tomboy/ca @dirrm share/gnome/help/tomboy/C/figures @dirrm share/gnome/help/tomboy/C @dirrm share/gnome/help/tomboy +@dirrmtry share/applications @dirrm lib/tomboy/addins @dirrm lib/tomboy -@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/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/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/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/devel/Makefile b/devel/Makefile index a5c3293887b3..ea282d8054f7 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -397,6 +397,7 @@ SUBDIR += getxml SUBDIR += gflags SUBDIR += gindent + SUBDIR += gio-fam-backend SUBDIR += git SUBDIR += glade2 SUBDIR += glade3 @@ -437,8 +438,10 @@ SUBDIR += gputils SUBDIR += gsoap SUBDIR += gstreamer-plugins-gconf + SUBDIR += gstreamer-plugins-gio SUBDIR += gstreamer-plugins-gnomevfs SUBDIR += gstreamer-plugins-sdl + SUBDIR += gstreamer-plugins-soup SUBDIR += gtgt SUBDIR += gtkmozedit SUBDIR += gtranslator @@ -447,6 +450,7 @@ SUBDIR += guile-lib SUBDIR += guiloader SUBDIR += guiloader-c++ + SUBDIR += gvfs SUBDIR += gwenhywfar SUBDIR += gzstream SUBDIR += hachoir-core @@ -672,6 +676,7 @@ SUBDIR += libslang2 SUBDIR += libsoup SUBDIR += libsoup-reference + SUBDIR += libsoup22 SUBDIR += libstatgrab SUBDIR += libstrfunc SUBDIR += libstroke @@ -805,6 +810,8 @@ SUBDIR += ncnf SUBDIR += ncurses SUBDIR += ncurses-devel + SUBDIR += ndesk-dbus + SUBDIR += ndesk-dbus-glib SUBDIR += netscape-java40 SUBDIR += newfile SUBDIR += newt diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index c23e51b27056..1240a20d580a 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -3,11 +3,11 @@ # Whom: Dmitry Sivachenko <demon@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/anjuta/Makefile,v 1.13 2007/09/07 05:03:33 marcus Exp $ +# $MCom: ports/devel/anjuta/Makefile,v 1.22 2008/03/11 03:52:48 marcus Exp $ # PORTNAME= anjuta -PORTVERSION= 2.2.3 +PORTVERSION= 2.4.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= anjuta @@ -21,6 +21,7 @@ BUILD_DEPENDS= autogen:${PORTSDIR}/devel/autogen \ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ gbf-1.1:${PORTSDIR}/devel/gnome-build \ gladeui-1.7:${PORTSDIR}/devel/glade3 \ + neon.26:${PORTSDIR}/www/neon \ devhelp-1.0:${PORTSDIR}/devel/devhelp RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ autogen:${PORTSDIR}/devel/autogen \ @@ -40,7 +41,16 @@ USE_GNOME= gnomeprefix gnomehack libgnomeprintui libgnomeui vte \ 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-message-manager-plugin.schemas \ + anjuta-editor-sourceview.schemas \ + anjuta-symbol-browser-plugin.schemas \ + anjuta-terminal-plugin.schemas anjuta.schemas MAN1= anjuta.1 anjuta_launcher.1 @@ -67,9 +77,11 @@ PLIST_SUB+= SVN="@comment " post-configure: @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash| ; \ s|/usr/local|${PREFIX}|' \ - ${WRKSRC}/global-tags/create_global_tags.sh + ${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 post-install: .if !defined(NOPORTDOCS) diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index 4e95bbfd1d49..d053c7a5db36 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,3 +1,3 @@ -MD5 (anjuta-2.2.3.tar.bz2) = d84b255b5ddb81a955b3ad1fc5ea8f9a -SHA256 (anjuta-2.2.3.tar.bz2) = c91fbc3c7b233d60d511eab025042dd73f43d1ea0e2b2d73d39d6479bb0320f9 -SIZE (anjuta-2.2.3.tar.bz2) = 5547518 +MD5 (anjuta-2.4.0.tar.bz2) = 5eca972ef7b95de85a8088eaf9cc0753 +SHA256 (anjuta-2.4.0.tar.bz2) = 5bc67461e5d263c4f4b05f9fc3eb27c599a38ee0fb1393b0f941090774c35e95 +SIZE (anjuta-2.4.0.tar.bz2) = 6257700 diff --git a/devel/anjuta/files/patch-global-tags_create_global_tags.sh b/devel/anjuta/files/patch-global-tags_create_global_tags.sh index 206e390c23bc..f542c83ea557 100644 --- a/devel/anjuta/files/patch-global-tags_create_global_tags.sh +++ b/devel/anjuta/files/patch-global-tags_create_global_tags.sh @@ -1,5 +1,5 @@ ---- global-tags/create_global_tags.sh.orig Sun Jul 8 03:39:26 2007 -+++ global-tags/create_global_tags.sh Sun Jul 8 03:41:12 2007 +--- global-tags/create_global_tags.sh.in.orig Sun Jul 8 03:39:26 2007 ++++ global-tags/create_global_tags.sh.in Sun Jul 8 03:41:12 2007 @@ -68,9 +68,9 @@ if ( [ ! -z $PKG_CONFIG ] && [ -x $PKG_C ## the packages, which we don't like. We only want cflags relevent ## to the packages alone. diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c index 73987d782cd5..1c7679ab2b95 100644 --- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c +++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c @@ -1,5 +1,5 @@ ---- libanjuta/anjuta-launcher.c.orig Mon Jun 11 13:22:08 2007 -+++ libanjuta/anjuta-launcher.c Sun Jul 8 03:39:07 2007 +--- 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> @@ -9,17 +9,17 @@ # include <pty.h> # else # include <libutil.h> -@@ -713,7 +713,8 @@ anjuta_launcher_scan_output (GIOChannel +@@ -749,7 +749,8 @@ anjuta_launcher_scan_output (GIOChannel GError *err = NULL; do { - g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + GIOStatus status; + status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0 && !err) /* There is output */ + if (n > 0) /* There is output */ { gchar *utf8_chars; -@@ -733,6 +734,13 @@ anjuta_launcher_scan_output (GIOChannel +@@ -776,6 +777,13 @@ anjuta_launcher_scan_output (GIOChannel anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -33,17 +33,17 @@ /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -762,7 +770,8 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -805,7 +813,8 @@ anjuta_launcher_scan_error (GIOChannel * GError *err = NULL; do { - g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + GIOStatus status; + status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0 && !err) /* There is stderr output */ + if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -782,6 +791,13 @@ anjuta_launcher_scan_error (GIOChannel * +@@ -833,6 +842,13 @@ anjuta_launcher_scan_error (GIOChannel * anjuta_launcher_synchronize (launcher); ret = FALSE; } @@ -57,24 +57,24 @@ /* Read next chars if buffer was too small * (the maximum length of one character is 6 bytes) */ } while (!err && (n > FILE_BUFFER_SIZE - 7)); -@@ -811,7 +827,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch +@@ -862,7 +878,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch GError *err = NULL; do { - g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); + GIOStatus status; + status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err); - if (n > 0 && !err) /* There is stderr output */ + if (n > 0) /* There is stderr output */ { gchar *utf8_chars; -@@ -833,6 +850,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch - else if (err && errno != EAGAIN && errno != EINTR) - { - g_warning (_("launcher.c: Error while reading child pty\n")); -+ ret = FALSE; -+ } -+ else if (status == G_IO_STATUS_EOF) -+ { +@@ -893,6 +910,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch + g_warning ("pty: %s", err->message); ret = FALSE; } ++ else if (status == G_IO_STATUS_EOF) ++ { ++ ret = FALSE; ++ } /* Read next chars if buffer was too small + * (the maximum length of one character is 6 bytes) */ + } while (!err && (n > FILE_BUFFER_SIZE - 7)); diff --git a/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c b/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c deleted file mode 100644 index 986d68057a05..000000000000 --- a/devel/anjuta/files/patch-plugins_document-manager_anjuta-docman.c +++ /dev/null @@ -1,69 +0,0 @@ ---- plugins/document-manager/anjuta-docman.c.orig Thu Jun 7 14:56:53 2007 -+++ plugins/document-manager/anjuta-docman.c Fri Aug 31 16:53:19 2007 -@@ -902,6 +902,7 @@ - const gchar *linenum; - glong lineno; - gboolean is_local_uri; -+ gchar normalized_path_buf[PATH_MAX]; - gchar *normalized_path = NULL; - - IAnjutaEditor *te; -@@ -926,9 +927,11 @@ - /* Get the normalized file path for comparision */ - is_local_uri = gnome_vfs_uri_is_local (vfs_uri); - if (is_local_uri) -- normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), NULL); -- if (normalized_path == NULL) -- normalized_path = g_strdup (uri); -+ normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), normalized_path_buf); -+ if (normalized_path == NULL) { -+ (void) strlcpy (normalized_path_buf, uri, PATH_MAX); -+ normalized_path = normalized_path_buf; -+ } - - gnome_vfs_uri_unref (vfs_uri); - /* g_free(filename); */ -@@ -942,6 +945,7 @@ - AnjutaDocmanPage *page; - gboolean te_is_local_uri; - gchar *te_uri; -+ char te_normalized_path_buf[PATH_MAX]; - gchar *te_normalized_path = NULL; - - page = (AnjutaDocmanPage *) node->data; -@@ -959,9 +963,11 @@ - te_is_local_uri = gnome_vfs_uri_is_local (vfs_uri); - if (te_is_local_uri) - te_normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), -- NULL); -- if (te_normalized_path == NULL) -- te_normalized_path = g_strdup (te_uri); -+ te_normalized_path_buf); -+ if (te_normalized_path == NULL) { -+ (void) strlcpy (te_normalized_path_buf, te_uri, PATH_MAX); -+ te_normalized_path = te_normalized_path_buf; -+ } - gnome_vfs_uri_unref (vfs_uri); - - if (strcmp (normalized_path, te_normalized_path) == 0) -@@ -982,12 +988,9 @@ - an_file_history_push (te_uri, lineno); - g_free (uri); - g_free (te_uri); -- g_free (normalized_path); -- g_free (te_normalized_path); - return te; - } - g_free (te_uri); -- g_free (te_normalized_path); - node = g_list_next (node); - } - te = anjuta_docman_add_editor (docman, uri, NULL); -@@ -1006,7 +1009,6 @@ - } - } - g_free (uri); -- g_free (normalized_path); - return te ; - } - diff --git a/devel/anjuta/files/patch-plugins_glade_pluginc.c b/devel/anjuta/files/patch-plugins_glade_pluginc.c deleted file mode 100644 index c2bd9847c4cd..000000000000 --- a/devel/anjuta/files/patch-plugins_glade_pluginc.c +++ /dev/null @@ -1,100 +0,0 @@ ---- plugins/glade/plugin.c.orig 2007-10-23 04:24:26.000000000 -0400 -+++ plugins/glade/plugin.c 2007-10-29 11:05:01.000000000 -0400 -@@ -20,7 +20,7 @@ - - #include <config.h> - --#if (GLADEUI_VERSION <= 302) -+#if (GLADEUI_VERSION <= 303) - # include <glade.h> - #else - # if (GLADEUI_VERSION <= 314) -@@ -54,7 +54,7 @@ struct _GladePluginPriv - GtkActionGroup *action_group; - GladeApp *gpw; - GtkWidget *inspector; --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - GtkWidget *design_notebook; - #endif - GtkWidget *view_box; -@@ -428,7 +428,7 @@ on_api_help (GladeEditor* editor, - static void - glade_do_close (GladePlugin *plugin, GladeProject *project) - { --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - GtkWidget *design_view; - - design_view = g_object_get_data (G_OBJECT (project), "design_view"); -@@ -506,14 +506,14 @@ on_glade_project_changed (GtkComboBox *c - { - GladeProject *project; - --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - GtkWidget *design_view; - gint design_pagenum; - #endif - gtk_tree_model_get (model, &iter, PROJECT_COL, &project, -1); - glade_app_set_project (project); - --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - design_view = g_object_get_data (G_OBJECT (project), "design_view"); - design_pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (plugin->priv->design_notebook), - design_view); -@@ -717,7 +717,7 @@ on_shell_destroy (AnjutaShell *shell, Gl - gtk_container_remove (GTK_CONTAINER (parent), wid); - } - --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - static void - glade_plugin_add_project (GladePlugin *glade_plugin, GladeProject *project) - { -@@ -800,7 +800,7 @@ activate_plugin (AnjutaPlugin *plugin) - g_object_unref (G_OBJECT (store)); - gtk_box_pack_start (GTK_BOX (priv->view_box), priv->projects_combo, - FALSE, FALSE, 0); --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - # if (GLADEUI_VERSION >= 330) - priv->inspector = glade_inspector_new (); - -@@ -829,7 +829,7 @@ activate_plugin (AnjutaPlugin *plugin) - gtk_notebook_popup_enable (GTK_NOTEBOOK (glade_app_get_editor ()->notebook)); - - --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - /* Create design_notebook */ - priv->design_notebook = gtk_notebook_new (); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->design_notebook), FALSE); -@@ -866,7 +866,7 @@ activate_plugin (AnjutaPlugin *plugin) - g_object_ref (glade_app_get_palette ()); - g_object_ref (glade_app_get_editor ()); - g_object_ref (priv->view_box); --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - g_object_ref (priv->design_notebook); - #endif - gtk_widget_show (GTK_WIDGET (glade_app_get_palette ())); -@@ -888,7 +888,7 @@ activate_plugin (AnjutaPlugin *plugin) - "AnjutaGladeEditor", _("Properties"), - "glade-plugin-icon", - ANJUTA_SHELL_PLACEMENT_CENTER, NULL); --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - anjuta_shell_add_widget (ANJUTA_PLUGIN (plugin)->shell, - GTK_WIDGET (priv->design_notebook), - "AnjutaGladeDesigner", _("Designer"), -@@ -939,7 +939,7 @@ deactivate_plugin (AnjutaPlugin *plugin) - anjuta_shell_remove_widget (plugin->shell, - GTK_WIDGET (priv->view_box), - NULL); --#if (GLADEUI_VERSION > 302) -+#if (GLADEUI_VERSION > 303) - anjuta_shell_remove_widget (plugin->shell, - GTK_WIDGET (priv->design_notebook), - NULL); diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist index ecc2d183247d..6b489f8ab7e2 100644 --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -1,16 +1,16 @@ bin/anjuta -bin/anjuta-shell bin/anjuta_import.sh bin/anjuta_launcher -include/libanjuta-1.0/libanjuta/anjuta-children.h +include/libanjuta-1.0/libanjuta/anjuta-async-command.h +include/libanjuta-1.0/libanjuta/anjuta-command.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-glue-factory.h -include/libanjuta-1.0/libanjuta/anjuta-glue-plugin.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-plugin-description.h +include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h include/libanjuta-1.0/libanjuta/anjuta-plugin.h include/libanjuta-1.0/libanjuta/anjuta-preferences-dialog.h @@ -24,14 +24,19 @@ include/libanjuta-1.0/libanjuta/anjuta-shell.h include/libanjuta-1.0/libanjuta/anjuta-status.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/interfaces/ianjuta-bookmark.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-buildable.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-cpu-debugger.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 +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-memory.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-register.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-variable.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document-manager.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-assist.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-autocomplete.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-cell-style.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-cell.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-comment.h @@ -42,6 +47,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-goto.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-hover.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-language.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-line-mode.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-search.h 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 @@ -55,12 +61,13 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-indicable.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable-tree.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language-support.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-loader.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-macro.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-markable.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-view.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-plugin-loader.h +include/libanjuta-1.0/libanjuta/interfaces/ianjuta-plugin-factory.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-preferences.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-print.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h @@ -71,7 +78,6 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-manager.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-terminal.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-todo.h -include/libanjuta-1.0/libanjuta/interfaces/ianjuta-variable-debugger.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-vcs.h include/libanjuta-1.0/libanjuta/interfaces/ianjuta-wizard.h include/libanjuta-1.0/libanjuta/interfaces/libanjuta-iface-marshallers.h @@ -87,7 +93,6 @@ lib/anjuta/anjuta-debug-manager.plugin lib/anjuta/anjuta-devhelp.plugin lib/anjuta/anjuta-document-manager.plugin lib/anjuta/anjuta-editor.plugin -lib/anjuta/anjuta-file-manager.plugin lib/anjuta/anjuta-file-wizard.plugin lib/anjuta/anjuta-gdb.plugin lib/anjuta/anjuta-glade.plugin @@ -106,6 +111,8 @@ lib/anjuta/anjuta-search.plugin lib/anjuta/anjuta-symbol-browser.plugin lib/anjuta/anjuta-terminal.plugin lib/anjuta/anjuta-tools.plugin +lib/anjuta/file-manager.plugin +lib/anjuta/language-manager.plugin lib/anjuta/libanjuta-build-basic-autotools.la lib/anjuta/libanjuta-build-basic-autotools.so lib/anjuta/libanjuta-class-gen.la @@ -122,8 +129,6 @@ lib/anjuta/libanjuta-document-manager.la lib/anjuta/libanjuta-document-manager.so lib/anjuta/libanjuta-editor.la lib/anjuta/libanjuta-editor.so -lib/anjuta/libanjuta-file-manager.la -lib/anjuta/libanjuta-file-manager.so lib/anjuta/libanjuta-file-wizard.la lib/anjuta/libanjuta-file-wizard.so lib/anjuta/libanjuta-gdb.la @@ -164,8 +169,16 @@ lib/anjuta/libanjuta-terminal.la lib/anjuta/libanjuta-terminal.so lib/anjuta/libanjuta-tools.la lib/anjuta/libanjuta-tools.so +lib/anjuta/libfile-manager.la +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 +lib/glade3/modules/libgladeanjuta.la +lib/glade3/modules/libgladeanjuta.so lib/libanjuta-ctags.la lib/libanjuta-ctags.so lib/libanjuta-ctags.so.0 @@ -176,116 +189,6 @@ lib/libanjuta.la lib/libanjuta.so lib/libanjuta.so.0 libdata/pkgconfig/libanjuta-1.0.pc -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/FUTURE -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html -%%PORTDOCS%%%%DOCSDIR%%/TODO -share/doc/libanjuta/AnjutaLauncher.html -share/doc/libanjuta/AnjutaPlugin.html -share/doc/libanjuta/AnjutaPluginHandle.html -share/doc/libanjuta/AnjutaPluginManager.html -share/doc/libanjuta/AnjutaPreferences.html -share/doc/libanjuta/AnjutaPreferencesDialog.html -share/doc/libanjuta/AnjutaProfile.html -share/doc/libanjuta/AnjutaProfileManager.html -share/doc/libanjuta/AnjutaSavePrompt.html -share/doc/libanjuta/AnjutaSerializer.html -share/doc/libanjuta/AnjutaSession.html -share/doc/libanjuta/AnjutaStatus.html -share/doc/libanjuta/AnjutaUI.html -share/doc/libanjuta/action-block.html -share/doc/libanjuta/anjuta-architecture.html -share/doc/libanjuta/anjuta-architecture.png -share/doc/libanjuta/content-block.html -share/doc/libanjuta/header-block.html -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-GluePlugin.html -share/doc/libanjuta/libanjuta-anjuta-children.html -share/doc/libanjuta/libanjuta-anjuta-debug.html -share/doc/libanjuta/libanjuta-anjuta-encodings.html -share/doc/libanjuta/libanjuta-anjuta-enum-types.html -share/doc/libanjuta/libanjuta-anjuta-marshal.html -share/doc/libanjuta/libanjuta-anjuta-plugin-description.html -share/doc/libanjuta/libanjuta-anjuta-shell.html -share/doc/libanjuta/libanjuta-anjuta-utils.html -share/doc/libanjuta/libanjuta-api.html -share/doc/libanjuta/libanjuta-glue-cpp.html -share/doc/libanjuta/libanjuta-glue-factory.html -share/doc/libanjuta/libanjuta-ianjuta-bookmark.html -share/doc/libanjuta/libanjuta-ianjuta-buildable.html -share/doc/libanjuta/libanjuta-ianjuta-cpu-debugger.html -share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html -share/doc/libanjuta/libanjuta-ianjuta-debugger.html -share/doc/libanjuta/libanjuta-ianjuta-document-manager.html -share/doc/libanjuta/libanjuta-ianjuta-editor-assist.html -share/doc/libanjuta/libanjuta-ianjuta-editor-cell-style.html -share/doc/libanjuta/libanjuta-ianjuta-editor-cell.html -share/doc/libanjuta/libanjuta-ianjuta-editor-comment.html -share/doc/libanjuta/libanjuta-ianjuta-editor-convert.html -share/doc/libanjuta/libanjuta-ianjuta-editor-factory.html -share/doc/libanjuta/libanjuta-ianjuta-editor-folds.html -share/doc/libanjuta/libanjuta-ianjuta-editor-goto.html -share/doc/libanjuta/libanjuta-ianjuta-editor-hover.html -share/doc/libanjuta/libanjuta-ianjuta-editor-language.html -share/doc/libanjuta/libanjuta-ianjuta-editor-line-mode.html -share/doc/libanjuta/libanjuta-ianjuta-editor-selection.html -share/doc/libanjuta/libanjuta-ianjuta-editor-view.html -share/doc/libanjuta/libanjuta-ianjuta-editor-zoom.html -share/doc/libanjuta/libanjuta-ianjuta-editor.html -share/doc/libanjuta/libanjuta-ianjuta-file-loader.html -share/doc/libanjuta/libanjuta-ianjuta-file-manager.html -share/doc/libanjuta/libanjuta-ianjuta-file-savable.html -share/doc/libanjuta/libanjuta-ianjuta-file.html -share/doc/libanjuta/libanjuta-ianjuta-help.html -share/doc/libanjuta/libanjuta-ianjuta-indicable.html -share/doc/libanjuta/libanjuta-ianjuta-iterable-tree.html -share/doc/libanjuta/libanjuta-ianjuta-iterable.html -share/doc/libanjuta/libanjuta-ianjuta-language-support.html -share/doc/libanjuta/libanjuta-ianjuta-loader.html -share/doc/libanjuta/libanjuta-ianjuta-macro.html -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-preferences.html -share/doc/libanjuta/libanjuta-ianjuta-print.html -share/doc/libanjuta/libanjuta-ianjuta-project-manager.html -share/doc/libanjuta/libanjuta-ianjuta-stream-loader.html -share/doc/libanjuta/libanjuta-ianjuta-stream-savable.html -share/doc/libanjuta/libanjuta-ianjuta-stream.html -share/doc/libanjuta/libanjuta-ianjuta-symbol-manager.html -share/doc/libanjuta/libanjuta-ianjuta-symbol.html -share/doc/libanjuta/libanjuta-ianjuta-terminal.html -share/doc/libanjuta/libanjuta-ianjuta-todo.html -share/doc/libanjuta/libanjuta-ianjuta-variable-debugger.html -share/doc/libanjuta/libanjuta-ianjuta-vcs.html -share/doc/libanjuta/libanjuta-ianjuta-wizard.html -share/doc/libanjuta/libanjuta-internal-api.html -share/doc/libanjuta/libanjuta-libanjuta-iface-marshallers.html -share/doc/libanjuta/libanjuta-resources.html -share/doc/libanjuta/libanjuta.devhelp -share/doc/libanjuta/libanjuta.devhelp2 -share/doc/libanjuta/object-hierarchy.html -share/doc/libanjuta/page-block.html -share/doc/libanjuta/plugin-description-file.html -share/doc/libanjuta/plugin-interfaces.html -share/doc/libanjuta/project-wizard-format.html -share/doc/libanjuta/right.png -share/doc/libanjuta/style.css -share/doc/libanjuta/up.png -share/doc/libanjuta/writing-plugins-build-setup.html -share/doc/libanjuta/writing-plugins-simple.html -share/doc/libanjuta/writing-plugins-sources.html -share/doc/libanjuta/writing-plugins.html share/anjuta/AUTHORS share/anjuta/anjuta_project.template share/anjuta/build/automake-c.filters @@ -299,7 +202,8 @@ 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-file-manager-plugin.glade +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-language-cpp-java.glade @@ -315,20 +219,19 @@ share/anjuta/glade/anjuta-tools.glade share/anjuta/glade/anjuta.glade share/anjuta/glade/applogo.png share/anjuta/glade/appwizard.png -share/anjuta/glade/editor.glade +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 share/anjuta/glade/profiler-function-call-tree.glade share/anjuta/glade/profiler.glade -share/anjuta/glade/sourceview.glade share/anjuta/glade/start-with-import.png share/anjuta/glade/start-with-open.png share/anjuta/glade/start-with-wizard.png share/anjuta/gtodo/gtodo.css share/anjuta/gtodo/gtodo.xsl -share/anjuta/indent_test.c +share/anjuta/languages.xml share/anjuta/layout.xml share/anjuta/macros.xml share/anjuta/profiles/default.profile @@ -495,7 +398,6 @@ share/anjuta/properties/vb.properties share/anjuta/properties/verilog.properties share/anjuta/properties/vhdl.properties share/anjuta/properties/yaml.properties -share/anjuta/scripts/anjuta-tags share/anjuta/scripts/create_global_tags.sh share/anjuta/tools/find-fixmes.pl share/anjuta/tools/prepare-changelog.pl @@ -507,7 +409,6 @@ 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-file-manager.ui share/anjuta/ui/anjuta-glade.ui share/anjuta/ui/anjuta-gtodo.ui share/anjuta/ui/anjuta-language-support-cpp-java.ui @@ -518,66 +419,168 @@ share/anjuta/ui/anjuta-patch.ui share/anjuta/ui/anjuta-project-manager.ui share/anjuta/ui/anjuta-sample.ui share/anjuta/ui/anjuta-search.ui -share/anjuta/ui/anjuta-shell.ui %%SVN%%share/anjuta/ui/anjuta-subversion.ui share/anjuta/ui/anjuta-symbol-browser-plugin.ui share/anjuta/ui/anjuta-tools.ui share/anjuta/ui/anjuta.ui +share/anjuta/ui/file-manager.ui share/anjuta/ui/profiler.ui share/anjuta/welcome.txt share/applications/anjuta.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/FUTURE +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html +%%PORTDOCS%%%%DOCSDIR%%/TODO +share/doc/libanjuta/AnjutaLauncher.html +share/doc/libanjuta/AnjutaPlugin.html +share/doc/libanjuta/AnjutaPluginHandle.html +share/doc/libanjuta/AnjutaPluginManager.html +share/doc/libanjuta/AnjutaPreferences.html +share/doc/libanjuta/AnjutaPreferencesDialog.html +share/doc/libanjuta/AnjutaProfile.html +share/doc/libanjuta/AnjutaProfileManager.html +share/doc/libanjuta/AnjutaSavePrompt.html +share/doc/libanjuta/AnjutaSerializer.html +share/doc/libanjuta/AnjutaSession.html +share/doc/libanjuta/AnjutaStatus.html +share/doc/libanjuta/AnjutaUI.html +share/doc/libanjuta/action-block.html +share/doc/libanjuta/anjuta-architecture.html +share/doc/libanjuta/anjuta-architecture.png +share/doc/libanjuta/content-block.html +share/doc/libanjuta/header-block.html +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-IAnjutaVariableDebugger.html +share/doc/libanjuta/libanjuta-anjuta-c-module.html +share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html +share/doc/libanjuta/libanjuta-anjuta-debug.html +share/doc/libanjuta/libanjuta-anjuta-encodings.html +share/doc/libanjuta/libanjuta-anjuta-enum-types.html +share/doc/libanjuta/libanjuta-anjuta-error.html +share/doc/libanjuta/libanjuta-anjuta-marshal.html +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-api.html +share/doc/libanjuta/libanjuta-ianjuta-bookmark.html +share/doc/libanjuta/libanjuta-ianjuta-buildable.html +share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html +share/doc/libanjuta/libanjuta-ianjuta-debugger-breakpoint.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 +share/doc/libanjuta/libanjuta-ianjuta-debugger-variable.html +share/doc/libanjuta/libanjuta-ianjuta-debugger.html +share/doc/libanjuta/libanjuta-ianjuta-document-manager.html +share/doc/libanjuta/libanjuta-ianjuta-document.html +share/doc/libanjuta/libanjuta-ianjuta-editor-assist.html +share/doc/libanjuta/libanjuta-ianjuta-editor-cell-style.html +share/doc/libanjuta/libanjuta-ianjuta-editor-cell.html +share/doc/libanjuta/libanjuta-ianjuta-editor-comment.html +share/doc/libanjuta/libanjuta-ianjuta-editor-convert.html +share/doc/libanjuta/libanjuta-ianjuta-editor-factory.html +share/doc/libanjuta/libanjuta-ianjuta-editor-folds.html +share/doc/libanjuta/libanjuta-ianjuta-editor-goto.html +share/doc/libanjuta/libanjuta-ianjuta-editor-hover.html +share/doc/libanjuta/libanjuta-ianjuta-editor-language.html +share/doc/libanjuta/libanjuta-ianjuta-editor-line-mode.html +share/doc/libanjuta/libanjuta-ianjuta-editor-search.html +share/doc/libanjuta/libanjuta-ianjuta-editor-selection.html +share/doc/libanjuta/libanjuta-ianjuta-editor-view.html +share/doc/libanjuta/libanjuta-ianjuta-editor-zoom.html +share/doc/libanjuta/libanjuta-ianjuta-editor.html +share/doc/libanjuta/libanjuta-ianjuta-file-loader.html +share/doc/libanjuta/libanjuta-ianjuta-file-manager.html +share/doc/libanjuta/libanjuta-ianjuta-file-savable.html +share/doc/libanjuta/libanjuta-ianjuta-file.html +share/doc/libanjuta/libanjuta-ianjuta-help.html +share/doc/libanjuta/libanjuta-ianjuta-indicable.html +share/doc/libanjuta/libanjuta-ianjuta-iterable-tree.html +share/doc/libanjuta/libanjuta-ianjuta-iterable.html +share/doc/libanjuta/libanjuta-ianjuta-language-support.html +share/doc/libanjuta/libanjuta-ianjuta-language.html +share/doc/libanjuta/libanjuta-ianjuta-loader.html +share/doc/libanjuta/libanjuta-ianjuta-macro.html +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 +share/doc/libanjuta/libanjuta-ianjuta-stream-loader.html +share/doc/libanjuta/libanjuta-ianjuta-stream-savable.html +share/doc/libanjuta/libanjuta-ianjuta-stream.html +share/doc/libanjuta/libanjuta-ianjuta-symbol-manager.html +share/doc/libanjuta/libanjuta-ianjuta-symbol.html +share/doc/libanjuta/libanjuta-ianjuta-terminal.html +share/doc/libanjuta/libanjuta-ianjuta-todo.html +share/doc/libanjuta/libanjuta-ianjuta-vcs.html +share/doc/libanjuta/libanjuta-ianjuta-wizard.html +share/doc/libanjuta/libanjuta-internal-api.html +share/doc/libanjuta/libanjuta-libanjuta-iface-marshallers.html +share/doc/libanjuta/libanjuta-resources.html +share/doc/libanjuta/libanjuta.devhelp +share/doc/libanjuta/libanjuta.devhelp2 +share/doc/libanjuta/object-hierarchy.html +share/doc/libanjuta/page-block.html +share/doc/libanjuta/plugin-description-file.html +share/doc/libanjuta/plugin-interfaces.html +share/doc/libanjuta/project-wizard-format.html +share/doc/libanjuta/right.png +share/doc/libanjuta/style.css +share/doc/libanjuta/up.png +share/doc/libanjuta/writing-plugins-build-setup.html +share/doc/libanjuta/writing-plugins-simple.html +share/doc/libanjuta/writing-plugins-sources.html +share/doc/libanjuta/writing-plugins.html +share/glade3/catalogs/anjuta-glade.xml 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/debugger.xml -share/gnome/help/anjuta-manual/C/figures/a2ps.png 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 -share/gnome/help/anjuta-manual/C/figures/brk_edit.png -share/gnome/help/anjuta-manual/C/figures/ccview.png -share/gnome/help/anjuta-manual/C/figures/ccview_class.png -share/gnome/help/anjuta-manual/C/figures/ccview_struct.png share/gnome/help/anjuta-manual/C/figures/configure_dlg.png -share/gnome/help/anjuta-manual/C/figures/defines.png -share/gnome/help/anjuta-manual/C/figures/devt_menu.png share/gnome/help/anjuta-manual/C/figures/display_macro.png -share/gnome/help/anjuta-manual/C/figures/doxygen.png share/gnome/help/anjuta-manual/C/figures/editor_guides.png share/gnome/help/anjuta-manual/C/figures/editor_margins.png share/gnome/help/anjuta-manual/C/figures/editor_markers.png -share/gnome/help/anjuta-manual/C/figures/evaluate.png share/gnome/help/anjuta-manual/C/figures/file_menu.png -share/gnome/help/anjuta-manual/C/figures/fileview.png -share/gnome/help/anjuta-manual/C/figures/frame.png -share/gnome/help/anjuta-manual/C/figures/includes.png share/gnome/help/anjuta-manual/C/figures/insert_text.png -share/gnome/help/anjuta-manual/C/figures/inspect.png share/gnome/help/anjuta-manual/C/figures/keyword_macro.png -share/gnome/help/anjuta-manual/C/figures/lib_paths.png -share/gnome/help/anjuta-manual/C/figures/libraries.png share/gnome/help/anjuta-manual/C/figures/local_variables.png -share/gnome/help/anjuta-manual/C/figures/mainwin.png -share/gnome/help/anjuta-manual/C/figures/menu_detached.png share/gnome/help/anjuta-manual/C/figures/menubar.png share/gnome/help/anjuta-manual/C/figures/message_win.png share/gnome/help/anjuta-manual/C/figures/new_file_wizard.png share/gnome/help/anjuta-manual/C/figures/open_file.png share/gnome/help/anjuta-manual/C/figures/open_file_multiple.png -share/gnome/help/anjuta-manual/C/figures/other_opts.png share/gnome/help/anjuta-manual/C/figures/prefs_print.png +share/gnome/help/anjuta-manual/C/figures/print_dlg.png share/gnome/help/anjuta-manual/C/figures/print_preview.png +share/gnome/help/anjuta-manual/C/figures/project-window.png share/gnome/help/anjuta-manual/C/figures/project_info.png -share/gnome/help/anjuta-manual/C/figures/project_win.png share/gnome/help/anjuta-manual/C/figures/registers.png share/gnome/help/anjuta-manual/C/figures/save_as_file.png share/gnome/help/anjuta-manual/C/figures/search_expr.png share/gnome/help/anjuta-manual/C/figures/search_expr_basic.png -share/gnome/help/anjuta-manual/C/figures/search_file_list.png share/gnome/help/anjuta-manual/C/figures/search_file_pattern.png share/gnome/help/anjuta-manual/C/figures/search_replace.png share/gnome/help/anjuta-manual/C/figures/search_setting.png @@ -585,19 +588,10 @@ share/gnome/help/anjuta-manual/C/figures/search_target.png share/gnome/help/anjuta-manual/C/figures/search_target_action.png share/gnome/help/anjuta-manual/C/figures/search_target_in.png share/gnome/help/anjuta-manual/C/figures/sharedlibs.png -share/gnome/help/anjuta-manual/C/figures/signal_mod.png share/gnome/help/anjuta-manual/C/figures/signals.png share/gnome/help/anjuta-manual/C/figures/stack.png -share/gnome/help/anjuta-manual/C/figures/supports.png share/gnome/help/anjuta-manual/C/figures/symbol_browser.png share/gnome/help/anjuta-manual/C/figures/tool-editor.png -share/gnome/help/anjuta-manual/C/figures/toolbar_browser.png -share/gnome/help/anjuta-manual/C/figures/toolbar_debug.png -share/gnome/help/anjuta-manual/C/figures/toolbar_main.png -share/gnome/help/anjuta-manual/C/figures/variable_tip.png -share/gnome/help/anjuta-manual/C/figures/warnings.png -share/gnome/help/anjuta-manual/C/figures/watch.png -share/gnome/help/anjuta-manual/C/figures/watch_add.png share/gnome/help/anjuta-manual/C/fileoperations.xml share/gnome/help/anjuta-manual/C/interface.xml share/gnome/help/anjuta-manual/C/introduction.xml @@ -607,11 +601,194 @@ share/gnome/help/anjuta-manual/C/preferences.xml share/gnome/help/anjuta-manual/C/projects.xml share/gnome/help/anjuta-manual/C/template.xml 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 +share/gnome/help/anjuta-manual/es/figures/configure_dlg.png +share/gnome/help/anjuta-manual/es/figures/display_macro.png +share/gnome/help/anjuta-manual/es/figures/editor_guides.png +share/gnome/help/anjuta-manual/es/figures/editor_margins.png +share/gnome/help/anjuta-manual/es/figures/editor_markers.png +share/gnome/help/anjuta-manual/es/figures/file_menu.png +share/gnome/help/anjuta-manual/es/figures/insert_text.png +share/gnome/help/anjuta-manual/es/figures/keyword_macro.png +share/gnome/help/anjuta-manual/es/figures/local_variables.png +share/gnome/help/anjuta-manual/es/figures/menubar.png +share/gnome/help/anjuta-manual/es/figures/message_win.png +share/gnome/help/anjuta-manual/es/figures/new_file_wizard.png +share/gnome/help/anjuta-manual/es/figures/open_file.png +share/gnome/help/anjuta-manual/es/figures/open_file_multiple.png +share/gnome/help/anjuta-manual/es/figures/prefs_print.png +share/gnome/help/anjuta-manual/es/figures/print_dlg.png +share/gnome/help/anjuta-manual/es/figures/print_preview.png +share/gnome/help/anjuta-manual/es/figures/project-window.png +share/gnome/help/anjuta-manual/es/figures/project_info.png +share/gnome/help/anjuta-manual/es/figures/registers.png +share/gnome/help/anjuta-manual/es/figures/save_as_file.png +share/gnome/help/anjuta-manual/es/figures/search_expr.png +share/gnome/help/anjuta-manual/es/figures/search_expr_basic.png +share/gnome/help/anjuta-manual/es/figures/search_file_pattern.png +share/gnome/help/anjuta-manual/es/figures/search_replace.png +share/gnome/help/anjuta-manual/es/figures/search_setting.png +share/gnome/help/anjuta-manual/es/figures/search_target.png +share/gnome/help/anjuta-manual/es/figures/search_target_action.png +share/gnome/help/anjuta-manual/es/figures/search_target_in.png +share/gnome/help/anjuta-manual/es/figures/sharedlibs.png +share/gnome/help/anjuta-manual/es/figures/signals.png +share/gnome/help/anjuta-manual/es/figures/stack.png +share/gnome/help/anjuta-manual/es/figures/symbol_browser.png +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 +share/gnome/help/anjuta-manual/oc/figures/configure_dlg.png +share/gnome/help/anjuta-manual/oc/figures/display_macro.png +share/gnome/help/anjuta-manual/oc/figures/editor_guides.png +share/gnome/help/anjuta-manual/oc/figures/editor_margins.png +share/gnome/help/anjuta-manual/oc/figures/editor_markers.png +share/gnome/help/anjuta-manual/oc/figures/file_menu.png +share/gnome/help/anjuta-manual/oc/figures/insert_text.png +share/gnome/help/anjuta-manual/oc/figures/keyword_macro.png +share/gnome/help/anjuta-manual/oc/figures/local_variables.png +share/gnome/help/anjuta-manual/oc/figures/menubar.png +share/gnome/help/anjuta-manual/oc/figures/message_win.png +share/gnome/help/anjuta-manual/oc/figures/new_file_wizard.png +share/gnome/help/anjuta-manual/oc/figures/open_file.png +share/gnome/help/anjuta-manual/oc/figures/open_file_multiple.png +share/gnome/help/anjuta-manual/oc/figures/prefs_print.png +share/gnome/help/anjuta-manual/oc/figures/print_dlg.png +share/gnome/help/anjuta-manual/oc/figures/print_preview.png +share/gnome/help/anjuta-manual/oc/figures/project-window.png +share/gnome/help/anjuta-manual/oc/figures/project_info.png +share/gnome/help/anjuta-manual/oc/figures/registers.png +share/gnome/help/anjuta-manual/oc/figures/save_as_file.png +share/gnome/help/anjuta-manual/oc/figures/search_expr.png +share/gnome/help/anjuta-manual/oc/figures/search_expr_basic.png +share/gnome/help/anjuta-manual/oc/figures/search_file_pattern.png +share/gnome/help/anjuta-manual/oc/figures/search_replace.png +share/gnome/help/anjuta-manual/oc/figures/search_setting.png +share/gnome/help/anjuta-manual/oc/figures/search_target.png +share/gnome/help/anjuta-manual/oc/figures/search_target_action.png +share/gnome/help/anjuta-manual/oc/figures/search_target_in.png +share/gnome/help/anjuta-manual/oc/figures/sharedlibs.png +share/gnome/help/anjuta-manual/oc/figures/signals.png +share/gnome/help/anjuta-manual/oc/figures/stack.png +share/gnome/help/anjuta-manual/oc/figures/symbol_browser.png +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 +share/gnome/help/anjuta-manual/sv/figures/configure_dlg.png +share/gnome/help/anjuta-manual/sv/figures/display_macro.png +share/gnome/help/anjuta-manual/sv/figures/editor_guides.png +share/gnome/help/anjuta-manual/sv/figures/editor_margins.png +share/gnome/help/anjuta-manual/sv/figures/editor_markers.png +share/gnome/help/anjuta-manual/sv/figures/file_menu.png +share/gnome/help/anjuta-manual/sv/figures/insert_text.png +share/gnome/help/anjuta-manual/sv/figures/keyword_macro.png +share/gnome/help/anjuta-manual/sv/figures/local_variables.png +share/gnome/help/anjuta-manual/sv/figures/menubar.png +share/gnome/help/anjuta-manual/sv/figures/message_win.png +share/gnome/help/anjuta-manual/sv/figures/new_file_wizard.png +share/gnome/help/anjuta-manual/sv/figures/open_file.png +share/gnome/help/anjuta-manual/sv/figures/open_file_multiple.png +share/gnome/help/anjuta-manual/sv/figures/prefs_print.png +share/gnome/help/anjuta-manual/sv/figures/print_dlg.png +share/gnome/help/anjuta-manual/sv/figures/print_preview.png +share/gnome/help/anjuta-manual/sv/figures/project-window.png +share/gnome/help/anjuta-manual/sv/figures/project_info.png +share/gnome/help/anjuta-manual/sv/figures/registers.png +share/gnome/help/anjuta-manual/sv/figures/save_as_file.png +share/gnome/help/anjuta-manual/sv/figures/search_expr.png +share/gnome/help/anjuta-manual/sv/figures/search_expr_basic.png +share/gnome/help/anjuta-manual/sv/figures/search_file_pattern.png +share/gnome/help/anjuta-manual/sv/figures/search_replace.png +share/gnome/help/anjuta-manual/sv/figures/search_setting.png +share/gnome/help/anjuta-manual/sv/figures/search_target.png +share/gnome/help/anjuta-manual/sv/figures/search_target_action.png +share/gnome/help/anjuta-manual/sv/figures/search_target_in.png +share/gnome/help/anjuta-manual/sv/figures/sharedlibs.png +share/gnome/help/anjuta-manual/sv/figures/signals.png +share/gnome/help/anjuta-manual/sv/figures/stack.png +share/gnome/help/anjuta-manual/sv/figures/symbol_browser.png +share/gnome/help/anjuta-manual/sv/figures/tool-editor.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-anjuta.png share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-anjuta.svg +share/icons/hicolor/48x48/apps/anjuta.png +share/icons/hicolor/scalable/apps/anjuta.svg +share/locale/ar/LC_MESSAGES/anjuta.mo +share/locale/az/LC_MESSAGES/anjuta.mo +share/locale/be/LC_MESSAGES/anjuta.mo +share/locale/be@latin/LC_MESSAGES/anjuta.mo +share/locale/bg/LC_MESSAGES/anjuta.mo +share/locale/ca/LC_MESSAGES/anjuta.mo +share/locale/cs/LC_MESSAGES/anjuta.mo +share/locale/da/LC_MESSAGES/anjuta.mo +share/locale/de/LC_MESSAGES/anjuta.mo +share/locale/dz/LC_MESSAGES/anjuta.mo +share/locale/el/LC_MESSAGES/anjuta.mo +share/locale/en_CA/LC_MESSAGES/anjuta.mo +share/locale/en_GB/LC_MESSAGES/anjuta.mo +share/locale/es/LC_MESSAGES/anjuta.mo +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/hi/LC_MESSAGES/anjuta.mo +share/locale/hr/LC_MESSAGES/anjuta.mo +share/locale/hu/LC_MESSAGES/anjuta.mo +share/locale/id/LC_MESSAGES/anjuta.mo +share/locale/it/LC_MESSAGES/anjuta.mo +share/locale/ja/LC_MESSAGES/anjuta.mo +share/locale/kn/LC_MESSAGES/anjuta.mo +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/ms/LC_MESSAGES/anjuta.mo +share/locale/nb/LC_MESSAGES/anjuta.mo +share/locale/ne/LC_MESSAGES/anjuta.mo +share/locale/nl/LC_MESSAGES/anjuta.mo +share/locale/oc/LC_MESSAGES/anjuta.mo +share/locale/pa/LC_MESSAGES/anjuta.mo +share/locale/pl/LC_MESSAGES/anjuta.mo +share/locale/pt/LC_MESSAGES/anjuta.mo +share/locale/pt_BR/LC_MESSAGES/anjuta.mo +share/locale/ru/LC_MESSAGES/anjuta.mo +share/locale/rw/LC_MESSAGES/anjuta.mo +share/locale/si/LC_MESSAGES/anjuta.mo +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/sv/LC_MESSAGES/anjuta.mo +share/locale/tr/LC_MESSAGES/anjuta.mo +share/locale/uk/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 +share/mime/application/x-anjuta.xml +share/mime/packages/anjuta.xml 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 @@ -637,6 +814,7 @@ 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 @@ -647,146 +825,164 @@ 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/anjuta-build-basic-autotools-plugin.png -share/pixmaps/anjuta/anjuta-cvs-plugin.png -share/pixmaps/anjuta/anjuta-debug-manager.plugin.png -share/pixmaps/anjuta/anjuta-devhelp-plugin.png -share/pixmaps/anjuta/anjuta-document-manager.png -share/pixmaps/anjuta/anjuta-editor.png -share/pixmaps/anjuta/anjuta-file-manager-plugin.png +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 +share/pixmaps/anjuta/anjuta-block-end-24.png +share/pixmaps/anjuta/anjuta-block-select-16.png +share/pixmaps/anjuta/anjuta-block-select-24.png +share/pixmaps/anjuta/anjuta-block-start-16.png +share/pixmaps/anjuta/anjuta-block-start-24.png +share/pixmaps/anjuta/anjuta-bookmark-16.png +share/pixmaps/anjuta/anjuta-bookmark-clear-16.png +share/pixmaps/anjuta/anjuta-bookmark-clear-24.png +share/pixmaps/anjuta/anjuta-bookmark-first-16.png +share/pixmaps/anjuta/anjuta-bookmark-first-24.png +share/pixmaps/anjuta/anjuta-bookmark-last-16.png +share/pixmaps/anjuta/anjuta-bookmark-last-24.png +share/pixmaps/anjuta/anjuta-bookmark-next-16.png +share/pixmaps/anjuta/anjuta-bookmark-next-24.png +share/pixmaps/anjuta/anjuta-bookmark-prev-16.png +share/pixmaps/anjuta/anjuta-bookmark-prev-24.png +share/pixmaps/anjuta/anjuta-bookmark-toggle-16.png +share/pixmaps/anjuta/anjuta-bookmark-toggle-24.png +share/pixmaps/anjuta/anjuta-breakpoint-clear-16.png +share/pixmaps/anjuta/anjuta-breakpoint-clear-24.png +share/pixmaps/anjuta/anjuta-breakpoint-disabled-16.png +share/pixmaps/anjuta/anjuta-breakpoint-enabled-16.png +share/pixmaps/anjuta/anjuta-breakpoint-toggle-16.png +share/pixmaps/anjuta/anjuta-breakpoint-toggle-24.png +share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin-48.png +share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.svg +share/pixmaps/anjuta/anjuta-class-inheritance-plugin-48.png +share/pixmaps/anjuta/anjuta-class-inheritance-plugin.svg +share/pixmaps/anjuta/anjuta-complete-16.png +share/pixmaps/anjuta/anjuta-complete-24.png +share/pixmaps/anjuta/anjuta-complete-auto-16.png +share/pixmaps/anjuta/anjuta-complete-auto-24.png +share/pixmaps/anjuta/anjuta-cvs-plugin-48.png +share/pixmaps/anjuta/anjuta-cvs-plugin.svg +share/pixmaps/anjuta/anjuta-debug-manager-plugin-48.png +share/pixmaps/anjuta/anjuta-debug-manager-plugin.svg +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 +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 share/pixmaps/anjuta/anjuta-file-wizard-plugin.png +share/pixmaps/anjuta/anjuta-fold-close-16.png +share/pixmaps/anjuta/anjuta-fold-close-24.png +share/pixmaps/anjuta/anjuta-fold-open-16.png +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-glade-plugin.png -share/pixmaps/anjuta/anjuta-gtodo-plugin.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 +share/pixmaps/anjuta/anjuta-go-help-next-24.png +share/pixmaps/anjuta/anjuta-go-help-prev-16.png +share/pixmaps/anjuta/anjuta-go-help-prev-24.png +share/pixmaps/anjuta/anjuta-go-history-next-16.png +share/pixmaps/anjuta/anjuta-go-history-next-24.png +share/pixmaps/anjuta/anjuta-go-history-prev-16.png +share/pixmaps/anjuta/anjuta-go-history-prev-24.png +share/pixmaps/anjuta/anjuta-go-line-16.png +share/pixmaps/anjuta/anjuta-go-line-24.png +share/pixmaps/anjuta/anjuta-go-match-next-16.png +share/pixmaps/anjuta/anjuta-go-match-next-24.png +share/pixmaps/anjuta/anjuta-go-match-prev-16.png +share/pixmaps/anjuta/anjuta-go-match-prev-24.png +share/pixmaps/anjuta/anjuta-go-message-next-16.png +share/pixmaps/anjuta/anjuta-go-message-next-24.png +share/pixmaps/anjuta/anjuta-go-message-prev-16.png +share/pixmaps/anjuta/anjuta-go-message-prev-24.png +share/pixmaps/anjuta/anjuta-gtodo-plugin-48.png +share/pixmaps/anjuta/anjuta-gtodo-plugin.svg +share/pixmaps/anjuta/anjuta-indent-auto-16.png +share/pixmaps/anjuta/anjuta-indent-auto-24.png +share/pixmaps/anjuta/anjuta-indent-less-16.png +share/pixmaps/anjuta/anjuta-indent-less-24.png +share/pixmaps/anjuta/anjuta-indent-more-16.png +share/pixmaps/anjuta/anjuta-indent-more-24.png share/pixmaps/anjuta/anjuta-language-cpp-java-plugin.png -share/pixmaps/anjuta/anjuta-loader-plugin.png +share/pixmaps/anjuta/anjuta-language-manager-plugin-48.png +share/pixmaps/anjuta/anjuta-language-manager-plugin.svg +share/pixmaps/anjuta/anjuta-linemark-16.png +share/pixmaps/anjuta/anjuta-loader-plugin-48.png +share/pixmaps/anjuta/anjuta-loader-plugin.svg share/pixmaps/anjuta/anjuta-macro.png -share/pixmaps/anjuta/anjuta-message-view.png -share/pixmaps/anjuta/anjuta-patch-plugin.png -share/pixmaps/anjuta/anjuta-project-import-plugin.png -share/pixmaps/anjuta/anjuta-project-manager-plugin.png -share/pixmaps/anjuta/anjuta-project-wizard-plugin.png -share/pixmaps/anjuta/anjuta-sample-plugin.png -share/pixmaps/anjuta/anjuta-search.png -%%SVN%%share/pixmaps/anjuta/anjuta-subversion.png -share/pixmaps/anjuta/anjuta-symbol-browser-plugin.png -share/pixmaps/anjuta/anjuta-terminal-plugin.png -share/pixmaps/anjuta/anjuta-tools-plugin.png +share/pixmaps/anjuta/anjuta-messages-plugin-48.png +share/pixmaps/anjuta/anjuta-messages-plugin.svg +share/pixmaps/anjuta/anjuta-patch-plugin-48.png +share/pixmaps/anjuta/anjuta-patch-plugin.svg +share/pixmaps/anjuta/anjuta-pcmark-16.png +share/pixmaps/anjuta/anjuta-preferences-general-48.png +share/pixmaps/anjuta/anjuta-preferences-general.svg +share/pixmaps/anjuta/anjuta-profiler-plugin-48.png +share/pixmaps/anjuta/anjuta-profiler-plugin.svg +share/pixmaps/anjuta/anjuta-project-import-plugin-48.png +share/pixmaps/anjuta/anjuta-project-import-plugin.svg +share/pixmaps/anjuta/anjuta-project-manager-plugin-48.png +share/pixmaps/anjuta/anjuta-project-manager-plugin.svg +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-sample-plugin-48.png +share/pixmaps/anjuta/anjuta-sample-plugin.svg +share/pixmaps/anjuta/anjuta-search-plugin-48.png +share/pixmaps/anjuta/anjuta-search-plugin.svg +share/pixmaps/anjuta/anjuta-step-into-16.png +share/pixmaps/anjuta/anjuta-step-into-24.png +share/pixmaps/anjuta/anjuta-step-out-16.png +share/pixmaps/anjuta/anjuta-step-out-24.png +share/pixmaps/anjuta/anjuta-step-over-16.png +share/pixmaps/anjuta/anjuta-step-over-24.png +%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin-48.png +%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin.svg +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 +share/pixmaps/anjuta/anjuta-terminal-plugin-48.png +share/pixmaps/anjuta/anjuta-terminal-plugin.svg +share/pixmaps/anjuta/anjuta-tools-plugin-48.png +share/pixmaps/anjuta/anjuta-tools-plugin.svg +share/pixmaps/anjuta/anjuta-watch-16.png +share/pixmaps/anjuta/anjuta-watch-24.png +share/pixmaps/anjuta/anjuta-watch.svg share/pixmaps/anjuta/anjuta.png +share/pixmaps/anjuta/anjuta.svg share/pixmaps/anjuta/anjuta_logo.png share/pixmaps/anjuta/anjuta_splash.png -share/pixmaps/anjuta/autocomplete-16.png -share/pixmaps/anjuta/autocomplete.png -share/pixmaps/anjuta/block-end-16.png -share/pixmaps/anjuta/block-end.png -share/pixmaps/anjuta/block-start-16.png -share/pixmaps/anjuta/block-start.png -share/pixmaps/anjuta/block_select.xpm -share/pixmaps/anjuta/bookmark-clear.png -share/pixmaps/anjuta/bookmark-first.png -share/pixmaps/anjuta/bookmark-last.png -share/pixmaps/anjuta/bookmark-next.png -share/pixmaps/anjuta/bookmark-prev.png -share/pixmaps/anjuta/bookmark-toggle.png -share/pixmaps/anjuta/bookmark.png -share/pixmaps/anjuta/breakpoint-disabled.png -share/pixmaps/anjuta/breakpoint-enabled.png share/pixmaps/anjuta/breakpoint.png -share/pixmaps/anjuta/class-inheritance.png share/pixmaps/anjuta/class_logo.xpm -share/pixmaps/anjuta/detach-16.png -share/pixmaps/anjuta/detach.png share/pixmaps/anjuta/directory-accept.png share/pixmaps/anjuta/directory.png -share/pixmaps/anjuta/error-next-16.png -share/pixmaps/anjuta/error-next.png -share/pixmaps/anjuta/error-prev-16.png -share/pixmaps/anjuta/error-prev.png -share/pixmaps/anjuta/fold_close.xpm -share/pixmaps/anjuta/fold_open.xpm -share/pixmaps/anjuta/fold_toggle.xpm share/pixmaps/anjuta/gtodo-about.png share/pixmaps/anjuta/gtodo-edit.png -share/pixmaps/anjuta/gtodo.png share/pixmaps/anjuta/gtodo_tray.png -share/pixmaps/anjuta/indent.xpm -share/pixmaps/anjuta/indent_auto.xpm -share/pixmaps/anjuta/indent_dcr.xpm -share/pixmaps/anjuta/indent_inc.xpm -share/pixmaps/anjuta/indent_set.xpm -share/pixmaps/anjuta/linemarker.png share/pixmaps/anjuta/locals.png -share/pixmaps/anjuta/messages.xpm +share/pixmaps/anjuta/madeinanjuta.xcf share/pixmaps/anjuta/password.png share/pixmaps/anjuta/pointer.png share/pixmaps/anjuta/preferences-editor.png -share/pixmaps/anjuta/preferences-general.png -share/pixmaps/anjuta/preferences-messages.png -share/pixmaps/anjuta/preferences-terminal.png -share/pixmaps/anjuta/profiler.png -share/pixmaps/anjuta/program-counter.png -share/pixmaps/anjuta/run-to-cursor.png -share/pixmaps/anjuta/sourceview.png share/pixmaps/anjuta/stack.png -share/pixmaps/anjuta/step-into-16.png -share/pixmaps/anjuta/step-into.png -share/pixmaps/anjuta/step-out-16.png -share/pixmaps/anjuta/step-out.png -share/pixmaps/anjuta/step-over-16.png -share/pixmaps/anjuta/step-over.png -share/pixmaps/anjuta/swap.png -share/pixmaps/anjuta/watch.png -share/icons/hicolor/48x48/apps/anjuta.png -share/icons/hicolor/scalable/apps/anjuta.svg -share/locale/ar/LC_MESSAGES/anjuta.mo -share/locale/az/LC_MESSAGES/anjuta.mo -share/locale/be/LC_MESSAGES/anjuta.mo -share/locale/bg/LC_MESSAGES/anjuta.mo -share/locale/ca/LC_MESSAGES/anjuta.mo -share/locale/cs/LC_MESSAGES/anjuta.mo -share/locale/da/LC_MESSAGES/anjuta.mo -share/locale/de/LC_MESSAGES/anjuta.mo -share/locale/dz/LC_MESSAGES/anjuta.mo -share/locale/el/LC_MESSAGES/anjuta.mo -share/locale/en_CA/LC_MESSAGES/anjuta.mo -share/locale/en_GB/LC_MESSAGES/anjuta.mo -share/locale/es/LC_MESSAGES/anjuta.mo -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/hi/LC_MESSAGES/anjuta.mo -share/locale/hr/LC_MESSAGES/anjuta.mo -share/locale/hu/LC_MESSAGES/anjuta.mo -share/locale/it/LC_MESSAGES/anjuta.mo -share/locale/ja/LC_MESSAGES/anjuta.mo -share/locale/ko/LC_MESSAGES/anjuta.mo -share/locale/mk/LC_MESSAGES/anjuta.mo -share/locale/ml/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 -share/locale/nl/LC_MESSAGES/anjuta.mo -share/locale/oc/LC_MESSAGES/anjuta.mo -share/locale/pa/LC_MESSAGES/anjuta.mo -share/locale/pl/LC_MESSAGES/anjuta.mo -share/locale/pt/LC_MESSAGES/anjuta.mo -share/locale/pt_BR/LC_MESSAGES/anjuta.mo -share/locale/ru/LC_MESSAGES/anjuta.mo -share/locale/rw/LC_MESSAGES/anjuta.mo -share/locale/sk/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/sv/LC_MESSAGES/anjuta.mo -share/locale/tr/LC_MESSAGES/anjuta.mo -share/locale/uk/LC_MESSAGES/anjuta.mo -share/locale/zh_CN/LC_MESSAGES/anjuta.mo -share/locale/zh_TW/LC_MESSAGES/anjuta.mo -share/mime/application/x-anjuta.xml -share/mime/packages/anjuta.xml +share/pixmaps/anjuta/start-with-import.png @dirrm share/pixmaps/anjuta @dirrm share/omf/anjuta-manual +@dirrm share/gnome/help/anjuta-manual/sv/figures +@dirrm share/gnome/help/anjuta-manual/sv +@dirrm share/gnome/help/anjuta-manual/oc/figures +@dirrm share/gnome/help/anjuta-manual/oc +@dirrm share/gnome/help/anjuta-manual/es/figures +@dirrm share/gnome/help/anjuta-manual/es @dirrm share/gnome/help/anjuta-manual/C/figures @dirrm share/gnome/help/anjuta-manual/C @dirrm share/gnome/help/anjuta-manual @@ -854,10 +1050,16 @@ share/mime/packages/anjuta.xml @dirrm include/libanjuta-1.0 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@dirrmtry share/applications +@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/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 -@dirrmtry share/applications +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index b65ae3b36103..efe22fb7f2be 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -3,21 +3,20 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/bug-buddy/Makefile,v 1.55 2007/10/06 22:03:31 mezz Exp $ +# $MCom: ports/devel/bug-buddy/Makefile,v 1.60 2008/03/11 03:04:07 mezz Exp $ # PORTNAME= bug-buddy -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.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 COMMENT= A bug reporting tool for GNOME 2 LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - soup-2.2.8:${PORTSDIR}/devel/libsoup + soup-2.4.1:${PORTSDIR}/devel/libsoup USE_BZIP2= yes USE_GETTEXT= yes diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index b443c5b57814..05e227a42086 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/bug-buddy-2.20.1.tar.bz2) = 6b9ea4c067674120bd93711b3b9a9e63 -SHA256 (gnome2/bug-buddy-2.20.1.tar.bz2) = cb0cb3f2400f201e2bf7afc6de81df6ab4b68c5a770ec0a132c300efe72d5f4e -SIZE (gnome2/bug-buddy-2.20.1.tar.bz2) = 1070862 +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 diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index 27f3b5fad558..27e3a523bc6c 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -15,6 +15,7 @@ share/applications/bug-buddy.desktop %%DATADIR%%/bugzilla/ximian/products %%DATADIR%%/gdb-cmd share/icons/hicolor/48x48/apps/bug-buddy.png +share/locale/af/LC_MESSAGES/bug-buddy.mo share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo share/locale/as/LC_MESSAGES/bug-buddy.mo @@ -100,6 +101,7 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrm %%DATADIR%%/bugzilla/gnome @dirrm %%DATADIR%%/bugzilla @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -132,4 +134,3 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index c52855667aec..92de3079975b 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -6,8 +6,8 @@ # PORTNAME= dbus -PORTVERSION?= 1.0.2 -PORTREVISION?= 2 +PORTVERSION?= 1.1.20 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ @@ -28,7 +28,7 @@ CONFIGURE_ARGS=--localstatedir=/var \ --disable-doxygen-docs \ --disable-xml-docs CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .if !defined(DBUS_SLAVE) @@ -48,10 +48,7 @@ USE_XLIB= yes .include <bsd.port.pre.mk> post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \ - ${WRKSRC}/bus/system.conf.in - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|/usr/X11R6|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/dbus/dbus-sysdeps-unix.c @${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \ ${WRKSRC}/dbus/Makefile.in \ @@ -62,8 +59,7 @@ post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - ${MKDIR} ${X11BASE}/etc/dbus-1/system.d - ${MKDIR} ${X11BASE}/share/dbus-1/services + ${MKDIR} ${PREFIX}/share/dbus-1/interfaces .endif .include <bsd.port.post.mk> diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo index 86dade22f679..9ec2266417ce 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,3 +1,3 @@ -MD5 (dbus-1.0.2.tar.gz) = 0552a9b54beb4a044951b7cdbc8fc855 -SHA256 (dbus-1.0.2.tar.gz) = 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca -SIZE (dbus-1.0.2.tar.gz) = 1400278 +MD5 (dbus-1.1.20.tar.gz) = c552b9bc4b69e4c602644abc21b7661e +SHA256 (dbus-1.1.20.tar.gz) = 6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e +SIZE (dbus-1.1.20.tar.gz) = 1401902 diff --git a/devel/dbus/files/patch-bus_Makefile.in b/devel/dbus/files/patch-bus_Makefile.in new file mode 100644 index 000000000000..b55c5dc79f22 --- /dev/null +++ b/devel/dbus/files/patch-bus_Makefile.in @@ -0,0 +1,20 @@ +--- bus/Makefile.in.orig 2008-01-22 14:45:58.000000000 -0500 ++++ bus/Makefile.in 2008-01-22 15:24:26.000000000 -0500 +@@ -412,7 +412,7 @@ target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + configdir = $(sysconfdir)/dbus-1 +-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ ++INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ + -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION + +@@ -476,7 +476,7 @@ dbus_daemon_LDADD = \ + $(DBUS_BUS_LIBS) \ + $(top_builddir)/dbus/libdbus-convenience.la + +-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@ ++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ + LAUNCH_HELPER_SOURCES = \ + $(XML_SOURCES) \ + config-parser-common.c \ diff --git a/devel/dbus/files/patch-bus_bus.c b/devel/dbus/files/patch-bus_bus.c deleted file mode 100644 index af6b06529fe3..000000000000 --- a/devel/dbus/files/patch-bus_bus.c +++ /dev/null @@ -1,30 +0,0 @@ ---- bus/bus.c.orig Wed Mar 21 16:20:57 2007 -+++ bus/bus.c Wed Mar 21 16:22:08 2007 -@@ -21,6 +21,7 @@ - * - */ - -+#include <signal.h> - #include "bus.h" - #include "activation.h" - #include "connection.h" -@@ -731,14 +732,18 @@ bus_context_new (const DBusString *confi - } - - bytes = _dbus_string_get_length (&pid); -- if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes) -+ signal (SIGPIPE, SIG_IGN); -+ if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes && -+ errno != EPIPE) - { - dbus_set_error (error, DBUS_ERROR_FAILED, - "Printing message bus PID: %s\n", - _dbus_strerror (errno)); - _dbus_string_free (&pid); -+ signal (SIGPIPE, SIG_DFL); - goto failed; - } -+ signal (SIGPIPE, SIG_DFL); - - if (print_pid_fd > 2) - _dbus_close_socket (print_pid_fd, NULL); diff --git a/devel/dbus/files/patch-bus_system.conf.in b/devel/dbus/files/patch-bus_system.conf.in deleted file mode 100644 index cfb3f879ec79..000000000000 --- a/devel/dbus/files/patch-bus_system.conf.in +++ /dev/null @@ -1,10 +0,0 @@ ---- bus/system.conf.in.orig Wed May 3 02:08:16 2006 -+++ bus/system.conf.in Wed May 3 02:09:58 2006 -@@ -52,6 +52,7 @@ - <!-- Config files are placed here that among other things, punch - holes in the above policy for specific services. --> - <includedir>system.d</includedir> -+ <includedir>%%X11BASE%%/etc/dbus-1/system.d</includedir> - - <!-- This is included last so local configuration can override what's - in this standard file --> diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c index 83b1c33d72be..bd0353d36d62 100644 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c @@ -1,12 +1,10 @@ ---- dbus/dbus-sysdeps-unix.c.orig Wed Nov 1 18:30:46 2006 -+++ dbus/dbus-sysdeps-unix.c Sun Nov 5 21:57:27 2006 -@@ -834,10 +834,10 @@ write_credentials_byte (int - { +--- 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 int bytes_written; char buf[1] = { '\0' }; --#if defined(HAVE_CMSGCRED) + #if defined(HAVE_CMSGCRED) - struct { -+#if defined(HAVE_CMSGCRED) + union { struct cmsghdr hdr; - struct cmsgcred cred; @@ -14,7 +12,7 @@ } cmsg; struct iovec iov; struct msghdr msg; -@@ -848,10 +848,10 @@ write_credentials_byte (int +@@ -1045,10 +1045,10 @@ write_credentials_byte (int msg.msg_iov = &iov; msg.msg_iovlen = 1; @@ -28,20 +26,19 @@ cmsg.hdr.cmsg_level = SOL_SOCKET; cmsg.hdr.cmsg_type = SCM_CREDS; #endif -@@ -918,9 +918,10 @@ _dbus_read_credentials_unix_socket (int - char buf; - +@@ -1124,9 +1124,9 @@ _dbus_read_credentials_socket (int + pid_read = DBUS_PID_UNSET; + #ifdef HAVE_CMSGCRED - struct { -+ struct cmsgcred *cred; + union { - struct cmsghdr hdr; -- struct cmsgcred cred; -+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; + struct cmsghdr hdr; +- struct cmsgcred cred; ++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))]; } cmsg; #elif defined(LOCAL_CREDS) -@@ -957,8 +958,8 @@ _dbus_read_credentials_unix_socket (int +@@ -1163,8 +1163,8 @@ _dbus_read_credentials_socket (int #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) memset (&cmsg, 0, sizeof (cmsg)); @@ -52,7 +49,7 @@ #endif again: -@@ -981,7 +982,8 @@ _dbus_read_credentials_unix_socket (int +@@ -1202,7 +1202,8 @@ _dbus_read_credentials_socket (int } #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS) @@ -62,26 +59,17 @@ { dbus_set_error (error, DBUS_ERROR_FAILED, "Message from recvmsg() was not SCM_CREDS"); -@@ -1009,9 +1011,10 @@ _dbus_read_credentials_unix_socket (int +@@ -1229,8 +1230,11 @@ _dbus_read_credentials_socket (int cr_len, (int) sizeof (cr), _dbus_strerror (errno)); } #elif defined(HAVE_CMSGCRED) -- credentials->pid = cmsg.cred.cmcred_pid; -- credentials->uid = cmsg.cred.cmcred_euid; -- credentials->gid = cmsg.cred.cmcred_groups[0]; +- pid_read = cmsg.cred.cmcred_pid; +- uid_read = cmsg.cred.cmcred_euid; ++ struct cmsgcred *cred; ++ + cred = (struct cmsgcred *) CMSG_DATA (&cmsg); -+ credentials->pid = cred->cmcred_pid; -+ credentials->uid = cred->cmcred_euid; -+ credentials->gid = cred->cmcred_groups[0]; ++ pid_read = cred->cmcred_pid; ++ uid_read = cred->cmcred_euid; #elif defined(LOCAL_CREDS) - credentials->pid = DBUS_PID_UNSET; - credentials->uid = cmsg.cred.sc_uid; -@@ -2687,7 +2690,7 @@ _dbus_get_standard_session_servicedirs ( - } - else - { -- if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:")) -+ if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/X11R6/share:/usr/share:")) - goto oom; - } - + pid_read = DBUS_PID_UNSET; + uid_read = cmsg.cred.sc_uid; diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c deleted file mode 100644 index 4a6bf2c7a505..000000000000 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c +++ /dev/null @@ -1,23 +0,0 @@ ---- dbus/dbus-sysdeps-util-unix.c.orig Mon Dec 11 14:21:10 2006 -+++ dbus/dbus-sysdeps-util-unix.c Wed Mar 21 16:22:45 2007 -@@ -157,15 +157,19 @@ _dbus_become_daemon (const DBusString *p - } - - bytes = _dbus_string_get_length (&pid); -- if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes) -+ signal (SIGPIPE, SIG_IGN); -+ if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes && -+ errno != EPIPE) - { - dbus_set_error (error, DBUS_ERROR_FAILED, - "Printing message bus PID: %s\n", - _dbus_strerror (errno)); - _dbus_string_free (&pid); - kill (child_pid, SIGTERM); -+ signal (SIGPIPE, SIG_DFL); - return FALSE; - } -+ signal (SIGPIPE, SIG_DFL); - - _dbus_string_free (&pid); - } diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install index 5a49ace79e13..4ed46afa771a 100644 --- a/devel/dbus/pkg-install +++ b/devel/dbus/pkg-install @@ -34,6 +34,7 @@ POST-INSTALL) /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus /usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus + /usr/bin/chgrp ${GROUP} ${PKG_PREFIX}/libexec/dbus-daemon-launch-helper ${PKG_PREFIX}/bin/dbus-uuidgen --ensure exit 0 ;; diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist index 9836e0dbbbaa..3bbf8b3c9956 100644 --- a/devel/dbus/pkg-plist +++ b/devel/dbus/pkg-plist @@ -28,21 +28,24 @@ lib/libdbus-1.la lib/libdbus-1.so lib/libdbus-1.so.3 libdata/pkgconfig/dbus-1.pc +libexec/dbus-daemon-launch-helper +@exec mkdir -p %D/libexec/dbus-1 @exec mkdir -p %D/etc/dbus-1/system.d -@exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d +@exec mkdir -p %D/share/dbus-1/interfaces @exec mkdir -p %D/share/dbus-1/services -@exec mkdir -p %%X11BASE%%/share/dbus-1/services +@exec mkdir -p %D/share/dbus-1/system-services +@exec mkdir -p %D/etc/dbus-1/session.d +@dirrmtry share/dbus-1/system-services @dirrmtry share/dbus-1/services +@dirrmtry share/dbus-1/interfaces @dirrmtry share/dbus-1 -@unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true -@unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true -@unexec rmdir %%X11BASE%%/etc/dbus-1/system.d 2>/dev/null || true -@unexec rmdir %%X11BASE%%/etc/dbus-1 2>/dev/null || true +@dirrmtry libexec/dbus-1 @dirrm include/dbus-%%VERSION%%/include/dbus @dirrm include/dbus-%%VERSION%%/include @dirrm include/dbus-%%VERSION%%/dbus @dirrm include/dbus-%%VERSION%% @dirrm etc/dbus-1/system.d +@dirrm etc/dbus-1/session.d @dirrm etc/dbus-1 @unexec rm -f /var/run/dbus/dbus.pid @unexec rm -f /var/run/dbus/dbus.pipe diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index ceb6db889c0e..fd87e0f15fb3 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gamin/Makefile,v 1.2 2007/02/02 18:57:01 mezz Exp $ +# $MCom: ports/devel/gamin/Makefile,v 1.4 2008/01/09 19:55:24 marcus Exp $ # PORTNAME= gamin PORTVERSION= 0.1.9 +PORTREVISION= 1 CATEGORIES?= devel MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/ @@ -16,7 +17,7 @@ COMMENT?= A file and directory monitoring system USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -USE_GNOME?= gnomehack glib20 +USE_GNOME?= gnomehack _glib20 USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index d647f75d62c3..c0205d1d74ba 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.87 2007/10/15 14:17:14 ahze Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.96 2008/03/10 16:25:56 ahze Exp $ # PORTNAME= gconf2 -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.0 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -24,9 +24,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_XLIB= yes -USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack \ - referencehack +USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \ + referencehack intlhack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index d1bea0986e97..69fd7f190c62 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/GConf-2.20.1.tar.bz2) = 646fc896c6282a8f103365af0fa2e303 -SHA256 (gnome2/GConf-2.20.1.tar.bz2) = 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838 -SIZE (gnome2/GConf-2.20.1.tar.bz2) = 1404919 +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 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 968ab8db4d97..fc96aad3d6fd 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -31,6 +31,7 @@ libexec/gconfd-2 share/aclocal/gconf-2.m4 share/locale/am/LC_MESSAGES/GConf2.mo share/locale/ar/LC_MESSAGES/GConf2.mo +share/locale/as/LC_MESSAGES/GConf2.mo share/locale/az/LC_MESSAGES/GConf2.mo share/locale/be/LC_MESSAGES/GConf2.mo share/locale/bg/LC_MESSAGES/GConf2.mo @@ -72,6 +73,7 @@ share/locale/mg/LC_MESSAGES/GConf2.mo share/locale/mk/LC_MESSAGES/GConf2.mo share/locale/ml/LC_MESSAGES/GConf2.mo share/locale/mn/LC_MESSAGES/GConf2.mo +share/locale/mr/LC_MESSAGES/GConf2.mo share/locale/ms/LC_MESSAGES/GConf2.mo share/locale/nb/LC_MESSAGES/GConf2.mo share/locale/ne/LC_MESSAGES/GConf2.mo @@ -86,6 +88,7 @@ share/locale/pt_BR/LC_MESSAGES/GConf2.mo share/locale/ro/LC_MESSAGES/GConf2.mo share/locale/ru/LC_MESSAGES/GConf2.mo share/locale/rw/LC_MESSAGES/GConf2.mo +share/locale/si/LC_MESSAGES/GConf2.mo share/locale/sk/LC_MESSAGES/GConf2.mo share/locale/sl/LC_MESSAGES/GConf2.mo share/locale/sq/LC_MESSAGES/GConf2.mo @@ -119,10 +122,14 @@ share/sgml/gconf/gconf-1.0.dtd @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/ku/LC_MESSAGES @@ -131,3 +138,5 @@ share/sgml/gconf/gconf-1.0.dtd @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 diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile index d3ad42259521..e2bf7256abf4 100644 --- a/devel/gconfmm26/Makefile +++ b/devel/gconfmm26/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/gconfmm26/Makefile,v 1.18 2007/09/17 03:25:24 marcus Exp $ +# $MCom: ports/devel/gconfmm26/Makefile,v 1.20 2008/03/08 16:24:44 marcus Exp $ # PORTNAME= gconfmm -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.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 1c8397b0a18a..12c3db942420 100644 --- a/devel/gconfmm26/distinfo +++ b/devel/gconfmm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconfmm-2.20.0.tar.bz2) = 24d7e01104394229f28e32a1dc17c819 -SHA256 (gnome2/gconfmm-2.20.0.tar.bz2) = 79fde1ed43605961b2526f6074a57fd7ddfaa1851c4e91609829e439cc1ef2e9 -SIZE (gnome2/gconfmm-2.20.0.tar.bz2) = 283074 +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 diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile new file mode 100644 index 000000000000..27857eb6eded --- /dev/null +++ b/devel/gio-fam-backend/Makefile @@ -0,0 +1,39 @@ +# New ports collection makefile for: gio-fam-backend +# Date Created: 22 December 2007 +# 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 $ +# + +PORTNAME= gio-fam-backend +PORTVERSION= 2.16.1 +PORTREVISION= 1 +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/}/ \ + ftp://ftp.gimp.org/pub/%SUBDIR%/ \ + ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ + http://www.ameth.org/gimp/%SUBDIR%/ \ + ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} +MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +DISTNAME= glib-${PORTVERSION} +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= FAM backend for GLib's GIO library + +USE_BZIP2= yes +BUILD_WRKSRC= ${WRKSRC}/gio/fam +INSTALL_WRKSRC= ${BUILD_WRKSRC} +GNU_CONFIGURE= yes +USE_GNOME= gnomehack gnometarget pkgconfig _glib20 +USE_FAM= yes +USE_GMAKE= yes +CONFIGURE_ARGS= --enable-static --with-libiconv=gnu +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -lintl" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" + +.include <bsd.port.mk> diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo new file mode 100644 index 000000000000..8ccc88c9f7df --- /dev/null +++ b/devel/gio-fam-backend/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/glib-2.16.1.tar.bz2) = 9852daf0605f827bfd7199ffe4f5b22d +SHA256 (gnome2/glib-2.16.1.tar.bz2) = f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695 +SIZE (gnome2/glib-2.16.1.tar.bz2) = 4529604 diff --git a/devel/gio-fam-backend/files/patch-fam b/devel/gio-fam-backend/files/patch-fam new file mode 100644 index 000000000000..a3b5fe4aa716 --- /dev/null +++ b/devel/gio-fam-backend/files/patch-fam @@ -0,0 +1,52 @@ +--- gio/fam/fam-helper.h.orig 2008-03-10 13:50:12.000000000 -0400 ++++ gio/fam/fam-helper.h 2008-03-10 13:50:29.000000000 -0400 +@@ -28,6 +28,7 @@ + typedef struct _fam_sub fam_sub; + + gboolean _fam_sub_startup (void); ++void _fam_sub_shutdown (void); + fam_sub* _fam_sub_add (const gchar* pathname, + gboolean directory, + gpointer user_data); +--- gio/fam/fam-helper.c.orig 2008-03-10 20:31:58.000000000 -0400 ++++ gio/fam/fam-helper.c 2008-03-10 23:06:32.000000000 -0400 +@@ -181,6 +181,22 @@ _fam_sub_startup (void) + return TRUE; + } + ++void ++_fam_sub_shutdown (void) ++{ ++ G_LOCK (fam_connection); ++ ++ if (fam_connection != NULL) { ++ FAMClose (fam_connection); ++ g_free (fam_connection); ++ g_source_remove (fam_watch_id); ++ fam_watch_id = 0; ++ fam_connection = NULL; ++ } ++ ++ G_UNLOCK (fam_connection); ++} ++ + fam_sub* + _fam_sub_add (const gchar* pathname, + gboolean directory, +--- gio/fam/fam-module.c.orig 2008-03-12 13:38:54.000000000 -0400 ++++ gio/fam/fam-module.c 2008-03-12 13:39:31.000000000 -0400 +@@ -26,6 +26,7 @@ + #include "giomodule.h" + #include "gfamdirectorymonitor.h" + #include "gfamfilemonitor.h" ++#include "fam-helper.h" + + void + g_io_module_load (GIOModule *module) +@@ -37,5 +38,6 @@ g_io_module_load (GIOModule *module) + void + g_io_module_unload (GIOModule *module) + { ++ _fam_sub_shutdown (); + } + diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in new file mode 100644 index 000000000000..0f6a9e25ead1 --- /dev/null +++ b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in @@ -0,0 +1,27 @@ +--- gio/fam/Makefile.in.orig 2008-01-07 19:40:38.000000000 -0500 ++++ gio/fam/Makefile.in 2008-01-07 19:41:53.000000000 -0500 +@@ -59,9 +59,8 @@ am__installdirs = "$(DESTDIR)$(giomodule + giomoduleLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(giomodule_LTLIBRARIES) + am__DEPENDENCIES_1 = +-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ +- $(top_builddir)/gobject/libgobject-2.0.la \ +- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \ ++libgiofam_la_DEPENDENCIES = \ ++ $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) + am__objects_1 = + am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ +@@ -321,9 +320,9 @@ libgiofam_la_CFLAGS = \ + + libgiofam_la_LDFLAGS = $(module_flags) + libgiofam_la_LIBADD = \ +- $(top_builddir)/gio/libgio-2.0.la \ +- $(top_builddir)/gobject/libgobject-2.0.la \ +- $(top_builddir)/glib/libglib-2.0.la \ ++ -lgio-2.0 \ ++ -lgobject-2.0 \ ++ -lglib-2.0 \ + $(GLIB_LIBS) \ + $(FAM_LIBS) \ + $(NULL) diff --git a/devel/gio-fam-backend/pkg-descr b/devel/gio-fam-backend/pkg-descr new file mode 100644 index 000000000000..b44b5d5576ec --- /dev/null +++ b/devel/gio-fam-backend/pkg-descr @@ -0,0 +1,2 @@ +gio-fam-backend provides a file Alteration Monitor (FAM) backend module for +GLib's GIO subsystem. diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist new file mode 100644 index 000000000000..4304d626a688 --- /dev/null +++ b/devel/gio-fam-backend/pkg-plist @@ -0,0 +1,5 @@ +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 0964225a4421..d43f0ff2e151 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/glib20/Makefile,v 1.1 2007/11/30 18:48:03 marcus Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.117 2008/03/19 04:44:58 marcus Exp $ # PORTNAME= glib -PORTVERSION= 2.14.6 -PORTREVISION?= 0 +PORTVERSION= 2.16.1 +PORTREVISION?= 2 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/}/ \ @@ -35,11 +35,13 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes USE_GNOME= gnomehack gnometarget pkgconfig ltverhack USE_GMAKE= yes +USE_PYTHON= yes USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ --disable-man --without-xml-catalog \ - --with-pcre=system + --with-pcre=system \ + --disable-fam CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ @@ -59,10 +61,6 @@ GLIB_ARCH= ${ARCH} .endif CONFIGURE_TARGET= --build=${GLIB_ARCH}-portbld-freebsd${OSREL} -.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) ) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c -.endif - .if defined(WITH_COLLATION_FIX) LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index c6616ee5e610..8ccc88c9f7df 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glib-2.14.6.tar.bz2) = 3b340946d6916ee9cbf2c348e7c099f1 -SHA256 (gnome2/glib-2.14.6.tar.bz2) = 78dfbbd339ff1049275f76a2a6e6c8f0cf124d5cdbea62a2b36e9d76c0ea24ba -SIZE (gnome2/glib-2.14.6.tar.bz2) = 3406651 +MD5 (gnome2/glib-2.16.1.tar.bz2) = 9852daf0605f827bfd7199ffe4f5b22d +SHA256 (gnome2/glib-2.16.1.tar.bz2) = f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695 +SIZE (gnome2/glib-2.16.1.tar.bz2) = 4529604 diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c deleted file mode 100644 index bde2862f605e..000000000000 --- a/devel/glib20/files/extra-patch-gthread_gthread-posix.c +++ /dev/null @@ -1,32 +0,0 @@ ---- gthread/gthread-posix.c.orig Thu Jun 9 11:25:01 2005 -+++ gthread/gthread-posix.c Fri Jun 10 20:23:17 2005 -@@ -115,7 +115,11 @@ static gint priority_normal_value; - # define PRIORITY_NORMAL_VALUE priority_normal_value - #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ - -+#define G_THREAD_STACK_SIZE32 (1*1024*1024) -+#define G_THREAD_STACK_SIZE64 (2*1024*1024) -+ - static gulong g_thread_min_stack_size = 0; -+static gulong g_thread_default_stack_size = 0; - - #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) - -@@ -309,8 +313,16 @@ g_thread_create_posix_impl (GThreadFunc - stack_size = MAX (g_thread_min_stack_size, stack_size); - /* No error check here, because some systems can't do it and - * we simply don't want threads to fail because of that. */ -- pthread_attr_setstacksize (&attr, stack_size); - } -+ else -+ { -+ if (sizeof(void *) == 8) -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; -+ else -+ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; -+ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); -+ } -+ pthread_attr_setstacksize (&attr, stack_size); - #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */ - - #ifdef PTHREAD_SCOPE_SYSTEM diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index 46738f939e1a..2ba6ab189dda 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,6 +1,28 @@ ---- configure.orig Sun Jan 29 13:06:22 2006 -+++ configure Sun Jan 29 13:06:48 2006 -@@ -34462,6 +34461,8 @@ +--- 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 + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif ++#ifdef HAVE_SYS_MOUNT_H ++#include <sys/mount.h> ++#endif + int + main () + { +@@ -34051,7 +34057,7 @@ done + + + +-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 ;; esac fi diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag index 8a89b6e972e9..5ee7fe3d539f 100644 --- a/devel/glib20/files/patch-ag +++ b/devel/glib20/files/patch-ag @@ -1,22 +1,21 @@ ---- Makefile.in.orig Thu May 3 15:19:30 2007 -+++ Makefile.in Thu May 3 15:19:44 2007 -@@ -248,7 +248,7 @@ target_alias = @target_alias@ - +--- Makefile.in.orig 2008-02-12 00:16:23.000000000 +0100 ++++ Makefile.in 2008-02-12 00:16:23.000000000 +0100 +@@ -338,7 +338,7 @@ EXTRA_DIST = ChangeLog.pre-2-14 ChangeLo + gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in + TEST_PROGS = AUTOMAKE_OPTIONS = 1.7 - --SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs -+SUBDIRS = . m4macros glib gobject gmodule gthread build po docs - +-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs ++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs + DIST_SUBDIRS = $(SUBDIRS) build bin_SCRIPTS = glib-gettextize - -@@ -301,8 +301,8 @@ BUILT_EXTRA_DIST = \ + AM_CPPFLAGS = \ +@@ -356,7 +356,8 @@ BUILT_EXTRA_DIST = \ config.h.win32 \ gtk-doc.make -- -configexecincludedir = $(libdir)/glib-2.0/include +glibincludedir = $(includedir)/glib-2.0 +configexecincludedir = $(glibincludedir) - + configexecinclude_DATA = glibconfig.h CONFIGURE_DEPENDENCIES = acglib.m4 - + BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah index c339b76e2477..3784d16b8ed2 100644 --- a/devel/glib20/files/patch-ah +++ b/devel/glib20/files/patch-ah @@ -1,11 +1,11 @@ ---- docs/reference/Makefile.in.orig Fri Oct 24 18:05:32 2003 -+++ docs/reference/Makefile.in Fri Oct 24 18:06:00 2003 -@@ -226,7 +226,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = glib gobject -+SUBDIRS = #glib gobject - subdir = docs/reference - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h +--- docs/reference/Makefile.in.orig 2007-12-21 16:54:10.000000000 -0500 ++++ docs/reference/Makefile.in 2007-12-21 16:54:40.000000000 -0500 +@@ -268,7 +268,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt + # initialize variables for unconditional += appending + EXTRA_DIST = + TEST_PROGS = +-SUBDIRS = glib gobject gio ++SUBDIRS = #glib gobject gio + all: all-recursive + + .SUFFIXES: diff --git a/devel/glib20/files/patch-config.h.in b/devel/glib20/files/patch-config.h.in new file mode 100644 index 000000000000..3c2bc5d2626f --- /dev/null +++ b/devel/glib20/files/patch-config.h.in @@ -0,0 +1,12 @@ +--- config.h.in.orig 2008-03-18 18:24:24.000000000 -0400 ++++ config.h.in 2008-03-18 18:24:59.000000000 -0400 +@@ -197,6 +197,9 @@ + /* Define to 1 if you have the `getpwuid' function. */ + #undef HAVE_GETPWUID + ++/* Define to 1 if you have the `sysctlbyname' function. */ ++#undef HAVE_SYSCTLBYNAME ++ + /* Define if the GNU gettext() function is already present or preinstalled. */ + #undef HAVE_GETTEXT + diff --git a/devel/glib20/files/patch-gio_glocalfile.c b/devel/glib20/files/patch-gio_glocalfile.c new file mode 100644 index 000000000000..9cf00d383eff --- /dev/null +++ b/devel/glib20/files/patch-gio_glocalfile.c @@ -0,0 +1,11 @@ +--- gio/glocalfile.c.orig 2008-03-10 23:04:57.000000000 -0400 ++++ gio/glocalfile.c 2008-03-10 23:05:23.000000000 -0400 +@@ -1001,7 +1001,7 @@ g_local_file_query_filesystem_info (GFil + #endif + } + #ifdef USE_STATFS +-#if defined(HAVE_STRUCT_STATFS_FS_TYPENAME) ++#if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) + fstype = g_strdup(statfs_buffer.f_fstypename); + #else + fstype = get_fs_type (statfs_buffer.f_type); diff --git a/devel/glib20/files/patch-gio_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c new file mode 100644 index 000000000000..b9bfe143ed0c --- /dev/null +++ b/devel/glib20/files/patch-gio_gunixmount.c @@ -0,0 +1,21 @@ +--- gio/gunixmount.c.orig 2007-12-23 15:53:50.000000000 -0500 ++++ gio/gunixmount.c 2007-12-23 15:52:52.000000000 -0500 +@@ -372,12 +372,18 @@ g_unix_mount_eject (GMount * + gpointer user_data) + { + GUnixMount *unix_mount = G_UNIX_MOUNT (mount); ++#ifndef __FreeBSD__ + char *argv[] = {"eject", NULL, NULL}; + + if (unix_mount->mount_path != NULL) + argv[1] = unix_mount->mount_path; + else + argv[1] = unix_mount->device_path; ++#else ++ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; ++ ++ argv[2] = unix_mount->device_path; ++#endif + + return eject_unmount_do (mount, cancellable, callback, user_data, argv); + } diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c new file mode 100644 index 000000000000..9b6fa2df36f0 --- /dev/null +++ b/devel/glib20/files/patch-gio_gunixmounts.c @@ -0,0 +1,148 @@ +--- ggio/unixmounts.c.orig 2008-03-10 20:31:58.000000000 -0400 ++++ gio/gunixmounts.c 2008-03-19 22:31:23.000000000 -0400 +@@ -128,6 +128,9 @@ struct _GUnixMountMonitor { + + GFileMonitor *fstab_monitor; + GFileMonitor *mtab_monitor; ++ ++ guint mount_poller_source; ++ GList *mount_poller_mounts; + }; + + struct _GUnixMountMonitorClass { +@@ -139,6 +142,8 @@ static GUnixMountMonitor *the_mount_moni + static GList *_g_get_unix_mounts (void); + static GList *_g_get_unix_mount_points (void); + ++static guint64 mount_poller_time = 0; ++ + G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); + + #define MOUNT_POLL_INTERVAL 4000 +@@ -165,6 +170,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix + #endif + + #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) ++#include <sys/param.h> + #include <sys/ucred.h> + #include <sys/mount.h> + #include <fstab.h> +@@ -215,20 +221,28 @@ g_unix_is_mount_path_system_internal (co + "/", /* we already have "Filesystem root" in Nautilus */ + "/bin", + "/boot", ++ "/compat/linux/proc", ++ "/compat/linux/sys", + "/dev", + "/etc", + "/home", + "/lib", + "/lib64", ++ "/libexec", + "/media", + "/mnt", + "/opt", ++ "/rescue", + "/root", + "/sbin", + "/srv", + "/tmp", + "/usr", ++ "/usr/X11R6", + "/usr/local", ++ "/usr/obj", ++ "/usr/ports", ++ "/usr/src", + "/var", + "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */ + "/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */ +@@ -988,6 +1002,10 @@ get_mounts_timestamp (void) + if (stat (monitor_file, &buf) == 0) + return (guint64)buf.st_mtime; + } ++ else ++ { ++ return mount_poller_time; ++ } + return 0; + } + +@@ -1129,6 +1147,13 @@ g_unix_mount_monitor_finalize (GObject * + g_object_unref (monitor->mtab_monitor); + } + ++ if (monitor->mount_poller_source > 0) ++ { ++ g_source_remove (monitor->mount_poller_source); ++ g_list_foreach (monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL); ++ g_list_free (monitor->mount_poller_mounts); ++ } ++ + the_mount_monitor = NULL; + + if (G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize) +@@ -1206,6 +1231,51 @@ mtab_file_changed (GFileMonitor *mo + g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0); + } + ++static gboolean ++mount_change_poller (gpointer user_data) ++{ ++ GUnixMountMonitor *mount_monitor; ++ GList *current_mounts; ++ gboolean has_changed = FALSE; ++ ++ mount_monitor = user_data; ++ current_mounts = _g_get_unix_mounts (); ++ ++ if (g_list_length (current_mounts) != g_list_length (mount_monitor->mount_poller_mounts)) ++ { ++ g_list_foreach (mount_monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL); ++ has_changed = TRUE; ++ } ++ else ++ { ++ int i; ++ ++ for (i = 0; i < g_list_length (current_mounts); i++) ++ { ++ GUnixMountEntry *m1; ++ GUnixMountEntry *m2; ++ ++ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i); ++ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i); ++ if (! has_changed && g_unix_mount_compare (m1, m2) != 0) ++ has_changed = TRUE; ++ ++ g_unix_mount_free (m2); ++ } ++ } ++ ++ g_list_free (mount_monitor->mount_poller_mounts); ++ mount_monitor->mount_poller_mounts = current_mounts; ++ ++ if (has_changed) ++ { ++ mount_poller_time = (guint64)time (NULL); ++ g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0); ++ } ++ ++ return TRUE; ++} ++ + static void + g_unix_mount_monitor_init (GUnixMountMonitor *monitor) + { +@@ -1228,6 +1298,12 @@ g_unix_mount_monitor_init (GUnixMountMon + + g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); + } ++ else ++ { ++ monitor->mount_poller_mounts = _g_get_unix_mounts (); ++ mount_poller_time = (guint64)time (NULL); ++ monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor); ++ } + } + + /** diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c new file mode 100644 index 000000000000..377a7d6b5686 --- /dev/null +++ b/devel/glib20/files/patch-gio_gunixvolume.c @@ -0,0 +1,17 @@ +--- gio/gunixvolume.c.orig 2007-12-23 15:43:17.000000000 -0500 ++++ gio/gunixvolume.c 2007-12-23 15:47:08.000000000 -0500 +@@ -387,9 +387,13 @@ g_unix_volume_eject (GVolume *volume, + gpointer user_data) + { + GUnixVolume *unix_volume = G_UNIX_VOLUME (volume); ++#ifdef __FreeBSD__ ++ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; ++ argv[2] = unix_volume->device_path; ++#else + char *argv[] = {"eject", NULL, NULL}; +- + argv[1] = unix_volume->device_path; ++#endif + + eject_mount_do (volume, cancellable, callback, user_data, argv); + } diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmime.c b/devel/glib20/files/patch-gio_xdgmime_xdgmime.c new file mode 100644 index 000000000000..8c36dc5d8d4d --- /dev/null +++ b/devel/glib20/files/patch-gio_xdgmime_xdgmime.c @@ -0,0 +1,11 @@ +--- gio/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 ++++ gio/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/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h new file mode 100644 index 000000000000..58aa93037507 --- /dev/null +++ b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h @@ -0,0 +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) + + #endif + diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in index 9afd57416296..9cec8906fb28 100644 --- a/devel/glib20/files/patch-glib::libcharset::Makefile.in +++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in @@ -1,31 +1,30 @@ ---- glib/libcharset/Makefile.in.orig Fri Apr 30 12:10:27 2004 -+++ glib/libcharset/Makefile.in Fri Apr 30 12:12:01 2004 -@@ -225,7 +225,7 @@ - target_alias = @target_alias@ - +--- 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 + codeset.m4 update.sh make-patch.sh libcharset-glib.patch + TEST_PROGS = INCLUDES = \ - -DLIBDIR=\"$(libdir)\" -I$(top_srcdir) + -DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir) - noinst_LTLIBRARIES = libcharset.la -@@ -246,8 +246,8 @@ - make-patch.sh - + libcharset_la_SOURCES = \ + libcharset.h \ + localcharset.c -charset_alias = $(DESTDIR)$(libdir)/charset.alias -charset_tmp = $(DESTDIR)$(libdir)/charset.tmp +charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias +charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp - SUFFIXES = .sed .sin + CLEANFILES = charset.alias ref-add.sed ref-del.sed + all: all-am +@@ -497,7 +497,7 @@ install-data-am: -@@ -487,7 +487,7 @@ - - install-data-am: + install-dvi: install-dvi-am -install-exec-am: install-exec-local +install-exec-am: # install-exec-local - install-info: install-info-am + install-html: install-html-am diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 1caac4492aca..44bbc76976a6 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -2,6 +2,52 @@ bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums bin/gobject-query +bin/gtester +bin/gtester-report +include/gio-unix-2.0/gio/gdesktopappinfo.h +include/gio-unix-2.0/gio/gunixinputstream.h +include/gio-unix-2.0/gio/gunixmounts.h +include/gio-unix-2.0/gio/gunixoutputstream.h +include/glib-2.0/gio/gappinfo.h +include/glib-2.0/gio/gasyncresult.h +include/glib-2.0/gio/gbufferedinputstream.h +include/glib-2.0/gio/gbufferedoutputstream.h +include/glib-2.0/gio/gcancellable.h +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/gfile.h +include/glib-2.0/gio/gfileattribute.h +include/glib-2.0/gio/gfileenumerator.h +include/glib-2.0/gio/gfileicon.h +include/glib-2.0/gio/gfileinfo.h +include/glib-2.0/gio/gfileinputstream.h +include/glib-2.0/gio/gfilemonitor.h +include/glib-2.0/gio/gfilenamecompleter.h +include/glib-2.0/gio/gfileoutputstream.h +include/glib-2.0/gio/gfilterinputstream.h +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/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/gloadableicon.h +include/glib-2.0/gio/gmemoryinputstream.h +include/glib-2.0/gio/gmemoryoutputstream.h +include/glib-2.0/gio/gmount.h +include/glib-2.0/gio/gmountoperation.h +include/glib-2.0/gio/gnativevolumemonitor.h +include/glib-2.0/gio/goutputstream.h +include/glib-2.0/gio/gseekable.h +include/glib-2.0/gio/gsimpleasyncresult.h +include/glib-2.0/gio/gthemedicon.h +include/glib-2.0/gio/gvfs.h +include/glib-2.0/gio/gvolume.h +include/glib-2.0/gio/gvolumemonitor.h include/glib-2.0/glib-object.h include/glib-2.0/glib.h include/glib-2.0/glib/galloca.h @@ -12,6 +58,7 @@ include/glib-2.0/glib/gbacktrace.h include/glib-2.0/glib/gbase64.h include/glib-2.0/glib/gbookmarkfile.h include/glib-2.0/glib/gcache.h +include/glib-2.0/glib/gchecksum.h include/glib-2.0/glib/gcompletion.h include/glib-2.0/glib/gconvert.h include/glib-2.0/glib/gdataset.h @@ -52,12 +99,14 @@ include/glib-2.0/glib/gspawn.h include/glib-2.0/glib/gstdio.h include/glib-2.0/glib/gstrfuncs.h include/glib-2.0/glib/gstring.h +include/glib-2.0/glib/gtestutils.h include/glib-2.0/glib/gthread.h include/glib-2.0/glib/gthreadpool.h include/glib-2.0/glib/gtimer.h include/glib-2.0/glib/gtree.h include/glib-2.0/glib/gtypes.h include/glib-2.0/glib/gunicode.h +include/glib-2.0/glib/gurifuncs.h include/glib-2.0/glib/gutils.h include/glib-2.0/glib/gwin32.h include/glib-2.0/glibconfig.h @@ -79,6 +128,10 @@ include/glib-2.0/gobject/gvalue.h include/glib-2.0/gobject/gvaluearray.h include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h +lib/libgio-2.0.a +lib/libgio-2.0.la +lib/libgio-2.0.so +lib/libgio-2.0.so.0 lib/libglib-2.0.a lib/libglib-2.0.la lib/libglib-2.0.so @@ -95,6 +148,8 @@ lib/libgthread-2.0.a lib/libgthread-2.0.la lib/libgthread-2.0.so lib/libgthread-2.0.so.0 +libdata/pkgconfig/gio-2.0.pc +libdata/pkgconfig/gio-unix-2.0.pc libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gmodule-export-2.0.pc @@ -153,6 +208,7 @@ share/locale/mg/LC_MESSAGES/glib20.mo share/locale/mk/LC_MESSAGES/glib20.mo share/locale/ml/LC_MESSAGES/glib20.mo share/locale/mn/LC_MESSAGES/glib20.mo +share/locale/mr/LC_MESSAGES/glib20.mo share/locale/ms/LC_MESSAGES/glib20.mo share/locale/nb/LC_MESSAGES/glib20.mo share/locale/ne/LC_MESSAGES/glib20.mo @@ -167,6 +223,7 @@ share/locale/pt_BR/LC_MESSAGES/glib20.mo share/locale/ro/LC_MESSAGES/glib20.mo share/locale/ru/LC_MESSAGES/glib20.mo share/locale/rw/LC_MESSAGES/glib20.mo +share/locale/si/LC_MESSAGES/glib20.mo share/locale/sk/LC_MESSAGES/glib20.mo share/locale/sl/LC_MESSAGES/glib20.mo share/locale/sq/LC_MESSAGES/glib20.mo @@ -193,7 +250,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm share/glib-2.0 @dirrm include/glib-2.0/gobject @dirrm include/glib-2.0/glib +@dirrm include/glib-2.0/gio @dirrm include/glib-2.0 +@dirrm include/gio-unix-2.0/gio +@dirrm include/gio-unix-2.0 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @@ -208,10 +268,14 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrmtry share/locale/te @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/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/ku/LC_MESSAGES diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index f209f7eb4173..26bac99b4e21 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -3,11 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/glibmm/Makefile,v 1.3 2007/12/02 00:19:26 mezz Exp $ +# $MCom: ports/devel/glibmm/Makefile,v 1.58 2008/03/10 23:01:49 ahze Exp $ # PORTNAME= glibmm -PORTVERSION= 2.14.2 +PORTVERSION= 2.16.0 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index 96c2604ecfb2..f9e12ab393b9 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/glibmm-2.14.2.tar.bz2) = 58b4fdc97738795a19b1f5ad37f186b4 -SHA256 (gnome2/glibmm-2.14.2.tar.bz2) = 7602068e8ea8e705c3970b5f2f524c7335db4ee0ca630a424690bc4951544851 -SIZE (gnome2/glibmm-2.14.2.tar.bz2) = 9268918 +MD5 (gnome2/glibmm-2.16.0.tar.bz2) = 0a2442b754b97c67d0ccb4a9a2bebcb2 +SHA256 (gnome2/glibmm-2.16.0.tar.bz2) = b587b9f88fd6b355857b9ec1a18f4a6a65005b8e9e1f2128c63b646d3937c92b +SIZE (gnome2/glibmm-2.16.0.tar.bz2) = 11719272 diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist index f816389349f0..4ecfe4391546 100644 --- a/devel/glibmm/pkg-plist +++ b/devel/glibmm/pkg-plist @@ -1,5 +1,82 @@ +include/giomm-%%API_VERSION%%/giomm.h +include/giomm-%%API_VERSION%%/giomm/appinfo.h +include/giomm-%%API_VERSION%%/giomm/asyncresult.h +include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h +include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h +include/giomm-%%API_VERSION%%/giomm/cancellable.h +include/giomm-%%API_VERSION%%/giomm/contenttype.h +include/giomm-%%API_VERSION%%/giomm/datainputstream.h +include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h +include/giomm-%%API_VERSION%%/giomm/desktopappinfo.h +include/giomm-%%API_VERSION%%/giomm/drive.h +include/giomm-%%API_VERSION%%/giomm/enums.h +include/giomm-%%API_VERSION%%/giomm/error.h +include/giomm-%%API_VERSION%%/giomm/file.h +include/giomm-%%API_VERSION%%/giomm/fileattributeinfo.h +include/giomm-%%API_VERSION%%/giomm/fileattributeinfolist.h +include/giomm-%%API_VERSION%%/giomm/fileenumerator.h +include/giomm-%%API_VERSION%%/giomm/fileicon.h +include/giomm-%%API_VERSION%%/giomm/fileinfo.h +include/giomm-%%API_VERSION%%/giomm/fileinputstream.h +include/giomm-%%API_VERSION%%/giomm/filemonitor.h +include/giomm-%%API_VERSION%%/giomm/filenamecompleter.h +include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h +include/giomm-%%API_VERSION%%/giomm/filterinputstream.h +include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h +include/giomm-%%API_VERSION%%/giomm/icon.h +include/giomm-%%API_VERSION%%/giomm/init.h +include/giomm-%%API_VERSION%%/giomm/inputstream.h +include/giomm-%%API_VERSION%%/giomm/loadableicon.h +include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h +include/giomm-%%API_VERSION%%/giomm/mount.h +include/giomm-%%API_VERSION%%/giomm/mountoperation.h +include/giomm-%%API_VERSION%%/giomm/outputstream.h +include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h +include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h +include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h +include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/desktopappinfo_p.h +include/giomm-%%API_VERSION%%/giomm/private/drive_p.h +include/giomm-%%API_VERSION%%/giomm/private/enums_p.h +include/giomm-%%API_VERSION%%/giomm/private/error_p.h +include/giomm-%%API_VERSION%%/giomm/private/file_p.h +include/giomm-%%API_VERSION%%/giomm/private/fileattributeinfo_p.h +include/giomm-%%API_VERSION%%/giomm/private/fileattributeinfolist_p.h +include/giomm-%%API_VERSION%%/giomm/private/fileenumerator_p.h +include/giomm-%%API_VERSION%%/giomm/private/fileicon_p.h +include/giomm-%%API_VERSION%%/giomm/private/fileinfo_p.h +include/giomm-%%API_VERSION%%/giomm/private/fileinputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/filemonitor_p.h +include/giomm-%%API_VERSION%%/giomm/private/filenamecompleter_p.h +include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/filterinputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/filteroutputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/icon_p.h +include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h +include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/mount_p.h +include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h +include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h +include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h +include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h +include/giomm-%%API_VERSION%%/giomm/private/volume_p.h +include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h +include/giomm-%%API_VERSION%%/giomm/seekable.h +include/giomm-%%API_VERSION%%/giomm/themedicon.h +include/giomm-%%API_VERSION%%/giomm/unixinputstream.h +include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h +include/giomm-%%API_VERSION%%/giomm/volume.h +include/giomm-%%API_VERSION%%/giomm/volumemonitor.h +include/giomm-%%API_VERSION%%/giomm/wrap_init.h include/glibmm-%%API_VERSION%%/glibmm.h include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h +include/glibmm-%%API_VERSION%%/glibmm/checksum.h include/glibmm-%%API_VERSION%%/glibmm/class.h include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h include/glibmm-%%API_VERSION%%/glibmm/containers.h @@ -12,6 +89,7 @@ include/glibmm-%%API_VERSION%%/glibmm/exception.h include/glibmm-%%API_VERSION%%/glibmm/exceptionhandler.h include/glibmm-%%API_VERSION%%/glibmm/fileutils.h include/glibmm-%%API_VERSION%%/glibmm/helperlist.h +include/glibmm-%%API_VERSION%%/glibmm/i18n-lib.h include/glibmm-%%API_VERSION%%/glibmm/i18n.h include/glibmm-%%API_VERSION%%/glibmm/init.h include/glibmm-%%API_VERSION%%/glibmm/interface.h @@ -28,6 +106,8 @@ include/glibmm-%%API_VERSION%%/glibmm/optioncontext.h include/glibmm-%%API_VERSION%%/glibmm/optionentry.h include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h include/glibmm-%%API_VERSION%%/glibmm/pattern.h +include/glibmm-%%API_VERSION%%/glibmm/priorities.h +include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h @@ -45,6 +125,7 @@ include/glibmm-%%API_VERSION%%/glibmm/private/shell_p.h include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h +include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h include/glibmm-%%API_VERSION%%/glibmm/property.h include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h @@ -65,6 +146,7 @@ include/glibmm-%%API_VERSION%%/glibmm/threadpool.h include/glibmm-%%API_VERSION%%/glibmm/timer.h include/glibmm-%%API_VERSION%%/glibmm/timeval.h include/glibmm-%%API_VERSION%%/glibmm/unicode.h +include/glibmm-%%API_VERSION%%/glibmm/uriutils.h include/glibmm-%%API_VERSION%%/glibmm/ustring.h include/glibmm-%%API_VERSION%%/glibmm/utility.h include/glibmm-%%API_VERSION%%/glibmm/value.h @@ -73,6 +155,7 @@ include/glibmm-%%API_VERSION%%/glibmm/value_custom.h include/glibmm-%%API_VERSION%%/glibmm/wrap.h include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h +lib/giomm-%%API_VERSION%%/include/giommconfig.h lib/glibmm-%%API_VERSION%%/include/glibmmconfig.h lib/glibmm-%%API_VERSION%%/proc/beautify_docs.pl lib/glibmm-%%API_VERSION%%/proc/generate_wrap_init.pl @@ -92,6 +175,7 @@ lib/glibmm-%%API_VERSION%%/proc/m4/convert.m4 lib/glibmm-%%API_VERSION%%/proc/m4/convert_atk.m4 lib/glibmm-%%API_VERSION%%/proc/m4/convert_base.m4 lib/glibmm-%%API_VERSION%%/proc/m4/convert_gdk.m4 +lib/glibmm-%%API_VERSION%%/proc/m4/convert_gio.m4 lib/glibmm-%%API_VERSION%%/proc/m4/convert_glib.m4 lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtk.m4 lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4 @@ -116,6 +200,10 @@ lib/glibmm-%%API_VERSION%%/proc/pm/Output.pm lib/glibmm-%%API_VERSION%%/proc/pm/Property.pm lib/glibmm-%%API_VERSION%%/proc/pm/Util.pm lib/glibmm-%%API_VERSION%%/proc/pm/WrapParser.pm +lib/libgiomm-%%VERSION%%.a +lib/libgiomm-%%VERSION%%.la +lib/libgiomm-%%VERSION%%.so +lib/libgiomm-%%VERSION%%.so.1 lib/libglibmm-%%VERSION%%.a lib/libglibmm-%%VERSION%%.la lib/libglibmm-%%VERSION%%.so @@ -124,6 +212,7 @@ lib/libglibmm_generate_extra_defs-%%VERSION%%.a lib/libglibmm_generate_extra_defs-%%VERSION%%.la lib/libglibmm_generate_extra_defs-%%VERSION%%.so lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1 +libdata/pkgconfig/giomm-%%API_VERSION%%.pc libdata/pkgconfig/glibmm-%%API_VERSION%%.pc share/aclocal/glibmm_check_perl.m4 @dirrm lib/glibmm-%%API_VERSION%%/proc/pm @@ -131,7 +220,12 @@ share/aclocal/glibmm_check_perl.m4 @dirrm lib/glibmm-%%API_VERSION%%/proc @dirrm lib/glibmm-%%API_VERSION%%/include @dirrm lib/glibmm-%%API_VERSION%% +@dirrm lib/giomm-%%API_VERSION%%/include +@dirrm lib/giomm-%%API_VERSION%% @dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs @dirrm include/glibmm-%%API_VERSION%%/glibmm/private @dirrm include/glibmm-%%API_VERSION%%/glibmm @dirrm include/glibmm-%%API_VERSION%% +@dirrm include/giomm-%%API_VERSION%%/giomm/private +@dirrm include/giomm-%%API_VERSION%%/giomm +@dirrm include/giomm-%%API_VERSION%% diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 2f8838f9b8fb..6d8c66993264 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/gnome-vfs/Makefile,v 1.1 2007/12/02 00:27:45 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/Makefile,v 1.182 2008/03/10 23:08:21 ahze Exp $ # PORTNAME= gnome-vfs -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.0 PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -28,7 +28,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ - libbonobo ltverhack referencehack + ltverhack referencehack USE_AUTOTOOLS= libtool:15 USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 5c7228b0867d..71b68d87f596 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfs-2.20.1.tar.bz2) = a350a5a3e201951d7e7867d0900df423 -SHA256 (gnome2/gnome-vfs-2.20.1.tar.bz2) = 37475d17350b0e54b2e0b7bdcd7effd04eafd96b4b07604ff7d941377dd112d3 -SIZE (gnome2/gnome-vfs-2.20.1.tar.bz2) = 1890300 +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 diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in index d7bb1e998f99..f8b22aaaf1b4 100644 --- a/devel/gnome-vfs/pkg-deinstall.in +++ b/devel/gnome-vfs/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports-stable/devel/gnome-vfs/pkg-deinstall.in,v 1.1 2007/12/02 00:27:46 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.17 2008/01/30 17:29:15 mezz Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in index 5be36cc435bb..72da3bf8ba79 100644 --- a/devel/gnome-vfs/pkg-install.in +++ b/devel/gnome-vfs/pkg-install.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports-stable/devel/gnome-vfs/pkg-install.in,v 1.1 2007/12/02 00:27:46 mezz Exp $ +# $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.17 2008/01/30 17:29:15 mezz Exp $ # # Restore gconf keys of libgnome. diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 606b21cb5f72..d1e23ffc8251 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -111,6 +111,7 @@ share/dbus-1/services/gnome-vfs-daemon.service share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/as/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo @@ -144,6 +145,7 @@ share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ka/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/kn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo @@ -220,3 +222,5 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrmtry share/locale/ku @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile index e01ed0f54a4b..2acfea609087 100644 --- a/devel/gnome-vfsmm/Makefile +++ b/devel/gnome-vfsmm/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.25 2007/09/17 16:37:10 marcus Exp $ +# $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.27 2008/03/08 16:44:51 marcus Exp $ # PORTNAME= gnome-vfsmm -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -30,7 +30,8 @@ CONFIGURE_ARGS= --enable-static PLIST_SUB= VERSION="2.6" API_VERSION="2.6" post-patch: - @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \ + @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples// ; \ + /^SUBDIRS =/s/docs//' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \ ${WRKSRC}/tools/extra_defs_gen/Makefile.in diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo index b70b4da67aa0..20c4c5507789 100644 --- a/devel/gnome-vfsmm/distinfo +++ b/devel/gnome-vfsmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 3da9908850655031a383998d0cda1f85 -SHA256 (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 5a2cdeab177278ccb8b2e55eb257d332d57c750ba698b4199b7798b45afa7690 -SIZE (gnome2/gnome-vfsmm-2.20.0.tar.bz2) = 344213 +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 diff --git a/devel/gnome-vfsmm/pkg-plist b/devel/gnome-vfsmm/pkg-plist index 5a23e55b3fc9..a117076e450b 100644 --- a/devel/gnome-vfsmm/pkg-plist +++ b/devel/gnome-vfsmm/pkg-plist @@ -1,6 +1,8 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/address.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/application-registry.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-2.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle-2.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/directory-handle.h @@ -18,6 +20,7 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-monitor.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/monitor-handle.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/address_p.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle-2_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/drive_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/enums_p.h @@ -26,11 +29,14 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-action_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-application_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-monitor_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/resolve-handle_p.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress-2_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/uri_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume-monitor_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/resolve-handle.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-2.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress-2.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/types.h diff --git a/devel/gstreamer-plugins-gconf/Makefile b/devel/gstreamer-plugins-gconf/Makefile index 28579979d91a..4fd80989507e 100644 --- a/devel/gstreamer-plugins-gconf/Makefile +++ b/devel/gstreamer-plugins-gconf/Makefile @@ -3,9 +3,10 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gstreamer-plugins-gconf/Makefile,v 1.6 2008/03/19 14:05:33 ahze Exp $ # -PORTREVISION= 4 +PORTREVISION= 2 CATEGORIES= devel COMMENT= Gstreamer gconf plugin diff --git a/devel/gstreamer-plugins-gio/Makefile b/devel/gstreamer-plugins-gio/Makefile new file mode 100644 index 000000000000..a149dfef3bae --- /dev/null +++ b/devel/gstreamer-plugins-gio/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: gstreamer-plugins-gio +# Date created: 21 April 2008 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/gstreamer-plugins-gio/Makefile,v 1.1 2008/03/21 04:14:18 ahze Exp $ +# + +PORTREVISION= 0 +CATEGORIES= devel + +COMMENT= Gstreamer gio (Glib I/O) plugin + +GST_PLUGIN= gio + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/devel/gstreamer-plugins-gnomevfs/Makefile b/devel/gstreamer-plugins-gnomevfs/Makefile index 91b767005357..ed689d4fb4f2 100644 --- a/devel/gstreamer-plugins-gnomevfs/Makefile +++ b/devel/gstreamer-plugins-gnomevfs/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gstreamer-plugins-gnomevfs/Makefile,v 1.6 2008/03/21 04:01:31 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= devel COMMENT= Gstreamer gnomevfs plugin diff --git a/devel/gstreamer-plugins-sdl/Makefile b/devel/gstreamer-plugins-sdl/Makefile index afca794f46ce..a6295e3fbab7 100644 --- a/devel/gstreamer-plugins-sdl/Makefile +++ b/devel/gstreamer-plugins-sdl/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/gstreamer-plugins-sdl/Makefile,v 1.5 2008/03/19 14:05:33 ahze Exp $ # -PORTREVISION= 4 +PORTREVISION= 2 CATEGORIES= devel COMMENT= Gstreamer SDL plugin diff --git a/devel/gstreamer-plugins-soup/Makefile b/devel/gstreamer-plugins-soup/Makefile new file mode 100644 index 000000000000..996824d2f7ae --- /dev/null +++ b/devel/gstreamer-plugins-soup/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: gstreamer-plugins-soup +# Date created: 9 Feb 2008 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/gstreamer-plugins-soup/Makefile,v 1.3 2008/03/19 14:05:33 ahze Exp $ +# + +PORTREVISION= 2 +CATEGORIES= devel + +COMMENT= Gstreamer soup http src plugin + +GST_PLUGIN= soup + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile new file mode 100644 index 000000000000..d52baa3468e1 --- /dev/null +++ b/devel/gvfs/Makefile @@ -0,0 +1,73 @@ +# New ports collection makefile for: gvfs +# Date created: 2007-11-06 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/gvfs/Makefile,v 1.21 2008/03/18 16:16:48 mezz Exp $ +# + +PORTNAME= gvfs +PORTVERSION= 0.2.1 +PORTREVISION= 1 +CATEGORIES= devel gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GNOME virtual file system + +LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ + hal.1:${PORTSDIR}/sysutils/hal \ + soup-2.4.1:${PORTSDIR}/devel/libsoup \ + gnome-keyring:${PORTSDIR}/security/gnome-keyring \ + avahi-client.3:${PORTSDIR}/net/avahi-app +RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount + +USE_BZIP2= yes +USE_GNOME= glib20 gnomehack gnomeprefix intlhack gconf2 +USE_GMAKE= yes +USE_GETTEXT= yes +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --disable-obexftp +OPTIONS= FUSE "Enable fuse" on \ + SAMBA "Enable Samba" on \ + GPHOTO2 "Enable Gphoto 2 camera support" on +# CDDA "Enable CDDA" on + +.include <bsd.port.pre.mk> + +.if defined(WITH_FUSE) && ${OSVERSION} >= 600000 +LIB_DEPENDS+= fuse.2:${PORTSDIR}/sysutils/fusefs-libs +PLIST_SUB+= FUSE="" +.else +CONFIGURE_ARGS+= --disable-fuse +PLIST_SUB+= FUSE="@comment " +.endif + +.if defined(WITH_SAMBA) +LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +PLIST_SUB+= SMB="" +.else +CONFIGURE_ARGS+= --disable-samba +PLIST_SUB+= SMB="@comment " +.endif + +#.if defined(WITH_CDDA) +#LIB_DEPENDS+= cdio_paranoia.0:${PORTSDIR}/sysutils/libcdio +#PLIST_SUB+= CDDA="" +#.else +CONFIGURE_ARGS+= --disable-cdda +PLIST_SUB+= CDDA="@comment " +#.endif + +.if defined(WITH_GPHOTO2) +LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 +PLIST_SUB+= GPHOTO2="" +.else +CONFIGURE_ARGS+= --disable-gphoto2 +PLIST_SUB+= GPHOTO2="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo new file mode 100644 index 000000000000..8449712a6c57 --- /dev/null +++ b/devel/gvfs/distinfo @@ -0,0 +1,3 @@ +MD5 (gvfs-0.2.1.tar.bz2) = 039e796a721bb178dd1759af76be5c13 +SHA256 (gvfs-0.2.1.tar.bz2) = bb51a59ab302f156a4ea2ec359be015229432728a4091576267ad4ed6b7c847b +SIZE (gvfs-0.2.1.tar.bz2) = 817139 diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in new file mode 100644 index 000000000000..7832811c4608 --- /dev/null +++ b/devel/gvfs/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- 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) diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in new file mode 100644 index 000000000000..ffbfd5878dc1 --- /dev/null +++ b/devel/gvfs/files/patch-client_Makefile.in @@ -0,0 +1,11 @@ +--- client/Makefile.in.orig 2008-02-11 20:05:14.000000000 -0500 ++++ client/Makefile.in 2008-02-11 20:05:42.000000000 -0500 +@@ -152,7 +152,7 @@ EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FUSE_CFLAGS = @FUSE_CFLAGS@ +-FUSE_LIBS = @FUSE_LIBS@ ++FUSE_LIBS = @FUSE_LIBS@ -lfuse + GCONF_CFLAGS = @GCONF_CFLAGS@ + GCONF_LIBS = @GCONF_LIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c new file mode 100644 index 000000000000..3733aa7e3cd9 --- /dev/null +++ b/devel/gvfs/files/patch-client_gvfsfusedaemon.c @@ -0,0 +1,12 @@ +--- client/gvfsfusedaemon.c.orig 2007-11-06 18:06:41.000000000 -0500 ++++ client/gvfsfusedaemon.c 2007-11-06 18:07:30.000000000 -0500 +@@ -28,7 +28,9 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/un.h> ++#ifdef __linux__ + #include <sys/vfs.h> ++#endif + #include <sys/time.h> + #include <unistd.h> + #include <stdlib.h> diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure new file mode 100644 index 000000000000..5187da5d4282 --- /dev/null +++ b/devel/gvfs/files/patch-configure @@ -0,0 +1,84 @@ +--- configure.orig 2008-02-25 16:48:49.000000000 -0500 ++++ configure 2008-02-25 16:51:17.000000000 -0500 +@@ -24589,7 +24589,7 @@ if test "x$enable_http" != "xno"; then + msg_http=yes + fi + +- if test "x$msg_http" == "xyes"; then ++ if test "x$msg_http" = "xyes"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for HTTP" >&5 +@@ -24857,7 +24857,7 @@ if test "x$enable_cdda" != "xno"; then + msg_cdda=yes + fi + +- if test "x$msg_cdda" == "xyes"; then ++ if test "x$msg_cdda" = "xyes"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for CDDA" >&5 +@@ -25008,7 +25008,7 @@ if test "x$enable_fuse" != "xno"; then + msg_fuse=yes + fi + +- if test "x$msg_fuse" == "xyes"; then ++ if test "x$msg_fuse" = "xyes"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for FUSE" >&5 +@@ -25159,7 +25159,7 @@ if test "x$enable_gconf" != "xno"; then + msg_gconf=yes + fi + +- if test "x$msg_gconf" == "xyes"; then ++ if test "x$msg_gconf" = "xyes"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for GCONF" >&5 +@@ -25312,7 +25312,7 @@ if test "x$enable_hal" != "xno"; then + msg_hal=yes + fi + +- if test "x$msg_hal" == "xyes"; then ++ if test "x$msg_hal" = "xyes"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for HAL" >&5 +@@ -25494,7 +25494,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de + have_hal_fast_init=yes + fi + +- if test "x$have_hal_fast_init" == "xyes"; then ++ if test "x$have_hal_fast_init" = "xyes"; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_HAL_FAST_INIT 1 +@@ -25540,13 +25540,16 @@ fi + *-linux*) + use_gphoto2=yes + ;; ++ *-freebsd*) ++ use_gphoto2=yes ++ ;; + *) + use_gphoto2=no + ;; + esac + +- if test "x$msg_gphoto2" == "xyes"; then +- if test "x$use_gphoto2" == "xyes"; then ++ if test "x$msg_gphoto2" = "xyes"; then ++ if test "x$use_gphoto2" = "xyes"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for GPHOTO2" >&5 +@@ -25702,7 +25705,7 @@ if test "x$enable_keyring" != "xno"; the + msg_keyring=yes + fi + +- if test "x$msg_keyring" == "xyes"; then ++ if test "x$msg_keyring" = "xyes"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for KEYRING" >&5 diff --git a/devel/gvfs/files/patch-daemon_gvfswritechannel.c b/devel/gvfs/files/patch-daemon_gvfswritechannel.c new file mode 100644 index 000000000000..54c4216873e4 --- /dev/null +++ b/devel/gvfs/files/patch-daemon_gvfswritechannel.c @@ -0,0 +1,10 @@ +--- daemon/gvfswritechannel.c.orig 2007-12-22 18:50:10.000000000 -0500 ++++ daemon/gvfswritechannel.c 2007-12-22 18:50:20.000000000 -0500 +@@ -30,6 +30,7 @@ + #include <sys/un.h> + #include <unistd.h> + #include <fcntl.h> ++#include <string.h> + + #include <glib.h> + #include <glib-object.h> diff --git a/devel/gvfs/files/patch-hal_ghalvolume.c b/devel/gvfs/files/patch-hal_ghalvolume.c new file mode 100644 index 000000000000..519718969441 --- /dev/null +++ b/devel/gvfs/files/patch-hal_ghalvolume.c @@ -0,0 +1,14 @@ +--- 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/pkg-descr b/devel/gvfs/pkg-descr new file mode 100644 index 000000000000..f6ea31130f4b --- /dev/null +++ b/devel/gvfs/pkg-descr @@ -0,0 +1,6 @@ +GVFS allows applications and users to treat any number of file system +concepts as a part of the local filesystem. With GVFS, filesystems across +the internet, on connected devices, and in multiple formats are as simple +to access (and write code for) as any directory on the local machine. + +WWW: http://www.gnome.org/ diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist new file mode 100644 index 000000000000..f1b4305b9c05 --- /dev/null +++ b/devel/gvfs/pkg-plist @@ -0,0 +1,112 @@ +bin/gvfs-cat +bin/gvfs-copy +bin/gvfs-info +bin/gvfs-less +bin/gvfs-ls +bin/gvfs-mkdir +bin/gvfs-monitor-dir +bin/gvfs-monitor-file +bin/gvfs-mount +bin/gvfs-move +bin/gvfs-open +bin/gvfs-rename +bin/gvfs-rm +bin/gvfs-save +bin/gvfs-trash +bin/gvfs-tree +etc/profile.d/gvfs-bash-completion.sh +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/libgvfsdbus.la +lib/gio/modules/libgvfsdbus.so +lib/libgvfscommon.la +lib/libgvfscommon.so +lib/libgvfscommon.so.0 +%%FUSE%%libexec/gvfs-fuse-daemon +libexec/gvfsd +libexec/gvfsd-archive +libexec/gvfsd-burn +libexec/gvfsd-computer +libexec/gvfsd-dav +libexec/gvfsd-dnssd +libexec/gvfsd-ftp +%%GPHOTO2%%libexec/gvfsd-gphoto2 +libexec/gvfsd-http +libexec/gvfsd-localtest +libexec/gvfsd-network +libexec/gvfsd-sftp +%%SMB%%libexec/gvfsd-smb +%%SMB%%libexec/gvfsd-smb-browse +libexec/gvfsd-trash +share/dbus-1/services/gvfs-daemon.service +share/gvfs/mounts/archive.mount +share/gvfs/mounts/burn.mount +share/gvfs/mounts/computer.mount +share/gvfs/mounts/dav.mount +share/gvfs/mounts/dns-sd.mount +share/gvfs/mounts/ftp.mount +%%GPHOTO2%%share/gvfs/mounts/gphoto2.mount +share/gvfs/mounts/http.mount +share/gvfs/mounts/localtest.mount +share/gvfs/mounts/network.mount +share/gvfs/mounts/sftp.mount +%%SMB%%share/gvfs/mounts/smb-browse.mount +%%SMB%%share/gvfs/mounts/smb.mount +share/gvfs/mounts/trash.mount +share/locale/ar/LC_MESSAGES/gvfs.mo +share/locale/be@latin/LC_MESSAGES/gvfs.mo +share/locale/bn_IN/LC_MESSAGES/gvfs.mo +share/locale/ca/LC_MESSAGES/gvfs.mo +share/locale/cs/LC_MESSAGES/gvfs.mo +share/locale/da/LC_MESSAGES/gvfs.mo +share/locale/de/LC_MESSAGES/gvfs.mo +share/locale/el/LC_MESSAGES/gvfs.mo +share/locale/en_GB/LC_MESSAGES/gvfs.mo +share/locale/es/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/gl/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/ko/LC_MESSAGES/gvfs.mo +share/locale/lt/LC_MESSAGES/gvfs.mo +share/locale/mk/LC_MESSAGES/gvfs.mo +share/locale/ml/LC_MESSAGES/gvfs.mo +share/locale/mr/LC_MESSAGES/gvfs.mo +share/locale/nb/LC_MESSAGES/gvfs.mo +share/locale/nl/LC_MESSAGES/gvfs.mo +share/locale/pa/LC_MESSAGES/gvfs.mo +share/locale/pl/LC_MESSAGES/gvfs.mo +share/locale/pt/LC_MESSAGES/gvfs.mo +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/sv/LC_MESSAGES/gvfs.mo +share/locale/ta/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 +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 %%DATADIR%%/mounts +@dirrm %%DATADIR%% +@dirrm include/gvfs-client/gvfs +@dirrm include/gvfs-client +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@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 diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index fe8bf8939a59..614ce3b69054 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libbonobo/Makefile,v 1.67 2007/10/17 21:36:11 mezz Exp $ +# $MCom: ports/devel/libbonobo/Makefile,v 1.71 2008/03/10 16:30:35 ahze Exp $ # PORTNAME= libbonobo -PORTVERSION= 2.20.4 +PORTVERSION= 2.22.0 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 9014fe169a5d..8fdd99c40ea0 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libbonobo-2.20.4.tar.bz2) = 36da8bfe57f2b93cde5537a3349583b8 -SHA256 (gnome2/libbonobo-2.20.4.tar.bz2) = 81796573e99c2a70255684e49d3326d2341cd6dd918082e53fdf9792c3f9168a -SIZE (gnome2/libbonobo-2.20.4.tar.bz2) = 1446532 +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 diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index af2dbb8849e3..1cbf066c87d1 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -97,6 +97,7 @@ share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl share/locale/am/LC_MESSAGES/libbonobo-2.0.mo share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo +share/locale/as/LC_MESSAGES/libbonobo-2.0.mo share/locale/az/LC_MESSAGES/libbonobo-2.0.mo share/locale/be/LC_MESSAGES/libbonobo-2.0.mo share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo @@ -205,3 +206,5 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @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 diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 8467154af8af..e7a846abb82c 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -3,23 +3,18 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/libgtop/Makefile,v 1.24 2007/09/16 17:22:25 ahze Exp $ +# $MCom: ports/devel/libgtop/Makefile,v 1.34 2008/03/10 21:59:17 mezz Exp $ # PORTNAME= libgtop -PORTVERSION= 2.20.1 -PORTREVISION= 1 +PORTVERSION= 2.22.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 COMMENT= GNOME 2 top library -LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt -RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof - USE_BZIP2= yes USE_PERL5_BUILD=yes USE_GETTEXT= yes @@ -36,6 +31,10 @@ INFO= libgtop2 .include <bsd.port.pre.mk> +.if ${OSVERSION} < 800019 +RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof +.endif + .if ${OSVERSION} >= 600000 PKGMESSAGE= ${FILESDIR}/pkg-message .endif diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index c2752cf6af14..41067cad3395 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgtop-2.20.1.tar.bz2) = b6fa671e8325bd8dbce684527791225a -SHA256 (gnome2/libgtop-2.20.1.tar.bz2) = 1e4d9cdedee5105c99a7bf3363e9bc375bff82923e24f55e475050937f482135 -SIZE (gnome2/libgtop-2.20.1.tar.bz2) = 770145 +MD5 (gnome2/libgtop-2.22.0.tar.bz2) = c4f15d95dea6441a08b4f2260996becd +SHA256 (gnome2/libgtop-2.22.0.tar.bz2) = f6e05fcc185d57c55bdd1f98d36f8a83ca0a335c150d3d7201505bc7dab3abcf +SIZE (gnome2/libgtop-2.22.0.tar.bz2) = 779243 diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in new file mode 100644 index 000000000000..e8a6bd895fa5 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_Makefile.in @@ -0,0 +1,28 @@ +--- 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 = + 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 + 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. + 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 + + 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@ diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c new file mode 100644 index 000000000000..90da05b1b71d --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_fsusage.c @@ -0,0 +1,61 @@ +--- 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 new file mode 100644 index 000000000000..7c1b1774cd89 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_mountlist.c @@ -0,0 +1,171 @@ +--- 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_procopenfiles.c b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c new file mode 100644 index 000000000000..93e596dcf5fb --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c @@ -0,0 +1,186 @@ +--- sysdeps/freebsd/procopenfiles.c.orig 2007-07-01 09:14:23.000000000 -0400 ++++ sysdeps/freebsd/procopenfiles.c 2008-02-10 02:45:20.000000000 -0500 +@@ -28,6 +28,13 @@ + #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> + #include <string.h> + #include <stdlib.h> + +@@ -46,6 +53,63 @@ _glibtop_init_proc_open_files_s (glibtop + server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files; + } + ++#if __FreeBSD_version > 800018 ++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 +223,105 @@ 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) + { ++#if __FreeBSD_version > 800018 ++ struct kinfo_file *freep, *kif; ++ int name[4]; ++ size_t len; ++ int i; ++#else + char *output; ++#endif + GArray *entries; + + memset(buf, 0, sizeof (glibtop_proc_open_files)); + ++#if __FreeBSD_version > 800018 ++ 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; ++ } ++ ++ entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry)); ++ ++ for (i = 0; i < len / sizeof(*kif); i++, kif++) { ++ glibtop_open_files_entry entry = {0}; ++ ++ 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 + + 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 new file mode 100644 index 000000000000..08a58359e584 --- /dev/null +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c @@ -0,0 +1,94 @@ +--- sysdeps/freebsd/procwd.c.orig 2008-02-09 12:46:32.000000000 -0500 ++++ sysdeps/freebsd/procwd.c 2008-02-09 12:48:24.000000000 -0500 +@@ -24,7 +24,9 @@ + #include <glibtop_private.h> + + #include <sys/types.h> ++#include <sys/sysctl.h> + #include <sys/param.h> ++#include <sys/user.h> + #include <string.h> + + static const unsigned long _glibtop_sysdeps_proc_wd = +@@ -38,6 +40,7 @@ _glibtop_init_proc_wd_s(glibtop *server) + server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd; + } + ++#if __FreeBSD_version < 800019 + static GPtrArray * + parse_output(const char *output, glibtop_proc_wd *buf) + { +@@ -89,12 +92,21 @@ 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 ++ struct kinfo_file *freep, *kif; ++ GPtrArray *dirs; ++ size_t len; ++ int i; ++ int name[4]; ++#else + char *output; ++#endif + + memset (buf, 0, sizeof (glibtop_proc_wd)); + +@@ -102,6 +114,43 @@ glibtop_get_proc_wd_s(glibtop *server, g + if (safe_readlink(path, buf->exe, sizeof(buf->exe))) + buf->flags |= (1 << GLIBTOP_PROC_WD_EXE); + ++#if __FreeBSD_version > 800018 ++ 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; ++ } ++ ++ dirs = g_ptr_array_sized_new(1); ++ ++ for (i = 0; i < len / sizeof(*kif); i++, kif++) { ++ 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 +165,7 @@ glibtop_get_proc_wd_s(glibtop *server, g + + return (char **)g_ptr_array_free(dirs, FALSE); + } ++#endif + + return NULL; + } diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index 88f66a24bd55..91e8d83abe47 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -139,6 +139,7 @@ share/locale/mi/LC_MESSAGES/libgtop-2.0.mo share/locale/mk/LC_MESSAGES/libgtop-2.0.mo share/locale/ml/LC_MESSAGES/libgtop-2.0.mo share/locale/mn/LC_MESSAGES/libgtop-2.0.mo +share/locale/mr/LC_MESSAGES/libgtop-2.0.mo share/locale/ms/LC_MESSAGES/libgtop-2.0.mo share/locale/nb/LC_MESSAGES/libgtop-2.0.mo share/locale/ne/LC_MESSAGES/libgtop-2.0.mo @@ -182,6 +183,8 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo @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/mi/LC_MESSAGES @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile index 265d4eccfedc..a4141c397703 100644 --- a/devel/liboil/Makefile +++ b/devel/liboil/Makefile @@ -3,20 +3,19 @@ # Whom: ijliao # # $FreeBSD$ +# $MCom: ports/devel/liboil/Makefile,v 1.7 2008/03/23 06:57:57 marcus Exp $ # $Id: Makefile 23 2006-10-25 14:24:32Z buhnux $ PORTNAME= liboil -PORTVERSION= 0.3.12 +PORTVERSION= 0.3.14 CATEGORIES= devel -MASTER_SITES= http://liboil.freedesktop.org/download/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= ahze +MASTER_SITES= http://liboil.freedesktop.org/download/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Library of optimized inner loops -USE_GNOME= pkgconfig gnomehack gnometarget -GNU_CONFIGURE= yes +USE_GNOME= pkgconfig gnomehack gnometarget ltverhack +USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ --disable-glib diff --git a/devel/liboil/distinfo b/devel/liboil/distinfo index 284e75511acf..372e8aa25773 100644 --- a/devel/liboil/distinfo +++ b/devel/liboil/distinfo @@ -1,3 +1,3 @@ -MD5 (liboil-0.3.12.tar.gz) = 96ee4c627ffb0db3999cef3c7454b1d9 -SHA256 (liboil-0.3.12.tar.gz) = 9be2cdd17214935b0dd2bac1508c9db1df88c60bba91652f0a2944aa93a7b53d -SIZE (liboil-0.3.12.tar.gz) = 810532 +MD5 (liboil-0.3.14.tar.gz) = 7a9f719e50656b795c06c0167012a84f +SHA256 (liboil-0.3.14.tar.gz) = a40c09db6ee24e03aa81f58329a57e45e55462a2e0f619b3796d4bf942c23f2f +SIZE (liboil-0.3.14.tar.gz) = 819559 diff --git a/devel/liboil/pkg-plist b/devel/liboil/pkg-plist index 57057fa781fd..bbf34358c86c 100644 --- a/devel/liboil/pkg-plist +++ b/devel/liboil/pkg-plist @@ -4,6 +4,7 @@ include/liboil-0.3/liboil/liboil.h include/liboil-0.3/liboil/liboilclasses.h include/liboil-0.3/liboil/liboilcpu.h include/liboil-0.3/liboil/liboildebug.h +include/liboil-0.3/liboil/liboilfault.h include/liboil-0.3/liboil/liboilfuncs.h include/liboil-0.3/liboil/liboilfunction.h include/liboil-0.3/liboil/liboilgcc.h @@ -14,10 +15,11 @@ include/liboil-0.3/liboil/liboilprototype.h include/liboil-0.3/liboil/liboilrandom.h include/liboil-0.3/liboil/liboiltest.h include/liboil-0.3/liboil/liboiltypes.h +include/liboil-0.3/liboil/liboilutils.h lib/liboil-0.3.a lib/liboil-0.3.la lib/liboil-0.3.so -lib/liboil-0.3.so.1 +lib/liboil-0.3.so.0 libdata/pkgconfig/liboil-0.3.pc share/gtk-doc/html/liboil/ch01.html share/gtk-doc/html/liboil/ch02.html diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile index b9f987d7cd72..836643c0a7cb 100644 --- a/devel/liboobs/Makefile +++ b/devel/liboobs/Makefile @@ -3,20 +3,21 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/liboobs/Makefile,v 1.23 2007/09/16 16:45:35 ahze Exp $ +# $MCom: ports/devel/liboobs/Makefile,v 1.35 2008/03/09 18:52:59 mezz Exp $ # PORTNAME= liboobs -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.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 COMMENT= Wrapping library to the System Tools Backends BUILD_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/system-tools-backends.conf:${PORTSDIR}/sysutils/system-tools-backends -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + hal.1:${PORTSDIR}/sysutils/hal RUN_DEPENDS= ${LOCALBASE}/etc/dbus-1/system.d/system-tools-backends.conf:${PORTSDIR}/sysutils/system-tools-backends USE_BZIP2= yes @@ -24,5 +25,6 @@ GNU_CONFIGURE= yes USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" .include <bsd.port.mk> diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo index de4bba60f2af..b1099f55b21a 100644 --- a/devel/liboobs/distinfo +++ b/devel/liboobs/distinfo @@ -1,3 +1,3 @@ -MD5 (liboobs-2.20.0.tar.bz2) = c0562e115af4777da471182b9d462b40 -SHA256 (liboobs-2.20.0.tar.bz2) = 45a3cd562ac6d0002dc5c5972e1b4ec7fe611fe7ed9d0d8da9dbaaffd1c04623 -SIZE (liboobs-2.20.0.tar.bz2) = 331456 +MD5 (gnome2/liboobs-2.22.0.tar.bz2) = 1b090ecd6c0df58b131795ff9a5c9057 +SHA256 (gnome2/liboobs-2.22.0.tar.bz2) = b35760855d7d1def532e9e808cecde29b75cec455b238590072abf4a8206536e +SIZE (gnome2/liboobs-2.22.0.tar.bz2) = 340348 diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c index e571a363fdb0..484b86f32e64 100644 --- a/devel/liboobs/files/patch-src_oobs-user.c +++ b/devel/liboobs/files/patch-src_oobs-user.c @@ -1,6 +1,6 @@ ---- oobs/oobs-user.c.orig Fri Sep 15 19:16:41 2006 -+++ oobs/oobs-user.c Tue Oct 31 23:12:29 2006 -@@ -18,6 +18,10 @@ +--- oobs/oobs-user.c.orig 2007-10-30 09:16:53.406333206 -0400 ++++ oobs/oobs-user.c 2007-10-30 09:40:02.560797530 -0400 +@@ -18,12 +18,18 @@ * Authors: Carlos Garnacho Parro <carlosg@gnome.org> */ @@ -11,13 +11,25 @@ #include <glib-object.h> #include <sys/types.h> #include <unistd.h> -@@ -30,7 +34,9 @@ - #include "oobs-group.h" - #include "oobs-defines.h" - #include "utils.h" + #include <stdlib.h> + #include <string.h> +#ifdef HAVE_CRYPT_H #include <crypt.h> +#endif + #include <utmp.h> - #define OOBS_USER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_USER, OobsUserPrivate)) + #include "oobs-usersconfig.h" +@@ -852,6 +858,7 @@ + login = oobs_user_get_login_name (user); + ++#if 0 /* FreeBSD does not have ut_type in utmp */ + while (!match && (entry = getutent ()) != NULL) + { + match = (entry->ut_type == USER_PROCESS && +@@ -862,4 +869,5 @@ + endutent (); + + return match; ++#endif + } diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist index a36b53d54b73..f6cb6c5e0d11 100644 --- a/devel/liboobs/pkg-plist +++ b/devel/liboobs/pkg-plist @@ -3,9 +3,8 @@ include/liboobs-1.0/oobs/oobs-groupsconfig.h include/liboobs-1.0/oobs/oobs-hostsconfig.h include/liboobs-1.0/oobs/oobs-iface-ethernet.h include/liboobs-1.0/oobs/oobs-iface-irlan.h -include/liboobs-1.0/oobs/oobs-iface-isdn.h -include/liboobs-1.0/oobs/oobs-iface-modem.h include/liboobs-1.0/oobs/oobs-iface-plip.h +include/liboobs-1.0/oobs/oobs-iface-ppp.h include/liboobs-1.0/oobs/oobs-iface-wireless.h include/liboobs-1.0/oobs/oobs-iface.h include/liboobs-1.0/oobs/oobs-ifacesconfig.h @@ -15,6 +14,7 @@ include/liboobs-1.0/oobs/oobs-ntpconfig.h include/liboobs-1.0/oobs/oobs-ntpserver.h include/liboobs-1.0/oobs/oobs-object.h include/liboobs-1.0/oobs/oobs-result.h +include/liboobs-1.0/oobs/oobs-selfconfig.h include/liboobs-1.0/oobs/oobs-service.h include/liboobs-1.0/oobs/oobs-servicesconfig.h include/liboobs-1.0/oobs/oobs-session.h @@ -30,15 +30,13 @@ include/liboobs-1.0/oobs/oobs.h lib/liboobs-1.a lib/liboobs-1.la lib/liboobs-1.so -lib/liboobs-1.so.3 +lib/liboobs-1.so.4 libdata/pkgconfig/liboobs-1.pc %%DOCSDIR%%/OobsGroup.html %%DOCSDIR%%/OobsGroupsConfig.html %%DOCSDIR%%/OobsIface.html %%DOCSDIR%%/OobsIfaceEthernet.html %%DOCSDIR%%/OobsIfaceIRLan.html -%%DOCSDIR%%/OobsIfaceISDN.html -%%DOCSDIR%%/OobsIfaceModem.html %%DOCSDIR%%/OobsIfacePlip.html %%DOCSDIR%%/OobsIfaceWireless.html %%DOCSDIR%%/OobsIfacesConfig.html @@ -70,6 +68,8 @@ libdata/pkgconfig/liboobs-1.pc %%DOCSDIR%%/index.sgml %%DOCSDIR%%/left.png %%DOCSDIR%%/liboobs-OobsHostsConfig.html +%%DOCSDIR%%/liboobs-OobsIfaceISDN.html +%%DOCSDIR%%/liboobs-OobsIfaceModem.html %%DOCSDIR%%/liboobs-OobsNTPServer.html %%DOCSDIR%%/liboobs.devhelp %%DOCSDIR%%/liboobs.devhelp2 diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile index 997aa2669928..79b894f2775f 100644 --- a/devel/libsigc++20/Makefile +++ b/devel/libsigc++20/Makefile @@ -3,10 +3,11 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/devel/libsigc++20/Makefile,v 1.11 2008/03/10 15:08:22 ahze Exp $ # PORTNAME= libsigc++ -PORTVERSION= 2.0.18 +PORTVERSION= 2.2.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/libsigc++/${PORTVERSION:R} diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo index ee29f9fbd980..a5ee58a513b6 100644 --- a/devel/libsigc++20/distinfo +++ b/devel/libsigc++20/distinfo @@ -1,3 +1,3 @@ -MD5 (libsigc++-2.0.18.tar.bz2) = ddebf5aafc8525d10366a8724abc9f28 -SHA256 (libsigc++-2.0.18.tar.bz2) = 53e7d030b73815a31781c26acb42f7880df3e786ed46a8fe3cde08a4c21ecceb -SIZE (libsigc++-2.0.18.tar.bz2) = 1842485 +MD5 (libsigc++-2.2.2.tar.bz2) = 962493fd6b26425f21504c3416c4efa1 +SHA256 (libsigc++-2.2.2.tar.bz2) = 3df7d2750fd579d0776130eb4cf117c4a584677123d1447c0758a0f0a750e2a2 +SIZE (libsigc++-2.2.2.tar.bz2) = 4502360 diff --git a/devel/libsigc++20/pkg-plist b/devel/libsigc++20/pkg-plist index f18cfb743999..da2d43c97d77 100644 --- a/devel/libsigc++20/pkg-plist +++ b/devel/libsigc++20/pkg-plist @@ -31,7 +31,6 @@ include/sigc++-%%API_VERSION%%/sigc++/adaptors/retype_return.h include/sigc++-%%API_VERSION%%/sigc++/bind.h include/sigc++-%%API_VERSION%%/sigc++/bind_return.h include/sigc++-%%API_VERSION%%/sigc++/class_slot.h -include/sigc++-%%API_VERSION%%/sigc++/compatibility.h include/sigc++-%%API_VERSION%%/sigc++/connection.h include/sigc++-%%API_VERSION%%/sigc++/functors/functor_trait.h include/sigc++-%%API_VERSION%%/sigc++/functors/functors.h @@ -88,59 +87,10 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/bind_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/bind__return_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/bound__argument_8h.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal0-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal0.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal0__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal1-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal1.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal1__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal2-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal2.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal2__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal3-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal3.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal3__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal4-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal4.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal4__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal5-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal5.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal5__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal6-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal6.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal6__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal7-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal7.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Signal7__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot0-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot0.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot0__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot1-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot1.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot1__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot2-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot2.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot2__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot3-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot3.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot3__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot4-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot4.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot4__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot5-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot5.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot5__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot6-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot6.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot6__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot7-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot7.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classSigC_1_1Slot7__inherit__graph.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/class__slot_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classes.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classinternal_1_1lambda__core.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classinternal_1_1lambda__core__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classnil.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1bound__argument-members.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1bound__argument.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4-members.html @@ -439,11 +389,9 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1volatile__mem__functor7-members.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1volatile__mem__functor7.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/classsigc_1_1volatile__mem__functor7__inherit__graph.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/compatibility_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/compose_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/connection_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/deduce__result__type_8h.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/deprecated.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/doxygen.css %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/doxygen.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/exception__catch_8h.html @@ -504,26 +452,40 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_type_0x74.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_type_0x76.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x61.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x62.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x63.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x64.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x65.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x66.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x67.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x69.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x6c.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x6f.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x70.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x72.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x73.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x74.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functions_vars_0x76.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functor__trait_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functors_2slot_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/functors_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x62.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x63.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x64.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x65.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x66.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x67.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x68.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x6d.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x6f.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x70.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x72.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x73.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x75.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_0x76.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_defs.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x63.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x64.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x65.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x67.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x68.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x6d.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x6f.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x70.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x72.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x73.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x75.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_func_0x76.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_type.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/globals_vars.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/graph_legend.dot %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/graph_legend.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/graph_legend.png @@ -532,7 +494,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__adaptors.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__bind.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__bind.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__compat.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__compose.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__compose.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/group__exception__catch.html @@ -740,7 +701,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__260.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__261.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__262.png -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__263.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__27.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__28.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/inherit__graph__29.png @@ -827,7 +787,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/mem__fun_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/method__slot_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/modules.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/namespaceSigC.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/namespacemembers.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/namespacemembers_0x62.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/namespacemembers_0x63.html @@ -864,7 +823,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/object_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/object__slot_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/operator_8h.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/pages.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/ptr__fun_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/reference__wrapper_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/retype_8h.html @@ -875,11 +833,6 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/signal__base_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/slot_8h.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/slot__base_8h.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor_1_1deduce__result__type-members.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor_1_1deduce__result__type.html -%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structSigC_1_1retype__slot__functor__inherit__graph.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1adaptor__base.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1adaptor__base__inherit__graph.png %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1adaptor__functor-members.html @@ -1114,6 +1067,10 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__rep-members.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__rep.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__rep__inherit__graph.png +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__reverse__iterator__buf-members.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__reverse__iterator__buf.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__reverse__iterator__buf_3_01T__emitter_00_01void_01_4-members.html +%%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1slot__reverse__iterator__buf_3_01T__emitter_00_01void_01_4.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1temp__slot__list-members.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1temp__slot__list.html %%PORTDOCS%%share/doc/libsigc-%%API_VERSION%%/docs/reference/html/structsigc_1_1internal_1_1trackable__callback-members.html diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 3456c3df1567..49c233f002d2 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/libsoup/Makefile,v 1.7 2007/12/01 19:19:55 marcus Exp $ +# $MCom: ports/devel/libsoup/Makefile,v 1.42 2008/03/10 21:18:42 mezz Exp $ # PORTNAME= libsoup -PORTVERSION= 2.2.105 -PORTREVISION?= 1 +PORTVERSION= 2.4.0 +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 @@ -32,7 +31,7 @@ CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.2" +PLIST_SUB= VERSION="2.4" .if !defined(WITHOUT_SSL) LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo index c808f4cd3ca0..379868111b5d 100644 --- a/devel/libsoup/distinfo +++ b/devel/libsoup/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libsoup-2.2.105.tar.bz2) = 7fa48b06a0e2b0ff3d2fa45cf331f169 -SHA256 (gnome2/libsoup-2.2.105.tar.bz2) = 3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f -SIZE (gnome2/libsoup-2.2.105.tar.bz2) = 505095 +MD5 (gnome2/libsoup-2.4.0.tar.bz2) = 16d325a14ee4da61f72fb21cd3ffa439 +SHA256 (gnome2/libsoup-2.4.0.tar.bz2) = 400104f0ad7b805ba534295ed17e6426a8ce41eb425dc2b0a56a2b75665c065a +SIZE (gnome2/libsoup-2.4.0.tar.bz2) = 615898 diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist index 24f7140d1e00..915831c2d51f 100644 --- a/devel/libsoup/pkg-plist +++ b/devel/libsoup/pkg-plist @@ -1,32 +1,34 @@ include/libsoup-%%VERSION%%/libsoup/soup-address.h -include/libsoup-%%VERSION%%/libsoup/soup-connection.h +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-date.h +include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h +include/libsoup-%%VERSION%%/libsoup/soup-form.h include/libsoup-%%VERSION%%/libsoup/soup-headers.h -include/libsoup-%%VERSION%%/libsoup/soup-message-filter.h -include/libsoup-%%VERSION%%/libsoup/soup-message-queue.h +include/libsoup-%%VERSION%%/libsoup/soup-logger.h +include/libsoup-%%VERSION%%/libsoup/soup-message-body.h +include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h include/libsoup-%%VERSION%%/libsoup/soup-message.h include/libsoup-%%VERSION%%/libsoup/soup-method.h include/libsoup-%%VERSION%%/libsoup/soup-misc.h include/libsoup-%%VERSION%%/libsoup/soup-portability.h -include/libsoup-%%VERSION%%/libsoup/soup-server-auth.h -include/libsoup-%%VERSION%%/libsoup/soup-server-message.h include/libsoup-%%VERSION%%/libsoup/soup-server.h include/libsoup-%%VERSION%%/libsoup/soup-session-async.h include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h include/libsoup-%%VERSION%%/libsoup/soup-session.h -include/libsoup-%%VERSION%%/libsoup/soup-soap-message.h -include/libsoup-%%VERSION%%/libsoup/soup-soap-response.h include/libsoup-%%VERSION%%/libsoup/soup-socket.h include/libsoup-%%VERSION%%/libsoup/soup-status.h include/libsoup-%%VERSION%%/libsoup/soup-types.h include/libsoup-%%VERSION%%/libsoup/soup-uri.h -include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-message.h -include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-response.h +include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h +include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h include/libsoup-%%VERSION%%/libsoup/soup.h lib/libsoup-%%VERSION%%.a lib/libsoup-%%VERSION%%.la lib/libsoup-%%VERSION%%.so -lib/libsoup-%%VERSION%%.so.8 +lib/libsoup-%%VERSION%%.so.1 libdata/pkgconfig/libsoup-%%VERSION%%.pc @dirrm include/libsoup-%%VERSION%%/libsoup @dirrm include/libsoup-%%VERSION%% diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index 3456c3df1567..f6385a655c34 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/devel/libsoup/Makefile,v 1.7 2007/12/01 19:19:55 marcus Exp $ +# $MCom: ports/devel/libsoup22/Makefile,v 1.40 2008/03/04 20:28:19 mezz Exp $ # PORTNAME= libsoup PORTVERSION= 2.2.105 -PORTREVISION?= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,12 +17,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A SOAP (Simple Object Access Protocol) implementation in C -USE_BZIP2= yes - -.if !defined(REFERENCE_PORT) - LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +NO_LATEST_LINK= yes + +USE_BZIP2= yes USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 @@ -49,5 +48,3 @@ pre-everything:: @${ECHO_MSG} "" .include <bsd.port.post.mk> - -.endif diff --git a/devel/libvolume_id/Makefile b/devel/libvolume_id/Makefile index 0658217f5806..06487905df37 100644 --- a/devel/libvolume_id/Makefile +++ b/devel/libvolume_id/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= libvolume_id -PORTVERSION= 0.75.0 -PORTREVISION= 1 +PORTVERSION= 0.81.0 CATEGORIES= devel MASTER_SITES= http://www.marcuscom.com/downloads/ diff --git a/devel/libvolume_id/distinfo b/devel/libvolume_id/distinfo index 9cf44d0fe7b8..c7035610c20f 100644 --- a/devel/libvolume_id/distinfo +++ b/devel/libvolume_id/distinfo @@ -1,3 +1,3 @@ -MD5 (libvolume_id-0.75.0.tar.bz2) = 804d222ea29b9401fb4a6ba00a22b072 -SHA256 (libvolume_id-0.75.0.tar.bz2) = 54072554468f732e60dae024947efaa880cf7847df2651b6dfcc16f2a58832d8 -SIZE (libvolume_id-0.75.0.tar.bz2) = 19408 +MD5 (libvolume_id-0.81.0.tar.bz2) = d5a66bb607e9811f28d40ee3ac8580e0 +SHA256 (libvolume_id-0.81.0.tar.bz2) = 2f6b685893a15d2d4d578bd41692e3091dcfcf88973a23bb0c6b02b266b8f5b6 +SIZE (libvolume_id-0.81.0.tar.bz2) = 23274 diff --git a/devel/libvolume_id/files/patch-fat.c b/devel/libvolume_id/files/patch-fat.c deleted file mode 100644 index 2780d613c9de..000000000000 --- a/devel/libvolume_id/files/patch-fat.c +++ /dev/null @@ -1,38 +0,0 @@ ---- fat.c.orig Wed May 30 16:16:49 2007 -+++ fat.c Wed May 30 16:17:12 2007 -@@ -277,7 +277,7 @@ magic: - - label = get_attr_volume_id(dir, root_dir_entries); - -- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200); -+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size); - if (vs == NULL) - return -1; - -@@ -294,7 +294,7 @@ magic: - fat32: - /* FAT32 should have a valid signature in the fsinfo block */ - fsinfo_sect = le16_to_cpu(vs->type.fat32.fsinfo_sector); -- buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), 0x200); -+ buf = volume_id_get_buffer(id, off + (fsinfo_sect * sector_size), sector_size); - if (buf == NULL) - return -1; - fsinfo = (struct fat32_fsinfo *) buf; -@@ -303,7 +303,7 @@ fat32: - if (memcmp(fsinfo->signature2, "\x72\x72\x41\x61", 4) != 0) - err("Found invalid signature2: 0x%08x", fsinfo->signature2); - -- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200); -+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size); - if (vs == NULL) - return -1; - -@@ -355,7 +355,7 @@ fat32: - if (maxloop == 0) - dbg("reached maximum follow count of root cluster chain, give up"); - -- vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, 0x200); -+ vs = (struct vfat_super_block *) volume_id_get_buffer(id, off, sector_size); - if (vs == NULL) - return -1; - diff --git a/devel/ndesk-dbus-glib/Makefile b/devel/ndesk-dbus-glib/Makefile new file mode 100644 index 000000000000..ed33c09edfdf --- /dev/null +++ b/devel/ndesk-dbus-glib/Makefile @@ -0,0 +1,35 @@ +# New ports collection makefile for: ndesk-dbus-glib +# Date created: 14 January 2008 +# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/ndesk-dbus-glib/Makefile,v 1.2 2008/01/14 22:35:41 mezz Exp $ +# + +PORTNAME= ndesk-dbus-glib +PORTVERSION= 0.4.1 +CATEGORIES= devel +MASTER_SITES= http://www.ndesk.org/archive/ndesk-dbus/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GLib main loop integration for Managed D-Bus + +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus + +USE_GMAKE= yes +USE_GNOME= gnomehack gnometarget +GNU_CONFIGURE= yes + +DOCS= AUTHORS COPYING README + +.ifndef (NOPORTDOCS) +post-install: + @${MKDIR} ${DOCSDIR} +.for i in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} +.endfor +.endif + +.include "${.CURDIR}/../../lang/mono/bsd.mono.mk" +.include <bsd.port.mk> diff --git a/devel/ndesk-dbus-glib/distinfo b/devel/ndesk-dbus-glib/distinfo new file mode 100644 index 000000000000..5846a183a5be --- /dev/null +++ b/devel/ndesk-dbus-glib/distinfo @@ -0,0 +1,3 @@ +MD5 (ndesk-dbus-glib-0.4.1.tar.gz) = 7faf8770b214956fa9de009def550826 +SHA256 (ndesk-dbus-glib-0.4.1.tar.gz) = 0a6d5fe7be55b6301615d71b89507b712f287b4ba498b798301333ffabe06769 +SIZE (ndesk-dbus-glib-0.4.1.tar.gz) = 85471 diff --git a/devel/ndesk-dbus-glib/pkg-descr b/devel/ndesk-dbus-glib/pkg-descr new file mode 100644 index 000000000000..f2e74523916c --- /dev/null +++ b/devel/ndesk-dbus-glib/pkg-descr @@ -0,0 +1,3 @@ +This code provides GLib main loop integration for Managed D-Bus. + +WWW: http://www.ndesk.org/DBusSharp diff --git a/devel/ndesk-dbus-glib/pkg-plist b/devel/ndesk-dbus-glib/pkg-plist new file mode 100644 index 000000000000..f669faa767b3 --- /dev/null +++ b/devel/ndesk-dbus-glib/pkg-plist @@ -0,0 +1,12 @@ +lib/mono/gac/NDesk.DBus.GLib/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.GLib.dll +lib/mono/gac/NDesk.DBus.GLib/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.GLib.dll.config +lib/mono/gac/NDesk.DBus.GLib/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.GLib.dll.mdb +lib/mono/ndesk-dbus-glib-1.0/NDesk.DBus.GLib.dll +libdata/pkgconfig/ndesk-dbus-glib-1.0.pc +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/mono/ndesk-dbus-glib-1.0 +@dirrm lib/mono/gac/NDesk.DBus.GLib/1.0.0.0__f6716e4f9b2ed099 +@dirrm lib/mono/gac/NDesk.DBus.GLib diff --git a/devel/ndesk-dbus/Makefile b/devel/ndesk-dbus/Makefile new file mode 100644 index 000000000000..0b5b085c7466 --- /dev/null +++ b/devel/ndesk-dbus/Makefile @@ -0,0 +1,35 @@ +# New ports collection makefile for: ndesk-dbus +# Date created: 14 January 2008 +# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/devel/ndesk-dbus/Makefile,v 1.2 2008/01/14 22:35:41 mezz Exp $ +# + +PORTNAME= ndesk-dbus +PORTVERSION= 0.6.0 +CATEGORIES= devel +MASTER_SITES= http://www.ndesk.org/archive/ndesk-dbus/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A C\# implementation of D-Bus + +BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono +RUN_DEPENDS= mono:${PORTSDIR}/lang/mono + +USE_GMAKE= yes +USE_GNOME= gnomehack gnometarget +GNU_CONFIGURE= yes + +DOCS= AUTHORS COPYING README + +.ifndef (NOPORTDOCS) +post-install: + @${MKDIR} ${DOCSDIR} +.for i in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} +.endfor +.endif + +.include "${.CURDIR}/../../lang/mono/bsd.mono.mk" +.include <bsd.port.mk> diff --git a/devel/ndesk-dbus/distinfo b/devel/ndesk-dbus/distinfo new file mode 100644 index 000000000000..fe9c62ff8519 --- /dev/null +++ b/devel/ndesk-dbus/distinfo @@ -0,0 +1,3 @@ +MD5 (ndesk-dbus-0.6.0.tar.gz) = 5157ba105c9ac491f6e900bc78d1791f +SHA256 (ndesk-dbus-0.6.0.tar.gz) = 252322f18e906ba7e64cecd0baec08d1a0109206777a5507a713e12def126424 +SIZE (ndesk-dbus-0.6.0.tar.gz) = 122303 diff --git a/devel/ndesk-dbus/pkg-descr b/devel/ndesk-dbus/pkg-descr new file mode 100644 index 000000000000..dbc41441dacd --- /dev/null +++ b/devel/ndesk-dbus/pkg-descr @@ -0,0 +1,8 @@ +This is a C# implementation of D-Bus. It's often referred to as "managed +D-Bus" to avoid confusion with existing bindings (which wrap libdbus). + +D-Bus is an inter-process communication framework that lets applications +interface with the system event bus as well as allowing them to talk to +one another in a peer-to-peer configuration. + +WWW: http://www.ndesk.org/DBusSharp diff --git a/devel/ndesk-dbus/pkg-plist b/devel/ndesk-dbus/pkg-plist new file mode 100644 index 000000000000..43615a4a2abf --- /dev/null +++ b/devel/ndesk-dbus/pkg-plist @@ -0,0 +1,11 @@ +lib/mono/gac/NDesk.DBus/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.dll +lib/mono/gac/NDesk.DBus/1.0.0.0__f6716e4f9b2ed099/NDesk.DBus.dll.mdb +lib/mono/ndesk-dbus-1.0/NDesk.DBus.dll +libdata/pkgconfig/ndesk-dbus-1.0.pc +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/mono/ndesk-dbus-1.0 +@dirrm lib/mono/gac/NDesk.DBus/1.0.0.0__f6716e4f9b2ed099 +@dirrm lib/mono/gac/NDesk.DBus diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index b3cff746a453..e883ac0d75cf 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/pkg-config/Makefile,v 1.9 2007/07/01 20:46:42 mezz Exp $ +# $MCom: ports/devel/pkg-config/Makefile,v 1.12 2008/02/04 19:22:00 mezz Exp $ # PORTNAME= pkg-config -PORTVERSION= 0.22 +PORTVERSION= 0.23 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index 9e0e9994a30e..459710f196c9 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pkg-config-0.22.tar.gz) = fd5c547e9d66ba49bc735ccb8c791f2a -SHA256 (gnome2/pkg-config-0.22.tar.gz) = 7e0761b47d604847006e7c6caa9b9cf044530a516ff84395450edcfa3c2febe6 -SIZE (gnome2/pkg-config-0.22.tar.gz) = 1006425 +MD5 (gnome2/pkg-config-0.23.tar.gz) = d922a88782b64441d06547632fd85744 +SHA256 (gnome2/pkg-config-0.23.tar.gz) = 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53 +SIZE (gnome2/pkg-config-0.23.tar.gz) = 1032839 diff --git a/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in b/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in index 330415ed6f92..0031087c84c1 100644 --- a/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in +++ b/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in @@ -1,5 +1,5 @@ ---- glib-1.2.8/Makefile.in.orig Tue Apr 12 13:51:56 2005 -+++ glib-1.2.8/Makefile.in Tue Apr 12 13:52:41 2005 +--- glib-1.2.10/Makefile.in.orig Tue Apr 12 13:51:56 2005 ++++ glib-1.2.10/Makefile.in Tue Apr 12 13:52:41 2005 @@ -727,7 +727,6 @@ installdirs-am: diff --git a/devel/pkg-config/files/patch-pkg.c b/devel/pkg-config/files/patch-pkg.c new file mode 100644 index 000000000000..48315feb9589 --- /dev/null +++ b/devel/pkg-config/files/patch-pkg.c @@ -0,0 +1,14 @@ +diff -Naur pkg-config-0.23-old/pkg.c pkg-config-0.23-new/pkg.c +--- pkg-config-0.23-old/pkg.c 2008-01-16 13:59:49.000000000 -0800 ++++ pkg.c 2008-01-22 15:00:55.000000000 -0800 +@@ -483,6 +483,10 @@ + g_string_append (str, pcsysrootdir); + g_string_append (str, tmpstr+2); + } ++ else ++ { ++ g_string_append (str, tmpstr); ++ } + } + else + { diff --git a/devel/pkg-config/files/patch-pkg_conflicts b/devel/pkg-config/files/patch-pkg_conflicts deleted file mode 100644 index 471fd02b24bc..000000000000 --- a/devel/pkg-config/files/patch-pkg_conflicts +++ /dev/null @@ -1,29 +0,0 @@ -diff -up pkg-config-0.22/pkg.c.conflicts pkg-config-0.22/pkg.c ---- pkg.c.conflicts 2007-11-15 23:56:26.000000000 -0500 -+++ pkg.c 2007-11-15 23:57:26.000000000 -0500 -@@ -821,7 +821,7 @@ verify_package (Package *pkg) - */ - - recursive_fill_list (pkg, get_requires_private, &requires); -- recursive_fill_list (pkg, get_conflicts, &conflicts); -+ conflicts = get_conflicts (pkg); - - requires_iter = requires; - while (requires_iter != NULL) -@@ -843,7 +843,7 @@ verify_package (Package *pkg) - req->version, req->name, - ver->name, - comparison_to_str (ver->comparison), -- ver->version, -+ ver->version ? ver->version : "(any)", - ver->owner->name, - ver->owner->version); - -@@ -857,7 +857,6 @@ verify_package (Package *pkg) - } - - g_slist_free (requires); -- g_slist_free (conflicts); - - /* We make a list of system directories that gcc expects so we can remove - * them. diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile index f3b9067d69f9..a3c17dcf6afe 100644 --- a/editors/gedit-plugins/Makefile +++ b/editors/gedit-plugins/Makefile @@ -3,14 +3,14 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/gedit-plugins/Makefile,v 1.24 2007/09/30 17:15:47 mezz Exp $ +# $MCom: ports/editors/gedit-plugins/Makefile,v 1.28 2008/03/17 11:25:37 ahze Exp $ # PORTNAME= gedit-plugins -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 +PORTREVISION= 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 @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_XLIB= yes USE_GMAKE= yes USE_GETTEXT= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomehack gnomeprefix gnometarget intlhack WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/editors/gedit-plugins/distinfo b/editors/gedit-plugins/distinfo index cecfe8cb1c1b..a4f24cd8bb3c 100644 --- a/editors/gedit-plugins/distinfo +++ b/editors/gedit-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gedit-plugins-2.20.0.tar.bz2) = ec5be3d10ca4da4b33effad207ef35e9 -SHA256 (gnome2/gedit-plugins-2.20.0.tar.bz2) = 35786e5969340f1028522bc4026cce20fcc62bfc69d9eb9ef094fbc745e4e884 -SIZE (gnome2/gedit-plugins-2.20.0.tar.bz2) = 555944 +MD5 (gnome2/gedit-plugins-2.22.0.tar.bz2) = 8ca32c74dbc23a3fc456dadc258e1215 +SHA256 (gnome2/gedit-plugins-2.22.0.tar.bz2) = 44a7cf6aa9d1f4c31478ed8f75000723b4bfc2a5ff0e45bea10ea0d66392768e +SIZE (gnome2/gedit-plugins-2.22.0.tar.bz2) = 587272 diff --git a/editors/gedit-plugins/pkg-plist b/editors/gedit-plugins/pkg-plist index c6abbc83d0aa..61032d546627 100644 --- a/editors/gedit-plugins/pkg-plist +++ b/editors/gedit-plugins/pkg-plist @@ -23,8 +23,10 @@ lib/gedit-2/plugins/gpdefs.pyo %%PYTHON%%lib/gedit-2/plugins/joinlines.py %%PYTHON%%lib/gedit-2/plugins/joinlines.pyc %%PYTHON%%lib/gedit-2/plugins/joinlines.pyo +lib/gedit-2/plugins/libcharmap.a lib/gedit-2/plugins/libcharmap.la lib/gedit-2/plugins/libcharmap.so +lib/gedit-2/plugins/libshowtabbar.a lib/gedit-2/plugins/libshowtabbar.la lib/gedit-2/plugins/libshowtabbar.so %%PYTHON%%lib/gedit-2/plugins/sessionsaver.gedit-plugin @@ -50,6 +52,7 @@ lib/gedit-2/plugins/showtabbar.gedit-plugin share/locale/ar/LC_MESSAGES/gedit-plugins.mo share/locale/az/LC_MESSAGES/gedit-plugins.mo share/locale/be/LC_MESSAGES/gedit-plugins.mo +share/locale/be@latin/LC_MESSAGES/gedit-plugins.mo share/locale/bg/LC_MESSAGES/gedit-plugins.mo share/locale/ca/LC_MESSAGES/gedit-plugins.mo share/locale/cs/LC_MESSAGES/gedit-plugins.mo @@ -119,3 +122,5 @@ share/locale/zh_TW/LC_MESSAGES/gedit-plugins.mo @dirrmtry share/locale/oc @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 371ac2c9ae33..5c667f3c783f 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/editors/gedit/Makefile,v 1.9 2007/12/02 02:00:32 marcus Exp $ +# $MCom: ports/editors/gedit/Makefile,v 1.79 2008/03/15 19:59:30 ahze Exp $ # PORTNAME= gedit -PORTVERSION= 2.20.4 +PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -26,9 +27,9 @@ USE_XLIB= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack intlhack \ - libgnomeprintui libgnomeui eel2 gtksourceview2 desktopfileutils +USE_AUTOTOOLS= libtool:15 +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gtksourceview2 \ + desktopfileutils gnomedocutils ltasneededhack WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo index d596819d3b96..471a4ab18cca 100644 --- a/editors/gedit/distinfo +++ b/editors/gedit/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gedit-2.20.4.tar.bz2) = 6c7d74f9b4339c9ec9e81f6ea3eb19c9 -SHA256 (gnome2/gedit-2.20.4.tar.bz2) = 695b70582734b3ba04e0d76970bf1dd722a22ef027f8a749ec3fb05e40e83121 -SIZE (gnome2/gedit-2.20.4.tar.bz2) = 3809006 +MD5 (gnome2/gedit-2.22.0.tar.bz2) = ce2e485d7639ed09a3e3b5a791df805a +SHA256 (gnome2/gedit-2.22.0.tar.bz2) = ffad28c732e1a9b250d6d3c5b92a252b6ac87741e4d1fd9daba9940fde399e2e +SIZE (gnome2/gedit-2.22.0.tar.bz2) = 3883104 diff --git a/editors/gedit/files/patch-docs_reference_Makefile.in b/editors/gedit/files/patch-docs_reference_Makefile.in new file mode 100644 index 000000000000..c2d56a9553bc --- /dev/null +++ b/editors/gedit/files/patch-docs_reference_Makefile.in @@ -0,0 +1,13 @@ +--- docs/reference/Makefile.in.orig 2007-12-21 11:30:30.000000000 +0100 ++++ docs/reference/Makefile.in 2007-12-21 11:55:58.000000000 +0100 +@@ -690,8 +690,8 @@ + 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 && \ ++# gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + uninstall-local: diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist index 31b00b2ab69f..59241235449a 100644 --- a/editors/gedit/pkg-plist +++ b/editors/gedit/pkg-plist @@ -21,7 +21,6 @@ include/gedit-%%VERSION%%/gedit/gedit-tab.h include/gedit-%%VERSION%%/gedit/gedit-utils.h include/gedit-%%VERSION%%/gedit/gedit-view.h include/gedit-%%VERSION%%/gedit/gedit-window.h -lib/gedit-2/gedit-bugreport.sh lib/gedit-2/plugins/changecase.gedit-plugin lib/gedit-2/plugins/docinfo.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/externaltools.gedit-plugin @@ -49,24 +48,34 @@ lib/gedit-2/plugins/docinfo.gedit-plugin %%PYTHON%%lib/gedit-2/plugins/externaltools/tools.glade lib/gedit-2/plugins/filebrowser.gedit-plugin lib/gedit-2/plugins/indent.gedit-plugin +lib/gedit-2/plugins/libchangecase.a lib/gedit-2/plugins/libchangecase.la lib/gedit-2/plugins/libchangecase.so +lib/gedit-2/plugins/libdocinfo.a lib/gedit-2/plugins/libdocinfo.la lib/gedit-2/plugins/libdocinfo.so +lib/gedit-2/plugins/libfilebrowser.a lib/gedit-2/plugins/libfilebrowser.la lib/gedit-2/plugins/libfilebrowser.so +lib/gedit-2/plugins/libindent.a lib/gedit-2/plugins/libindent.la lib/gedit-2/plugins/libindent.so +lib/gedit-2/plugins/libmodelines.a lib/gedit-2/plugins/libmodelines.la lib/gedit-2/plugins/libmodelines.so +lib/gedit-2/plugins/libsample.a lib/gedit-2/plugins/libsample.la lib/gedit-2/plugins/libsample.so +lib/gedit-2/plugins/libsort.a lib/gedit-2/plugins/libsort.la lib/gedit-2/plugins/libsort.so +lib/gedit-2/plugins/libspell.a lib/gedit-2/plugins/libspell.la lib/gedit-2/plugins/libspell.so +lib/gedit-2/plugins/libtaglist.a lib/gedit-2/plugins/libtaglist.la lib/gedit-2/plugins/libtaglist.so +lib/gedit-2/plugins/libtime.a lib/gedit-2/plugins/libtime.la lib/gedit-2/plugins/libtime.so lib/gedit-2/plugins/modelines.gedit-plugin @@ -127,6 +136,7 @@ lib/gedit-2/plugins/spell.gedit-plugin lib/gedit-2/plugins/taglist.gedit-plugin lib/gedit-2/plugins/time.gedit-plugin libdata/pkgconfig/gedit-%%VERSION%%.pc +libexec/gedit-2/gedit-bugreport.sh share/applications/gedit.desktop %%DOCSDIR%%/GeditApp.html %%DOCSDIR%%/GeditDocument.html @@ -136,14 +146,14 @@ share/applications/gedit.desktop %%DOCSDIR%%/GeditNotebook.html %%DOCSDIR%%/GeditPanel.html %%DOCSDIR%%/GeditPlugin.html -%%DOCSDIR%%/GeditPrintJob.html -%%DOCSDIR%%/GeditPrintJobPreview.html %%DOCSDIR%%/GeditProgressMessageArea.html %%DOCSDIR%%/GeditStatusbar.html %%DOCSDIR%%/GeditTab.html %%DOCSDIR%%/GeditView.html %%DOCSDIR%%/GeditWindow.html %%DOCSDIR%%/ch01.html +%%DOCSDIR%%/gedit-GeditPrintJob.html +%%DOCSDIR%%/gedit-GeditPrintJobPreview.html %%DOCSDIR%%/gedit-gedit-convert.html %%DOCSDIR%%/gedit-gedit-debug.html %%DOCSDIR%%/gedit-gedit-encodings.html @@ -164,8 +174,8 @@ share/applications/gedit.desktop 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-page-setup-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 @@ -287,6 +297,14 @@ share/gnome/help/gedit/oc/figures/gedit_recent_files_menu_icon.png share/gnome/help/gedit/oc/figures/gedit_window.png share/gnome/help/gedit/oc/gedit.xml share/gnome/help/gedit/oc/legal.xml +share/gnome/help/gedit/pt_BR/figures/gedit_format_bold.png +share/gnome/help/gedit/pt_BR/figures/gedit_format_italic.png +share/gnome/help/gedit/pt_BR/figures/gedit_format_strikethrough.png +share/gnome/help/gedit/pt_BR/figures/gedit_format_underline.png +share/gnome/help/gedit/pt_BR/figures/gedit_recent_files_menu_icon.png +share/gnome/help/gedit/pt_BR/figures/gedit_window.png +share/gnome/help/gedit/pt_BR/gedit.xml +share/gnome/help/gedit/pt_BR/legal.xml share/gnome/help/gedit/ro/figures/gedit_window.png share/gnome/help/gedit/ro/gedit.xml share/gnome/help/gedit/ro/legal.xml @@ -341,6 +359,7 @@ share/gnome/help/gedit/zh_TW/legal.xml share/locale/af/LC_MESSAGES/gedit.mo share/locale/am/LC_MESSAGES/gedit.mo share/locale/ar/LC_MESSAGES/gedit.mo +share/locale/as/LC_MESSAGES/gedit.mo share/locale/az/LC_MESSAGES/gedit.mo share/locale/be/LC_MESSAGES/gedit.mo share/locale/be@latin/LC_MESSAGES/gedit.mo @@ -432,6 +451,7 @@ share/omf/gedit/gedit-it.omf share/omf/gedit/gedit-ja.omf share/omf/gedit/gedit-ko.omf share/omf/gedit/gedit-oc.omf +share/omf/gedit/gedit-pt_BR.omf share/omf/gedit/gedit-ro.omf share/omf/gedit/gedit-ru.omf share/omf/gedit/gedit-sv.omf @@ -454,6 +474,8 @@ share/omf/gedit/gedit-zh_TW.omf @dirrm share/gnome/help/gedit/ru @dirrm share/gnome/help/gedit/ro/figures @dirrm share/gnome/help/gedit/ro +@dirrm share/gnome/help/gedit/pt_BR/figures +@dirrm share/gnome/help/gedit/pt_BR @dirrm share/gnome/help/gedit/oc/figures @dirrm share/gnome/help/gedit/oc @dirrm share/gnome/help/gedit/ko/figures @@ -489,6 +511,7 @@ share/omf/gedit/gedit-zh_TW.omf @dirrm share/gedit-2/glade @dirrm share/gedit-2 @dirrm %%DOCSDIR%% +@dirrmtry libexec/gedit-2 %%PYTHON%%@dirrm lib/gedit-2/plugins/snippets %%PYTHON%%@dirrm lib/gedit-2/plugins/pythonconsole %%PYTHON%%@dirrm lib/gedit-2/plugins/externaltools @@ -498,6 +521,7 @@ 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 @@ -526,4 +550,5 @@ share/omf/gedit/gedit-zh_TW.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index e15ad106c7b5..13a4bb2ef24b 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/editors/ghex/Makefile,v 1.7 2007/10/11 04:06:59 mezz Exp $ +# $MCom: ports/editors/ghex/Makefile,v 1.11 2008/02/27 04:39:06 mezz Exp $ # PORTNAME= ghex -PORTVERSION= 2.20.1 +PORTVERSION= 2.21.92 CATEGORIES= editors gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/editors/ghex/distinfo b/editors/ghex/distinfo index 316df752d7b2..cb53064e12c6 100644 --- a/editors/ghex/distinfo +++ b/editors/ghex/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/ghex-2.20.1.tar.bz2) = c14943b79caed9b3c5362075d3f278cc -SHA256 (gnome2/ghex-2.20.1.tar.bz2) = 088a082d0ece4a24481e4aa58d59afe3d3ed84cc38e1ad559a4eab4fafafa042 -SIZE (gnome2/ghex-2.20.1.tar.bz2) = 1249331 +MD5 (gnome2/ghex-2.21.92.tar.bz2) = e90c603fc89b0baa545d43db0579e9a2 +SHA256 (gnome2/ghex-2.21.92.tar.bz2) = 25b8f6a8e2a68a190440d26ea9dd1f7dd8b2bdcab7a2d58de0a921821b7b165e +SIZE (gnome2/ghex-2.21.92.tar.bz2) = 1251021 diff --git a/editors/ghex/pkg-plist b/editors/ghex/pkg-plist index 32ba00a3c52b..9f4edc750e44 100644 --- a/editors/ghex/pkg-plist +++ b/editors/ghex/pkg-plist @@ -126,10 +126,10 @@ share/locale/zh_TW/LC_MESSAGES/ghex-2.0.mo @dirrm share/gnome/help/ghex2/C @dirrm share/gnome/help/ghex2 @dirrm include/gtkhex +@dirrmtry share/applications @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 -@dirrmtry share/applications diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile index d418b4539510..0d5639023731 100644 --- a/games/gnome-games-extra-data/Makefile +++ b/games/gnome-games-extra-data/Makefile @@ -3,11 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.19 2007/09/18 14:04:11 ahze Exp $ +# $MCom: ports/games/gnome-games-extra-data/Makefile,v 1.21 2008/02/10 01:24:01 kwm Exp $ # PORTNAME= gnome-games-extra-data -PORTVERSION= 2.20.0 +PORTVERSION= 2.21.91 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo index fece2e632dfd..6794043124f9 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.20.0.tar.bz2) = adecbe76d2f45f6471b8bf0f6943f6ca -SHA256 (gnome2/gnome-games-extra-data-2.20.0.tar.bz2) = 97f7536c638dcbf0d654333ba0abcaa63464d65d89116ef9a2f67d2de319d96f -SIZE (gnome2/gnome-games-extra-data-2.20.0.tar.bz2) = 4183853 +MD5 (gnome2/gnome-games-extra-data-2.21.91.tar.bz2) = 570eb3758a67bb91ae451cead2ccbaf1 +SHA256 (gnome2/gnome-games-extra-data-2.21.91.tar.bz2) = 30de372d9747bfb880a42ab666f889211867c31e204338502807279a5a9e5dfd +SIZE (gnome2/gnome-games-extra-data-2.21.91.tar.bz2) = 4779980 diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist index 91db72595163..1f979791c5be 100644 --- a/games/gnome-games-extra-data/pkg-plist +++ b/games/gnome-games-extra-data/pkg-plist @@ -3,9 +3,12 @@ share/gnome-games/same-gnome/themes/2.10/glass.png share/gnome-games/same-gnome/themes/2.10/marbles.png share/gnome-games/same-gnome/themes/2.10/matrix.png 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 share/gnome-games-common/cards/paris.svg share/pixmaps/glines/classic.png diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index b22ca53178cd..8a66fba6abae 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -3,21 +3,20 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/games/gnome-games/Makefile,v 1.1 2007/12/02 01:19:19 marcus Exp $ +# $MCom: ports/games/gnome-games/Makefile,v 1.171 2008/03/11 03:23:56 mezz Exp $ # PORTNAME= gnome-games -PORTVERSION= 2.20.3 -PORTREVISION= 1 +PORTVERSION= 2.22.0 CATEGORIES= games 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 COMMENT= The game applications package for the GNOME 2 Desktop Environment -LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile +LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile \ + ggzmod.5:${PORTSDIR}/games/ggz-client-libs USE_BZIP2= yes USE_PYTHON= yes @@ -30,6 +29,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \ librsvg2 desktopfileutils pygnomedesktop gnomedocutils USE_GSTREAMER= vorbis ogg GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-sound=gstreamer CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -41,10 +41,13 @@ GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas glchess.schemas \ CONFLICTS= sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]* +DSC_FILES= iagno/iagno-client.dsc gnect/data/gnect-client.dsc \ + gnibbles/gnibbles-client.dsc + .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/lib/libavahi-client.a) || defined(WITH_MDNS) -LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app +LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi .endif post-patch: @@ -53,6 +56,10 @@ post-patch: ${WRKSRC}/glchess/src/lib/defaults.py.in post-install: + ${MKDIR} ${PREFIX}/share/ggz/gnome-games +.for dsc in ${DSC_FILES} + ${INSTALL_DATA} ${WRKSRC}/${dsc} ${PREFIX}/share/ggz/gnome-games/${dsc:T} +.endfor @-update-desktop-database .include <bsd.port.post.mk> diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 763bd18cbf71..09a8c3d7e78a 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-games-2.20.3.tar.bz2) = 470bec8560c931609f89aae94977d799 -SHA256 (gnome2/gnome-games-2.20.3.tar.bz2) = b9cbef6959fb26b7be1a27d9a2a2e5f33c167fccf13afcb49c4a0900f1d11422 -SIZE (gnome2/gnome-games-2.20.3.tar.bz2) = 12900338 +MD5 (gnome2/gnome-games-2.22.0.tar.bz2) = c26ba479a4bb0d4226100944d9ae77db +SHA256 (gnome2/gnome-games-2.22.0.tar.bz2) = 3d5ab0cf22922af22d5e83d8a7131ab01a22e7b2feaaf928fc91a2af50927f51 +SIZE (gnome2/gnome-games-2.22.0.tar.bz2) = 16157359 diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 68b8c6ed9344..76bc24062976 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -34,6 +34,21 @@ lib/gnome-games/gnome-games-render-cards %%PYTHON_SITELIBDIR%%/glchess/chess/board.py %%PYTHON_SITELIBDIR%%/glchess/chess/board.pyc %%PYTHON_SITELIBDIR%%/glchess/chess/board.pyo +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/__init__.py +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/__init__.pyc +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/__init__.pyo +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/client.py +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/client.pyc +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/client.pyo +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/server.py +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/server.pyc +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/server.pyo +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/style12.py +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/style12.pyc +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/style12.pyo +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/telnet.py +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/telnet.pyc +%%PYTHON_SITELIBDIR%%/glchess/chess/fics/telnet.pyo %%PYTHON_SITELIBDIR%%/glchess/chess/lan.py %%PYTHON_SITELIBDIR%%/glchess/chess/lan.pyc %%PYTHON_SITELIBDIR%%/glchess/chess/lan.pyo @@ -49,9 +64,24 @@ lib/gnome-games/gnome-games-render-cards %%PYTHON_SITELIBDIR%%/glchess/defaults.py %%PYTHON_SITELIBDIR%%/glchess/defaults.pyc %%PYTHON_SITELIBDIR%%/glchess/defaults.pyo +%%PYTHON_SITELIBDIR%%/glchess/display.py +%%PYTHON_SITELIBDIR%%/glchess/display.pyc +%%PYTHON_SITELIBDIR%%/glchess/display.pyo %%PYTHON_SITELIBDIR%%/glchess/game.py %%PYTHON_SITELIBDIR%%/glchess/game.pyc %%PYTHON_SITELIBDIR%%/glchess/game.pyo +%%PYTHON_SITELIBDIR%%/glchess/ggz/__init__.py +%%PYTHON_SITELIBDIR%%/glchess/ggz/__init__.pyc +%%PYTHON_SITELIBDIR%%/glchess/ggz/__init__.pyo +%%PYTHON_SITELIBDIR%%/glchess/ggz/chess.py +%%PYTHON_SITELIBDIR%%/glchess/ggz/chess.pyc +%%PYTHON_SITELIBDIR%%/glchess/ggz/chess.pyo +%%PYTHON_SITELIBDIR%%/glchess/ggz/client.py +%%PYTHON_SITELIBDIR%%/glchess/ggz/client.pyc +%%PYTHON_SITELIBDIR%%/glchess/ggz/client.pyo +%%PYTHON_SITELIBDIR%%/glchess/ggz/protocol.py +%%PYTHON_SITELIBDIR%%/glchess/ggz/protocol.pyc +%%PYTHON_SITELIBDIR%%/glchess/ggz/protocol.pyo %%PYTHON_SITELIBDIR%%/glchess/glchess.py %%PYTHON_SITELIBDIR%%/glchess/glchess.pyc %%PYTHON_SITELIBDIR%%/glchess/glchess.pyo @@ -67,9 +97,24 @@ lib/gnome-games/gnome-games-render-cards %%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.py %%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.pyc %%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.pyo +%%PYTHON_SITELIBDIR%%/glchess/gtkui/log.py +%%PYTHON_SITELIBDIR%%/glchess/gtkui/log.pyc +%%PYTHON_SITELIBDIR%%/glchess/gtkui/log.pyo +%%PYTHON_SITELIBDIR%%/glchess/gtkui/network.py +%%PYTHON_SITELIBDIR%%/glchess/gtkui/network.pyc +%%PYTHON_SITELIBDIR%%/glchess/gtkui/network.pyo +%%PYTHON_SITELIBDIR%%/glchess/history.py +%%PYTHON_SITELIBDIR%%/glchess/history.pyc +%%PYTHON_SITELIBDIR%%/glchess/history.pyo %%PYTHON_SITELIBDIR%%/glchess/main.py %%PYTHON_SITELIBDIR%%/glchess/main.pyc %%PYTHON_SITELIBDIR%%/glchess/main.pyo +%%PYTHON_SITELIBDIR%%/glchess/network.py +%%PYTHON_SITELIBDIR%%/glchess/network.pyc +%%PYTHON_SITELIBDIR%%/glchess/network.pyo +%%PYTHON_SITELIBDIR%%/glchess/player.py +%%PYTHON_SITELIBDIR%%/glchess/player.pyc +%%PYTHON_SITELIBDIR%%/glchess/player.pyo %%PYTHON_SITELIBDIR%%/glchess/scene/__init__.py %%PYTHON_SITELIBDIR%%/glchess/scene/__init__.pyc %%PYTHON_SITELIBDIR%%/glchess/scene/__init__.pyo @@ -145,6 +190,9 @@ lib/gnome-games/gnome-games-render-cards %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.py %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.pyc %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies/image_extras.pyo +%%PYTHON_SITELIBDIR%%/gnome_sudoku/main.py +%%PYTHON_SITELIBDIR%%/gnome_sudoku/main.pyc +%%PYTHON_SITELIBDIR%%/gnome_sudoku/main.pyo %%PYTHON_SITELIBDIR%%/gnome_sudoku/pausable.py %%PYTHON_SITELIBDIR%%/gnome_sudoku/pausable.pyc %%PYTHON_SITELIBDIR%%/gnome_sudoku/pausable.pyo @@ -169,6 +217,9 @@ lib/gnome-games/gnome-games-render-cards %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.py %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyc %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyo +%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_thumber.py +%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_thumber.pyc +%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_thumber.pyo %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.py %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyc %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyo @@ -288,12 +339,23 @@ share/ggz/gnome-games/ggz_gtk_lag3.svg share/ggz/gnome-games/ggz_gtk_lag4.svg share/ggz/gnome-games/ggz_gtk_lag5.svg share/ggz/gnome-games/ggz_gtk_registered.svg -share/glchess/ai.glade +@unexec %%LOCALBASE%%/bin/ggz-config -D --remove --modfile=%D/share/ggz/gnome-games/gnect-client.dsc +share/ggz/gnome-games/gnect-client.dsc +@exec %%LOCALBASE%%/bin/ggz-config -D --install --modfile=%D/share/ggz/gnome-games/gnect-client.dsc --force +@unexec %%LOCALBASE%%/bin/ggz-config -D --remove --modfile=%D/share/ggz/gnome-games/gnibbles-client.dsc +share/ggz/gnome-games/gnibbles-client.dsc +@exec %%LOCALBASE%%/bin/ggz-config -D --install --modfile=%D/share/ggz/gnome-games/gnibbles-client.dsc --force +@unexec %%LOCALBASE%%/bin/ggz-config -D --remove --modfile=%D/share/ggz/gnome-games/iagno-client.dsc +share/ggz/gnome-games/iagno-client.dsc +@exec %%LOCALBASE%%/bin/ggz-config -D --install --modfile=%D/share/ggz/gnome-games/iagno-client.dsc --force share/glchess/ai.xml share/glchess/chess_view.glade share/glchess/glchess.glade share/glchess/load_game.glade +share/glchess/log.glade +share/glchess/network_game.glade share/glchess/new_game.glade +share/glchess/preferences.glade share/glchess/save_game.glade share/gnect/white_ob.cn4.gz share/gnibbles/level001.gnl @@ -328,8 +390,7 @@ 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/icons/rteleport.png -share/gnome-games-common/icons/teleport.png +share/gnome-games-common/cards/gnomangelo_bitmap.svg %%DATADIR%%/aisleriot/games/agnes.scm %%DATADIR%%/aisleriot/games/athena.scm %%DATADIR%%/aisleriot/games/auld_lang_syne.scm @@ -362,6 +423,7 @@ share/gnome-games-common/icons/teleport.png %%DATADIR%%/aisleriot/games/gaps.scm %%DATADIR%%/aisleriot/games/gay_gordons.scm %%DATADIR%%/aisleriot/games/glenwood.scm +%%DATADIR%%/aisleriot/games/gold_mine.scm %%DATADIR%%/aisleriot/games/golf.scm %%DATADIR%%/aisleriot/games/gypsy.scm %%DATADIR%%/aisleriot/games/helsinki.scm @@ -424,6 +486,9 @@ share/gnome-games-common/icons/teleport.png %%DATADIR%%/blackjack/rules/Vegas_Downtown.rules %%DATADIR%%/blackjack/rules/Vegas_Strip.rules %%DATADIR%%/gnotski/gnotski.svg +%%DATADIR%%/icons/hicolor/24x24/actions/teleport-random.png +%%DATADIR%%/icons/hicolor/24x24/actions/teleport.png +%%DATADIR%%/icons/hicolor/scalable/actions/cards-deal.svg %%DATADIR%%/mahjongg/maps/mahjongg.map %%DATADIR%%/pixmaps/baize.png %%DATADIR%%/pixmaps/slot.svg @@ -453,12 +518,13 @@ share/gnome-games-common/icons/teleport.png %%DATADIR%%/sounds/turn.ogg %%DATADIR%%/sounds/victory.ogg %%DATADIR%%/sounds/yahoo.ogg -share/gnome-sudoku/high_scores.glade -share/gnome-sudoku/new_game.glade -share/gnome-sudoku/open_game.glade share/gnome-sudoku/print_games.glade share/gnome-sudoku/puzzle_generator.glade -share/gnome-sudoku/starter_puzzles +share/gnome-sudoku/puzzles/easy +share/gnome-sudoku/puzzles/hard +share/gnome-sudoku/puzzles/medium +share/gnome-sudoku/puzzles/very_hard +share/gnome-sudoku/select_game.glade share/gnome-sudoku/tracker.glade share/gnome/help/aisleriot/C/agnes.xml share/gnome/help/aisleriot/C/aisleriot.xml @@ -496,6 +562,7 @@ share/gnome/help/aisleriot/C/freecell.xml share/gnome/help/aisleriot/C/gaps.xml share/gnome/help/aisleriot/C/gay_gordons.xml share/gnome/help/aisleriot/C/glenwood.xml +share/gnome/help/aisleriot/C/gold_mine.xml share/gnome/help/aisleriot/C/golf.xml share/gnome/help/aisleriot/C/gypsy.xml share/gnome/help/aisleriot/C/helsinki.xml @@ -546,6 +613,9 @@ share/gnome/help/aisleriot/C/will_o_the_wisp.xml share/gnome/help/aisleriot/C/yield.xml share/gnome/help/aisleriot/C/yukon.xml 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/es/aisleriot.xml share/gnome/help/aisleriot/es/figures/camelot-goal.png share/gnome/help/aisleriot/es/figures/clock-rules.png @@ -577,13 +647,46 @@ share/gnome/help/blackjack/oc/figures/blackjack_win_window.png share/gnome/help/blackjack/sv/blackjack.xml share/gnome/help/blackjack/sv/figures/blackjack_start_window.png share/gnome/help/blackjack/sv/figures/blackjack_win_window.png +share/gnome/help/glchess/C/figures/game.png +share/gnome/help/glchess/C/figures/new_game.png +share/gnome/help/glchess/C/figures/preferences_game.png +share/gnome/help/glchess/C/figures/preferences_view.png share/gnome/help/glchess/C/glchess.xml share/gnome/help/glchess/C/legal.xml +share/gnome/help/glchess/ca/figures/game.png +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/el/figures/game.png +share/gnome/help/glchess/el/figures/new_game.png +share/gnome/help/glchess/el/figures/preferences_game.png +share/gnome/help/glchess/el/figures/preferences_view.png +share/gnome/help/glchess/el/glchess.xml +share/gnome/help/glchess/es/figures/game.png +share/gnome/help/glchess/es/figures/new_game.png +share/gnome/help/glchess/es/figures/preferences_game.png +share/gnome/help/glchess/es/figures/preferences_view.png share/gnome/help/glchess/es/glchess.xml +share/gnome/help/glchess/fr/figures/game.png +share/gnome/help/glchess/fr/figures/new_game.png +share/gnome/help/glchess/fr/figures/preferences_game.png +share/gnome/help/glchess/fr/figures/preferences_view.png share/gnome/help/glchess/fr/glchess.xml +share/gnome/help/glchess/oc/figures/game.png +share/gnome/help/glchess/oc/figures/new_game.png +share/gnome/help/glchess/oc/figures/preferences_game.png +share/gnome/help/glchess/oc/figures/preferences_view.png share/gnome/help/glchess/oc/glchess.xml +share/gnome/help/glchess/pt_BR/figures/game.png +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/sv/figures/game.png +share/gnome/help/glchess/sv/figures/new_game.png +share/gnome/help/glchess/sv/figures/preferences_game.png +share/gnome/help/glchess/sv/figures/preferences_view.png share/gnome/help/glchess/sv/glchess.xml share/gnome/help/glines/C/figures/glines-gameover.png share/gnome/help/glines/C/figures/glines-startgame.png @@ -606,6 +709,10 @@ share/gnome/help/glines/fr/figures/glines-gameover.png share/gnome/help/glines/fr/figures/glines-startgame.png share/gnome/help/glines/fr/figures/preferences.png share/gnome/help/glines/fr/glines.xml +share/gnome/help/glines/it/figures/glines-gameover.png +share/gnome/help/glines/it/figures/glines-startgame.png +share/gnome/help/glines/it/figures/preferences.png +share/gnome/help/glines/it/glines.xml share/gnome/help/glines/oc/figures/glines-gameover.png share/gnome/help/glines/oc/figures/glines-startgame.png share/gnome/help/glines/oc/figures/preferences.png @@ -664,6 +771,13 @@ share/gnome/help/gnibbles/C/figures/worm_op.png share/gnome/help/gnibbles/C/gnibbles.xml share/gnome/help/gnibbles/C/legal.xml share/gnome/help/gnibbles/C/network-games.xml +share/gnome/help/gnibbles/ca/figures/connect.png +share/gnome/help/gnibbles/ca/figures/game.png +share/gnome/help/gnibbles/ca/figures/intro.png +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/es/figures/connect.png share/gnome/help/gnibbles/es/figures/game.png share/gnome/help/gnibbles/es/figures/intro.png @@ -705,8 +819,8 @@ share/gnome/help/gnobots2/es/figures/gnobots2-main.png share/gnome/help/gnobots2/es/gnobots2.xml share/gnome/help/gnobots2/fr/figures/gnobots2-main.png share/gnome/help/gnobots2/fr/gnobots2.xml +share/gnome/help/gnobots2/it/figures/gnobots2-main.png share/gnome/help/gnobots2/it/gnobots2.xml -share/gnome/help/gnobots2/it/legal.xml share/gnome/help/gnobots2/oc/figures/gnobots2-main.png share/gnome/help/gnobots2/oc/gnobots2.xml share/gnome/help/gnobots2/sv/figures/gnobots2-main.png @@ -716,6 +830,8 @@ share/gnome/help/gnome-sudoku/C/figures/always_show_hint.png share/gnome/help/gnome-sudoku/C/figures/error_highlighting.png share/gnome/help/gnome-sudoku/C/figures/highlighting.png share/gnome/help/gnome-sudoku/C/figures/hints.png +share/gnome/help/gnome-sudoku/C/figures/resuming.png +share/gnome/help/gnome-sudoku/C/figures/starting.png share/gnome/help/gnome-sudoku/C/gnome-sudoku.xml share/gnome/help/gnome-sudoku/C/legal.xml share/gnome/help/gnome-sudoku/ca/figures/Print_Sudokus.png @@ -723,36 +839,56 @@ share/gnome/help/gnome-sudoku/ca/figures/always_show_hint.png share/gnome/help/gnome-sudoku/ca/figures/error_highlighting.png share/gnome/help/gnome-sudoku/ca/figures/highlighting.png share/gnome/help/gnome-sudoku/ca/figures/hints.png +share/gnome/help/gnome-sudoku/ca/figures/resuming.png +share/gnome/help/gnome-sudoku/ca/figures/starting.png share/gnome/help/gnome-sudoku/ca/gnome-sudoku.xml +share/gnome/help/gnome-sudoku/da/figures/Print_Sudokus.png +share/gnome/help/gnome-sudoku/da/figures/always_show_hint.png +share/gnome/help/gnome-sudoku/da/figures/error_highlighting.png +share/gnome/help/gnome-sudoku/da/figures/highlighting.png +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/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 share/gnome/help/gnome-sudoku/es/figures/highlighting.png share/gnome/help/gnome-sudoku/es/figures/hints.png +share/gnome/help/gnome-sudoku/es/figures/resuming.png +share/gnome/help/gnome-sudoku/es/figures/starting.png share/gnome/help/gnome-sudoku/es/gnome-sudoku.xml share/gnome/help/gnome-sudoku/fr/figures/Print_Sudokus.png share/gnome/help/gnome-sudoku/fr/figures/always_show_hint.png share/gnome/help/gnome-sudoku/fr/figures/error_highlighting.png share/gnome/help/gnome-sudoku/fr/figures/highlighting.png 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/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 share/gnome/help/gnome-sudoku/oc/figures/highlighting.png share/gnome/help/gnome-sudoku/oc/figures/hints.png +share/gnome/help/gnome-sudoku/oc/figures/resuming.png +share/gnome/help/gnome-sudoku/oc/figures/starting.png share/gnome/help/gnome-sudoku/oc/gnome-sudoku.xml share/gnome/help/gnome-sudoku/pt_BR/figures/Print_Sudokus.png share/gnome/help/gnome-sudoku/pt_BR/figures/always_show_hint.png share/gnome/help/gnome-sudoku/pt_BR/figures/error_highlighting.png share/gnome/help/gnome-sudoku/pt_BR/figures/highlighting.png 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/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 share/gnome/help/gnome-sudoku/sv/figures/highlighting.png share/gnome/help/gnome-sudoku/sv/figures/hints.png +share/gnome/help/gnome-sudoku/sv/figures/resuming.png +share/gnome/help/gnome-sudoku/sv/figures/starting.png share/gnome/help/gnome-sudoku/sv/gnome-sudoku.xml share/gnome/help/gnometris/C/gnometris.xml share/gnome/help/gnometris/C/legal.xml @@ -833,6 +969,20 @@ share/gnome/help/gnomine/fr/figures/main-window.png share/gnome/help/gnomine/fr/figures/preferences.png share/gnome/help/gnomine/fr/figures/statusbar.png share/gnome/help/gnomine/fr/gnomine.xml +share/gnome/help/gnomine/it/figures/easy-hints-1.png +share/gnome/help/gnomine/it/figures/easy-hints-2.png +share/gnome/help/gnomine/it/figures/easy-hints-3.png +share/gnome/help/gnomine/it/figures/faces.png +share/gnome/help/gnomine/it/figures/flags.png +share/gnome/help/gnomine/it/figures/hard-hints-1.png +share/gnome/help/gnomine/it/figures/hard-hints-2.png +share/gnome/help/gnomine/it/figures/hard-hints-3.png +share/gnome/help/gnomine/it/figures/highscores.png +share/gnome/help/gnomine/it/figures/imnotsureflagscheckbox.png +share/gnome/help/gnomine/it/figures/main-window.png +share/gnome/help/gnomine/it/figures/preferences.png +share/gnome/help/gnomine/it/figures/statusbar.png +share/gnome/help/gnomine/it/gnomine.xml share/gnome/help/gnomine/oc/figures/easy-hints-1.png share/gnome/help/gnomine/oc/figures/easy-hints-2.png share/gnome/help/gnomine/oc/figures/easy-hints-3.png @@ -880,6 +1030,9 @@ share/gnome/help/gnotravex/es/gnotravex.xml share/gnome/help/gnotravex/fr/figures/gnotravex_game.png share/gnome/help/gnotravex/fr/figures/gnotravex_mainwindow.png share/gnome/help/gnotravex/fr/gnotravex.xml +share/gnome/help/gnotravex/it/figures/gnotravex_game.png +share/gnome/help/gnotravex/it/figures/gnotravex_mainwindow.png +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 @@ -899,6 +1052,9 @@ share/gnome/help/gnotski/es/gnotski.xml share/gnome/help/gnotski/fr/figures/gnotski_start_window.png share/gnome/help/gnotski/fr/figures/gnotski_win.png share/gnome/help/gnotski/fr/gnotski.xml +share/gnome/help/gnotski/it/figures/gnotski_start_window.png +share/gnome/help/gnotski/it/figures/gnotski_win.png +share/gnome/help/gnotski/it/gnotski.xml share/gnome/help/gnotski/oc/figures/gnotski_start_window.png share/gnome/help/gnotski/oc/figures/gnotski_win.png share/gnome/help/gnotski/oc/gnotski.xml @@ -920,6 +1076,9 @@ share/gnome/help/gtali/es/gtali.xml share/gnome/help/gtali/fr/figures/mainwindow.png share/gnome/help/gtali/fr/figures/preferences.png share/gnome/help/gtali/fr/gtali.xml +share/gnome/help/gtali/it/figures/mainwindow.png +share/gnome/help/gtali/it/figures/preferences.png +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 @@ -990,6 +1149,11 @@ share/gnome/help/mahjongg/C/figures/preferences.png share/gnome/help/mahjongg/C/figures/toolbar.png share/gnome/help/mahjongg/C/legal.xml share/gnome/help/mahjongg/C/mahjongg.xml +share/gnome/help/mahjongg/ca/figures/mahjongg.png +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/es/figures/mahjongg.png share/gnome/help/mahjongg/es/figures/no-move.png share/gnome/help/mahjongg/es/figures/preferences.png @@ -1014,23 +1178,37 @@ share/gnome/help/same-gnome/C/figures/play.png share/gnome/help/same-gnome/C/figures/start-up.png share/gnome/help/same-gnome/C/legal.xml share/gnome/help/same-gnome/C/same-gnome.xml +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/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 share/gnome/help/same-gnome/en_GB/same-gnome.xml share/gnome/help/same-gnome/es/figures/play.png share/gnome/help/same-gnome/es/figures/start-up.png +share/gnome/help/same-gnome/es/legal.xml share/gnome/help/same-gnome/es/same-gnome.xml share/gnome/help/same-gnome/fr/figures/play.png share/gnome/help/same-gnome/fr/figures/start-up.png +share/gnome/help/same-gnome/fr/legal.xml share/gnome/help/same-gnome/fr/same-gnome.xml +share/gnome/help/same-gnome/it/figures/play.png +share/gnome/help/same-gnome/it/figures/start-up.png +share/gnome/help/same-gnome/it/legal.xml +share/gnome/help/same-gnome/it/same-gnome.xml share/gnome/help/same-gnome/oc/figures/play.png share/gnome/help/same-gnome/oc/figures/start-up.png +share/gnome/help/same-gnome/oc/legal.xml share/gnome/help/same-gnome/oc/same-gnome.xml share/gnome/help/same-gnome/ru/figures/play.png share/gnome/help/same-gnome/ru/figures/start-up.png +share/gnome/help/same-gnome/ru/legal.xml share/gnome/help/same-gnome/ru/same-gnome.xml share/gnome/help/same-gnome/sv/figures/play.png share/gnome/help/same-gnome/sv/figures/start-up.png +share/gnome/help/same-gnome/sv/legal.xml share/gnome/help/same-gnome/sv/same-gnome.xml share/icons/hicolor/16x16/apps/gnome-aisleriot.png share/icons/hicolor/16x16/apps/gnome-blackjack.png @@ -1136,6 +1314,7 @@ share/icons/hicolor/scalable/apps/gnome-tetravex.svg share/locale/af/LC_MESSAGES/gnome-games.mo share/locale/am/LC_MESSAGES/gnome-games.mo share/locale/ar/LC_MESSAGES/gnome-games.mo +share/locale/as/LC_MESSAGES/gnome-games.mo share/locale/az/LC_MESSAGES/gnome-games.mo share/locale/be/LC_MESSAGES/gnome-games.mo share/locale/bg/LC_MESSAGES/gnome-games.mo @@ -1168,6 +1347,7 @@ share/locale/is/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo 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/lt/LC_MESSAGES/gnome-games.mo @@ -1209,6 +1389,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-games.mo 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-es.omf share/omf/aisleriot/aisleriot-fr.omf share/omf/aisleriot/aisleriot-oc.omf @@ -1221,6 +1402,7 @@ 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-el.omf share/omf/glchess/glchess-es.omf share/omf/glchess/glchess-fr.omf share/omf/glchess/glchess-oc.omf @@ -1231,6 +1413,7 @@ share/omf/glines/glines-ca.omf share/omf/glines/glines-en_GB.omf share/omf/glines/glines-es.omf share/omf/glines/glines-fr.omf +share/omf/glines/glines-it.omf share/omf/glines/glines-oc.omf share/omf/glines/glines-ru.omf share/omf/glines/glines-sv.omf @@ -1242,6 +1425,7 @@ share/omf/gnect/gnect-fr.omf 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-es.omf share/omf/gnibbles/gnibbles-fr.omf share/omf/gnibbles/gnibbles-oc.omf @@ -1251,13 +1435,14 @@ share/omf/gnobots2/gnobots2-ca.omf share/omf/gnobots2/gnobots2-de.omf share/omf/gnobots2/gnobots2-es.omf share/omf/gnobots2/gnobots2-fr.omf +share/omf/gnobots2/gnobots2-it.omf share/omf/gnobots2/gnobots2-oc.omf share/omf/gnobots2/gnobots2-sv.omf share/omf/gnome-games/gnobots2-da.omf -share/omf/gnome-games/gnobots2-it.omf 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-es.omf share/omf/gnome-sudoku/gnome-sudoku-fr.omf share/omf/gnome-sudoku/gnome-sudoku-oc.omf @@ -1275,6 +1460,7 @@ share/omf/gnomine/gnomine-ca.omf share/omf/gnomine/gnomine-de.omf share/omf/gnomine/gnomine-es.omf share/omf/gnomine/gnomine-fr.omf +share/omf/gnomine/gnomine-it.omf share/omf/gnomine/gnomine-oc.omf share/omf/gnomine/gnomine-sv.omf share/omf/gnotravex/gnotravex-C.omf @@ -1283,18 +1469,21 @@ share/omf/gnotravex/gnotravex-de.omf share/omf/gnotravex/gnotravex-el.omf 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-sv.omf share/omf/gnotski/gnotski-C.omf share/omf/gnotski/gnotski-ca.omf share/omf/gnotski/gnotski-es.omf share/omf/gnotski/gnotski-fr.omf +share/omf/gnotski/gnotski-it.omf 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-es.omf share/omf/gtali/gtali-fr.omf +share/omf/gtali/gtali-it.omf share/omf/gtali/gtali-oc.omf share/omf/gtali/gtali-sv.omf share/omf/iagno/iagno-C.omf @@ -1305,14 +1494,17 @@ 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-es.omf share/omf/mahjongg/mahjongg-fr.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-en_GB.omf share/omf/same-gnome/same-gnome-es.omf share/omf/same-gnome/same-gnome-fr.omf +share/omf/same-gnome/same-gnome-it.omf share/omf/same-gnome/same-gnome-oc.omf share/omf/same-gnome/same-gnome-ru.omf share/omf/same-gnome/same-gnome-sv.omf @@ -1370,11 +1562,11 @@ share/pixmaps/gnometris/7blocks-gw.png share/pixmaps/gnometris/7blocks-tig.png share/pixmaps/gnometris/gnometris.svg share/pixmaps/gnomine/bang.svg -share/pixmaps/gnomine/face-cool.png -share/pixmaps/gnomine/face-sad.png -share/pixmaps/gnomine/face-smile.png -share/pixmaps/gnomine/face-win.png -share/pixmaps/gnomine/face-worried.png +share/pixmaps/gnomine/face-cool.svg +share/pixmaps/gnomine/face-sad.svg +share/pixmaps/gnomine/face-smile.svg +share/pixmaps/gnomine/face-win.svg +share/pixmaps/gnomine/face-worried.svg share/pixmaps/gnomine/flag-question.svg share/pixmaps/gnomine/flag.svg share/pixmaps/gnomine/mine.svg @@ -1433,12 +1625,16 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/same-gnome/ru @dirrm share/gnome/help/same-gnome/oc/figures @dirrm share/gnome/help/same-gnome/oc +@dirrm share/gnome/help/same-gnome/it/figures +@dirrm share/gnome/help/same-gnome/it @dirrm share/gnome/help/same-gnome/fr/figures @dirrm share/gnome/help/same-gnome/fr @dirrm share/gnome/help/same-gnome/es/figures @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/ca/figures +@dirrm share/gnome/help/same-gnome/ca @dirrm share/gnome/help/same-gnome/C/figures @dirrm share/gnome/help/same-gnome/C @dirrm share/gnome/help/same-gnome @@ -1450,6 +1646,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/mahjongg/fr @dirrm share/gnome/help/mahjongg/es/figures @dirrm share/gnome/help/mahjongg/es +@dirrm share/gnome/help/mahjongg/ca/figures +@dirrm share/gnome/help/mahjongg/ca @dirrm share/gnome/help/mahjongg/C/figures @dirrm share/gnome/help/mahjongg/C @dirrm share/gnome/help/mahjongg @@ -1472,6 +1670,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gtali/sv @dirrm share/gnome/help/gtali/oc/figures @dirrm share/gnome/help/gtali/oc +@dirrm share/gnome/help/gtali/it/figures +@dirrm share/gnome/help/gtali/it @dirrm share/gnome/help/gtali/fr/figures @dirrm share/gnome/help/gtali/fr @dirrm share/gnome/help/gtali/es/figures @@ -1486,6 +1686,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnotski/sv @dirrm share/gnome/help/gnotski/oc/figures @dirrm share/gnome/help/gnotski/oc +@dirrm share/gnome/help/gnotski/it/figures +@dirrm share/gnome/help/gnotski/it @dirrm share/gnome/help/gnotski/fr/figures @dirrm share/gnome/help/gnotski/fr @dirrm share/gnome/help/gnotski/es/figures @@ -1499,6 +1701,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnotravex/sv @dirrm share/gnome/help/gnotravex/oc/figures @dirrm share/gnome/help/gnotravex/oc +@dirrm share/gnome/help/gnotravex/it/figures +@dirrm share/gnome/help/gnotravex/it @dirrm share/gnome/help/gnotravex/fr/figures @dirrm share/gnome/help/gnotravex/fr @dirrm share/gnome/help/gnotravex/es/figures @@ -1516,6 +1720,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnomine/sv @dirrm share/gnome/help/gnomine/oc/figures @dirrm share/gnome/help/gnomine/oc +@dirrm share/gnome/help/gnomine/it/figures +@dirrm share/gnome/help/gnomine/it @dirrm share/gnome/help/gnomine/fr/figures @dirrm share/gnome/help/gnomine/fr @dirrm share/gnome/help/gnomine/es/figures @@ -1545,6 +1751,8 @@ share/pixmaps/mahjongg/smooth.png @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/da/figures +@dirrm share/gnome/help/gnome-sudoku/da @dirrm share/gnome/help/gnome-sudoku/ca/figures @dirrm share/gnome/help/gnome-sudoku/ca @dirrm share/gnome/help/gnome-sudoku/C/figures @@ -1554,6 +1762,7 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnobots2/sv @dirrm share/gnome/help/gnobots2/oc/figures @dirrm share/gnome/help/gnobots2/oc +@dirrm share/gnome/help/gnobots2/it/figures @dirrm share/gnome/help/gnobots2/it @dirrm share/gnome/help/gnobots2/fr/figures @dirrm share/gnome/help/gnobots2/fr @@ -1575,6 +1784,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/gnibbles/fr @dirrm share/gnome/help/gnibbles/es/figures @dirrm share/gnome/help/gnibbles/es +@dirrm share/gnome/help/gnibbles/ca/figures +@dirrm share/gnome/help/gnibbles/ca @dirrm share/gnome/help/gnibbles/C/figures @dirrm share/gnome/help/gnibbles/C @dirrm share/gnome/help/gnibbles @@ -1599,6 +1810,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/glines/ru @dirrm share/gnome/help/glines/oc/figures @dirrm share/gnome/help/glines/oc +@dirrm share/gnome/help/glines/it/figures +@dirrm share/gnome/help/glines/it @dirrm share/gnome/help/glines/fr/figures @dirrm share/gnome/help/glines/fr @dirrm share/gnome/help/glines/es/figures @@ -1610,12 +1823,21 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/glines/C/figures @dirrm share/gnome/help/glines/C @dirrm share/gnome/help/glines +@dirrm share/gnome/help/glchess/sv/figures @dirrm share/gnome/help/glchess/sv +@dirrm share/gnome/help/glchess/pt_BR/figures @dirrm share/gnome/help/glchess/pt_BR +@dirrm share/gnome/help/glchess/oc/figures @dirrm share/gnome/help/glchess/oc +@dirrm share/gnome/help/glchess/fr/figures @dirrm share/gnome/help/glchess/fr +@dirrm share/gnome/help/glchess/es/figures @dirrm share/gnome/help/glchess/es +@dirrm share/gnome/help/glchess/el/figures +@dirrm share/gnome/help/glchess/el +@dirrm share/gnome/help/glchess/ca/figures @dirrm share/gnome/help/glchess/ca +@dirrm share/gnome/help/glchess/C/figures @dirrm share/gnome/help/glchess/C @dirrm share/gnome/help/glchess @dirrm share/gnome/help/blackjack/sv/figures @@ -1639,9 +1861,12 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/gnome/help/aisleriot/fr @dirrm share/gnome/help/aisleriot/es/figures @dirrm share/gnome/help/aisleriot/es +@dirrm share/gnome/help/aisleriot/ca/figures +@dirrm share/gnome/help/aisleriot/ca @dirrm share/gnome/help/aisleriot/C/figures @dirrm share/gnome/help/aisleriot/C @dirrm share/gnome/help/aisleriot +@dirrm share/gnome-sudoku/puzzles @dirrm share/gnome-sudoku @dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/same-gnome/themes/2.10 @@ -1650,13 +1875,18 @@ share/pixmaps/mahjongg/smooth.png @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/mahjongg/maps @dirrm %%DATADIR%%/mahjongg +@dirrm %%DATADIR%%/icons/hicolor/scalable/actions +@dirrm %%DATADIR%%/icons/hicolor/scalable +@dirrm %%DATADIR%%/icons/hicolor/24x24/actions +@dirrm %%DATADIR%%/icons/hicolor/24x24 +@dirrm %%DATADIR%%/icons/hicolor +@dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/gnotski @dirrm %%DATADIR%%/blackjack/rules @dirrm %%DATADIR%%/blackjack/pixmaps @dirrm %%DATADIR%%/blackjack @dirrm %%DATADIR%%/aisleriot/games @dirrm %%DATADIR%%/aisleriot -@dirrm share/gnome-games-common/icons @dirrm share/gnome-games-common/cards @dirrm share/gnome-games-common @dirrm %%DATADIR%% @@ -1666,6 +1896,7 @@ share/pixmaps/mahjongg/smooth.png @dirrm share/glchess @dirrmtry share/ggz/gnome-games @dirrmtry share/ggz +@dirrmtry share/applications @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku @dirrm %%PYTHON_SITELIBDIR%%/glchess/ui @@ -1673,6 +1904,8 @@ share/pixmaps/mahjongg/smooth.png @dirrm %%PYTHON_SITELIBDIR%%/glchess/scene/cairo @dirrm %%PYTHON_SITELIBDIR%%/glchess/scene @dirrm %%PYTHON_SITELIBDIR%%/glchess/gtkui +@dirrm %%PYTHON_SITELIBDIR%%/glchess/ggz +@dirrm %%PYTHON_SITELIBDIR%%/glchess/chess/fics @dirrm %%PYTHON_SITELIBDIR%%/glchess/chess @dirrm %%PYTHON_SITELIBDIR%%/glchess @dirrm lib/gnome-games @@ -1698,4 +1931,5 @@ share/pixmaps/mahjongg/smooth.png @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/graphics/Makefile b/graphics/Makefile index afb79e1a8967..aacaac484dd2 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -260,6 +260,7 @@ SUBDIR += gsnapshot SUBDIR += gstreamer-plugins-aalib SUBDIR += gstreamer-plugins-cairo + SUBDIR += gstreamer-plugins-gdkpixbuf SUBDIR += gstreamer-plugins-jpeg SUBDIR += gstreamer-plugins-libcaca SUBDIR += gstreamer-plugins-libpng diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index a3b7a91ed4df..8d341e1e868a 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -3,17 +3,15 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/cairo/Makefile,v 1.1 2007/11/30 07:07:52 marcus Exp $ +# $MCom: ports/graphics/cairo/Makefile,v 1.69 2008/03/21 04:04:14 ahze Exp $ # PORTNAME= cairo -PORTVERSION= 1.4.14 +PORTVERSION= 1.5.14 PORTREVISION?= 0 CATEGORIES= graphics -MASTER_SITES= http://cairographics.org/releases/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= marcus -#MASTER_SITES= http://cairographics.org/snapshots/ +#MASTER_SITES= http://cairographics.org/releases/ +MASTER_SITES= http://cairographics.org/snapshots/ MAINTAINER= gnome@FreeBSD.org COMMENT= Vector graphics library with cross-device output support @@ -22,7 +20,8 @@ COMMENT= Vector graphics library with cross-device output support LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig + fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ + pixman-1.9:${PORTSDIR}/x11/pixman CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --enable-pdf \ diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 803d2eb62758..890b704588cd 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (cairo-1.4.14.tar.gz) = e8c442ff821c0719a69508fecba9038f -SHA256 (cairo-1.4.14.tar.gz) = 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c -SIZE (cairo-1.4.14.tar.gz) = 3283608 +MD5 (cairo-1.5.14.tar.gz) = 9b5d250937375e53435cb5613416c030 +SHA256 (cairo-1.5.14.tar.gz) = fbca8a292b83cbf184835be0e6007c194d7bab3ce4ee2bced8ea7bf07a7e151b +SIZE (cairo-1.5.14.tar.gz) = 4877446 diff --git a/graphics/cairo/files/patch-src_cairo-xlib-display.c b/graphics/cairo/files/patch-src_cairo-xlib-display.c new file mode 100644 index 000000000000..c5bec2ccaa42 --- /dev/null +++ b/graphics/cairo/files/patch-src_cairo-xlib-display.c @@ -0,0 +1,12 @@ +--- src/cairo-xlib-display.c.orig 2008-03-13 20:52:38.000000000 -0400 ++++ src/cairo-xlib-display.c 2008-03-13 20:53:29.000000000 -0400 +@@ -302,6 +302,9 @@ + display->buggy_repeat = TRUE; + } + ++ /* XXX workaround; see https://bugzilla.mozilla.org/show_bug.cgi?id=413583 */ ++ display->buggy_repeat = TRUE; ++ + display->next = _cairo_xlib_display_list; + _cairo_xlib_display_list = display; + diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 535bf371d198..d69e32e0544f 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/cairomm/Makefile,v 1.4 2006/09/06 22:06:40 marcus Exp $ +# $MCom: ports/graphics/cairomm/Makefile,v 1.7 2008/03/21 21:48:49 kwm Exp $ # PORTNAME= cairomm -PORTVERSION= 1.2.4 +PORTVERSION= 1.4.8 PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -18,10 +18,10 @@ COMMENT= C++ interface to cairo LIB_DEPENDS= xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \ cairo.2:${PORTSDIR}/graphics/cairo -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnometarget +USE_GNOME= gnomehack gnometarget ltverhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}" diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo index f4bbd93b800e..1d91365fa1b5 100644 --- a/graphics/cairomm/distinfo +++ b/graphics/cairomm/distinfo @@ -1,3 +1,3 @@ -MD5 (cairomm-1.2.4.tar.gz) = 5d862facfbd0098c9bae618b61f7c8e6 -SHA256 (cairomm-1.2.4.tar.gz) = a137ccd4a6cde6c9e9553966534702d2e7f6f44c755dfe128d9fb26ed2697fe7 -SIZE (cairomm-1.2.4.tar.gz) = 580871 +MD5 (cairomm-1.4.8.tar.gz) = 2b2025b3555fa1665d92cf9f9be1a4d3 +SHA256 (cairomm-1.4.8.tar.gz) = 795a1c1f5aab72752cbce8d2c0502279ac999351726a5369bec737af0c834e92 +SIZE (cairomm-1.4.8.tar.gz) = 786851 diff --git a/graphics/cairomm/files/patch-cairomm_enums.h b/graphics/cairomm/files/patch-cairomm_enums.h new file mode 100644 index 000000000000..4d0d6ed988d0 --- /dev/null +++ b/graphics/cairomm/files/patch-cairomm_enums.h @@ -0,0 +1,11 @@ +--- cairomm/enums.h.orig 2008-03-21 22:42:50.000000000 +0100 ++++ cairomm/enums.h 2008-03-21 22:43:38.000000000 +0100 +@@ -192,7 +192,7 @@ typedef enum + FONT_TYPE_TOY = CAIRO_FONT_TYPE_TOY, + FONT_TYPE_FT = CAIRO_FONT_TYPE_FT, + FONT_TYPE_WIN32 = CAIRO_FONT_TYPE_WIN32, +- FONT_TYPE_ATSUI = CAIRO_FONT_TYPE_ATSUI ++ FONT_TYPE_QUARTZ = CAIRO_FONT_TYPE_QUARTZ + } FontType; + + } // namespace Cairo diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist index eadc7382880c..37c9b105cf3e 100644 --- a/graphics/cairomm/pkg-plist +++ b/graphics/cairomm/pkg-plist @@ -1,4 +1,5 @@ include/cairomm-1.0/cairomm/cairomm.h +include/cairomm-1.0/cairomm/cairommconfig.h include/cairomm-1.0/cairomm/context.h include/cairomm-1.0/cairomm/enums.h include/cairomm-1.0/cairomm/exception.h @@ -6,6 +7,7 @@ include/cairomm-1.0/cairomm/fontface.h include/cairomm-1.0/cairomm/fontoptions.h include/cairomm-1.0/cairomm/path.h include/cairomm-1.0/cairomm/pattern.h +include/cairomm-1.0/cairomm/quartz_surface.h include/cairomm-1.0/cairomm/refptr.h include/cairomm-1.0/cairomm/scaledfont.h include/cairomm-1.0/cairomm/surface.h @@ -20,6 +22,8 @@ share/doc/libcairomm-1.0/reference/html/annotated.html share/doc/libcairomm-1.0/reference/html/cairomm.css share/doc/libcairomm-1.0/reference/html/cairomm_8h-source.html share/doc/libcairomm-1.0/reference/html/cairomm_8h.html +share/doc/libcairomm-1.0/reference/html/cairommconfig_8h-source.html +share/doc/libcairomm-1.0/reference/html/cairommconfig_8h.html share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context-members.html share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context.html share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace-members.html @@ -63,6 +67,11 @@ share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface.html share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.map share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.md5 share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.png +share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzSurface-members.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzSurface.html +share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzSurface__inherit__graph.map +share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzSurface__inherit__graph.md5 +share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzSurface__inherit__graph.png share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient-members.html share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient.html share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.map @@ -128,13 +137,53 @@ share/doc/libcairomm-1.0/reference/html/fontface_8h.html share/doc/libcairomm-1.0/reference/html/fontoptions_8h-source.html share/doc/libcairomm-1.0/reference/html/fontoptions_8h.html share/doc/libcairomm-1.0/reference/html/functions.html +share/doc/libcairomm-1.0/reference/html/functions_0x62.html +share/doc/libcairomm-1.0/reference/html/functions_0x63.html +share/doc/libcairomm-1.0/reference/html/functions_0x64.html +share/doc/libcairomm-1.0/reference/html/functions_0x65.html +share/doc/libcairomm-1.0/reference/html/functions_0x66.html +share/doc/libcairomm-1.0/reference/html/functions_0x67.html +share/doc/libcairomm-1.0/reference/html/functions_0x68.html +share/doc/libcairomm-1.0/reference/html/functions_0x69.html +share/doc/libcairomm-1.0/reference/html/functions_0x6c.html +share/doc/libcairomm-1.0/reference/html/functions_0x6d.html +share/doc/libcairomm-1.0/reference/html/functions_0x6f.html +share/doc/libcairomm-1.0/reference/html/functions_0x70.html +share/doc/libcairomm-1.0/reference/html/functions_0x71.html +share/doc/libcairomm-1.0/reference/html/functions_0x72.html +share/doc/libcairomm-1.0/reference/html/functions_0x73.html +share/doc/libcairomm-1.0/reference/html/functions_0x74.html +share/doc/libcairomm-1.0/reference/html/functions_0x75.html +share/doc/libcairomm-1.0/reference/html/functions_0x76.html +share/doc/libcairomm-1.0/reference/html/functions_0x77.html +share/doc/libcairomm-1.0/reference/html/functions_0x78.html +share/doc/libcairomm-1.0/reference/html/functions_0x7e.html share/doc/libcairomm-1.0/reference/html/functions_func.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x62.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x63.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x64.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x65.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x66.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x67.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x68.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x69.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x6c.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x6d.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x6f.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x70.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x71.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x72.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x73.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x74.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x75.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x76.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x77.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x78.html +share/doc/libcairomm-1.0/reference/html/functions_func_0x7e.html share/doc/libcairomm-1.0/reference/html/functions_type.html share/doc/libcairomm-1.0/reference/html/functions_vars.html share/doc/libcairomm-1.0/reference/html/globals.html -share/doc/libcairomm-1.0/reference/html/globals_enum.html -share/doc/libcairomm-1.0/reference/html/globals_eval.html -share/doc/libcairomm-1.0/reference/html/globals_type.html +share/doc/libcairomm-1.0/reference/html/globals_defs.html share/doc/libcairomm-1.0/reference/html/graph_legend.dot share/doc/libcairomm-1.0/reference/html/graph_legend.html share/doc/libcairomm-1.0/reference/html/graph_legend.png @@ -167,6 +216,9 @@ share/doc/libcairomm-1.0/reference/html/inherit__graph__7.png share/doc/libcairomm-1.0/reference/html/inherit__graph__8.map share/doc/libcairomm-1.0/reference/html/inherit__graph__8.md5 share/doc/libcairomm-1.0/reference/html/inherit__graph__8.png +share/doc/libcairomm-1.0/reference/html/inherit__graph__9.map +share/doc/libcairomm-1.0/reference/html/inherit__graph__9.md5 +share/doc/libcairomm-1.0/reference/html/inherit__graph__9.png share/doc/libcairomm-1.0/reference/html/inherits.html share/doc/libcairomm-1.0/reference/html/namespaceCairo.html share/doc/libcairomm-1.0/reference/html/namespacemembers.html @@ -179,10 +231,14 @@ share/doc/libcairomm-1.0/reference/html/path_8h-source.html share/doc/libcairomm-1.0/reference/html/path_8h.html share/doc/libcairomm-1.0/reference/html/pattern_8h-source.html share/doc/libcairomm-1.0/reference/html/pattern_8h.html +share/doc/libcairomm-1.0/reference/html/quartz__surface_8h-source.html +share/doc/libcairomm-1.0/reference/html/quartz__surface_8h.html share/doc/libcairomm-1.0/reference/html/refptr_8h-source.html share/doc/libcairomm-1.0/reference/html/refptr_8h.html share/doc/libcairomm-1.0/reference/html/scaledfont_8h-source.html share/doc/libcairomm-1.0/reference/html/scaledfont_8h.html +share/doc/libcairomm-1.0/reference/html/structCairo_1_1ColorStop-members.html +share/doc/libcairomm-1.0/reference/html/structCairo_1_1ColorStop.html share/doc/libcairomm-1.0/reference/html/surface_8h-source.html share/doc/libcairomm-1.0/reference/html/surface_8h.html share/doc/libcairomm-1.0/reference/html/tabs.css diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 433fb1f60bbd..686ddbccae01 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/eog/Makefile,v 1.6 2007/12/01 18:59:17 marcus Exp $ +# $MCom: ports/graphics/eog/Makefile,v 1.74 2008/03/10 13:44:08 ahze Exp $ # PORTNAME= eog -PORTVERSION= 2.20.4 +PORTVERSION= 2.22.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -16,10 +16,10 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The Eye Of Gnome image viewer -USE_BZIP2= yes +#USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \ - librsvg2 desktopfileutils gnomedesktop +USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \ + gnomedesktop INSTALLS_ICONS= yes USE_GETTEXT= yes USE_XLIB= yes diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index 3bee911793c1..833452558e4c 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eog-2.20.4.tar.bz2) = f9c923e1e09caa8e6f764ae8242f8d61 -SHA256 (gnome2/eog-2.20.4.tar.bz2) = 46678eb6767cb1bcb31a0d2d9af31653c91d7a8d698ec5637655ab9229eb811a -SIZE (gnome2/eog-2.20.4.tar.bz2) = 1666532 +MD5 (gnome2/eog-2.22.0.tar.gz) = 93feaa489b19c58b22ccebfaa37479d7 +SHA256 (gnome2/eog-2.22.0.tar.gz) = 36a19fb5127f629d17d14ad1918c700ee0c9fc9d028276f405bcf163c73d06ab +SIZE (gnome2/eog-2.22.0.tar.gz) = 2617900 diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 40ba4ad7d4f5..d42b43a1826d 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -22,9 +22,11 @@ include/eog-2.20/eog/eog-transform.h include/eog-2.20/eog/eog-window.h libdata/pkgconfig/eog.pc share/applications/eog.desktop +%%DATADIR%%/eog-image-properties-dialog.glade +%%DATADIR%%/eog-multiple-save-as-dialog.glade +%%DATADIR%%/eog-preferences-dialog.glade %%DATADIR%%/eog-toolbar.xml %%DATADIR%%/eog-ui.xml -%%DATADIR%%/eog.glade %%DATADIR%%/gtkrc %%DATADIR%%/icons/hicolor/16x16/actions/eog-image-collection.png %%DATADIR%%/icons/hicolor/16x16/actions/eog-plugin.png @@ -39,55 +41,76 @@ share/applications/eog.desktop 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/da/eog.xml +share/gnome/help/eog/da/figures/eog_save_as_window.png +share/gnome/help/eog/da/figures/eog_start_window.png +share/gnome/help/eog/da/figures/eog_toolbar_editor_window.png share/gnome/help/eog/de/eog.xml share/gnome/help/eog/de/figures/eog_save_as_window.png share/gnome/help/eog/de/figures/eog_start_window.png +share/gnome/help/eog/de/figures/eog_toolbar_editor_window.png share/gnome/help/eog/en_GB/eog.xml share/gnome/help/eog/en_GB/figures/eog_save_as_window.png share/gnome/help/eog/en_GB/figures/eog_start_window.png +share/gnome/help/eog/en_GB/figures/eog_toolbar_editor_window.png share/gnome/help/eog/es/eog.xml share/gnome/help/eog/es/figures/eog_save_as_window.png share/gnome/help/eog/es/figures/eog_start_window.png +share/gnome/help/eog/es/figures/eog_toolbar_editor_window.png share/gnome/help/eog/eu/eog.xml +share/gnome/help/eog/eu/figures/eog_save_as_window.png share/gnome/help/eog/eu/figures/eog_start_window.png -share/gnome/help/eog/eu/legal.xml +share/gnome/help/eog/eu/figures/eog_toolbar_editor_window.png share/gnome/help/eog/fr/eog.xml share/gnome/help/eog/fr/figures/eog_save_as_window.png share/gnome/help/eog/fr/figures/eog_start_window.png +share/gnome/help/eog/fr/figures/eog_toolbar_editor_window.png share/gnome/help/eog/it/eog.xml share/gnome/help/eog/it/figures/eog_save_as_window.png share/gnome/help/eog/it/figures/eog_start_window.png +share/gnome/help/eog/it/figures/eog_toolbar_editor_window.png share/gnome/help/eog/ja/eog.xml +share/gnome/help/eog/ja/figures/eog_save_as_window.png share/gnome/help/eog/ja/figures/eog_start_window.png -share/gnome/help/eog/ja/legal.xml +share/gnome/help/eog/ja/figures/eog_toolbar_editor_window.png share/gnome/help/eog/ko/eog.xml share/gnome/help/eog/ko/figures/eog_save_as_window.png share/gnome/help/eog/ko/figures/eog_start_window.png +share/gnome/help/eog/ko/figures/eog_toolbar_editor_window.png share/gnome/help/eog/oc/eog.xml share/gnome/help/eog/oc/figures/eog_save_as_window.png share/gnome/help/eog/oc/figures/eog_start_window.png +share/gnome/help/eog/oc/figures/eog_toolbar_editor_window.png share/gnome/help/eog/pa/eog.xml share/gnome/help/eog/pa/figures/eog_save_as_window.png share/gnome/help/eog/pa/figures/eog_start_window.png +share/gnome/help/eog/pa/figures/eog_toolbar_editor_window.png share/gnome/help/eog/pt_BR/eog.xml share/gnome/help/eog/pt_BR/figures/eog_save_as_window.png share/gnome/help/eog/pt_BR/figures/eog_start_window.png +share/gnome/help/eog/pt_BR/figures/eog_toolbar_editor_window.png share/gnome/help/eog/ru/eog.xml share/gnome/help/eog/ru/figures/eog_save_as_window.png share/gnome/help/eog/ru/figures/eog_start_window.png +share/gnome/help/eog/ru/figures/eog_toolbar_editor_window.png 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/uk/eog.xml share/gnome/help/eog/uk/figures/eog_save_as_window.png share/gnome/help/eog/uk/figures/eog_start_window.png +share/gnome/help/eog/uk/figures/eog_toolbar_editor_window.png share/gnome/help/eog/zh_CN/eog.xml +share/gnome/help/eog/zh_CN/figures/eog_save_as_window.png share/gnome/help/eog/zh_CN/figures/eog_start_window.png -share/gnome/help/eog/zh_CN/legal.xml +share/gnome/help/eog/zh_CN/figures/eog_toolbar_editor_window.png share/gnome/help/eog/zh_TW/eog.xml +share/gnome/help/eog/zh_TW/figures/eog_save_as_window.png share/gnome/help/eog/zh_TW/figures/eog_start_window.png -share/gnome/help/eog/zh_TW/legal.xml +share/gnome/help/eog/zh_TW/figures/eog_toolbar_editor_window.png share/icons/hicolor/16x16/apps/eog.png share/icons/hicolor/22x22/apps/eog.png share/icons/hicolor/24x24/apps/eog.png @@ -96,6 +119,7 @@ share/icons/hicolor/scalable/apps/eog.svg share/locale/af/LC_MESSAGES/eog.mo share/locale/am/LC_MESSAGES/eog.mo share/locale/ar/LC_MESSAGES/eog.mo +share/locale/as/LC_MESSAGES/eog.mo share/locale/az/LC_MESSAGES/eog.mo share/locale/be/LC_MESSAGES/eog.mo share/locale/be@latin/LC_MESSAGES/eog.mo @@ -139,6 +163,7 @@ share/locale/mg/LC_MESSAGES/eog.mo share/locale/mk/LC_MESSAGES/eog.mo share/locale/ml/LC_MESSAGES/eog.mo share/locale/mn/LC_MESSAGES/eog.mo +share/locale/mr/LC_MESSAGES/eog.mo share/locale/ms/LC_MESSAGES/eog.mo share/locale/nb/LC_MESSAGES/eog.mo share/locale/ne/LC_MESSAGES/eog.mo @@ -168,8 +193,6 @@ share/locale/tk/LC_MESSAGES/eog.mo share/locale/tr/LC_MESSAGES/eog.mo share/locale/ug/LC_MESSAGES/eog.mo share/locale/uk/LC_MESSAGES/eog.mo -share/locale/uz/LC_MESSAGES/eog.mo -share/locale/uz@cyrillic/LC_MESSAGES/eog.mo share/locale/vi/LC_MESSAGES/eog.mo share/locale/wa/LC_MESSAGES/eog.mo share/locale/xh/LC_MESSAGES/eog.mo @@ -178,6 +201,7 @@ 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-da.omf share/omf/eog/eog-de.omf share/omf/eog/eog-en_GB.omf share/omf/eog/eog-es.omf @@ -227,6 +251,8 @@ share/omf/eog/eog-zh_TW.omf @dirrm share/gnome/help/eog/en_GB @dirrm share/gnome/help/eog/de/figures @dirrm share/gnome/help/eog/de +@dirrm share/gnome/help/eog/da/figures +@dirrm share/gnome/help/eog/da @dirrm share/gnome/help/eog/C/figures @dirrm share/gnome/help/eog/C @dirrm share/gnome/help/eog @@ -244,6 +270,7 @@ share/omf/eog/eog-zh_TW.omf @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm include/eog-2.20/eog @dirrm include/eog-2.20 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @@ -254,8 +281,6 @@ share/omf/eog/eog-zh_TW.omf @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/ug/LC_MESSAGES @dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @@ -268,6 +293,8 @@ share/omf/eog/eog-zh_TW.omf @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @@ -278,4 +305,5 @@ share/omf/eog/eog-zh_TW.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 33610f23827a..acf20a1a59c8 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,12 +3,12 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/graphics/evince/Makefile,v 1.1 2007/12/01 19:16:37 marcus Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.97 2008/03/15 20:08:24 ahze Exp $ # PORTNAME= evince -PORTVERSION= 2.20.2 -PORTREVISION= 1 +PORTVERSION= 2.22.0 +PORTREVISION= 3 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,21 +16,22 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer -LIB_DEPENDS= poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS= poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \ + spectre.1:${PORTSDIR}/print/libspectre USE_LDCONFIG= yes USE_BZIP2= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 INSTALLS_ICONS= yes USE_GETTEXT= yes USE_XLIB= yes USE_GMAKE= yes -USE_GHOSTSCRIPT=yes INSTALLS_OMF= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libgnomeprintui \ - desktopfileutils gnomedocutils +USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui desktopfileutils \ + gnomedocutils ltasneededhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-print=gtk GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas \ evince-thumbnailer-ps.schemas @@ -41,7 +42,7 @@ OPTIONS= DVI "Enable DVI viewer support" off \ T1LIB "Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)" off \ NAUTILUS "Enable Nautilus plugin" on \ DBUS "Enable D-BUS support" on \ - COMICS "Enable comic book archives support" off \ + COMICS "Enable comic book archives support" on \ IMPRESS "Enable Impress presentations support" off \ DJVU "Enable DJVU support" off @@ -51,17 +52,20 @@ OPTIONS= DVI "Enable DVI viewer support" off \ WITH_DBUS= yes .endif -.if defined(WITH_DVI) || defined(WITH_T1LIB) +.if defined(WITH_DVI) || defined(WITH_T1LIB) || exists(${LOCALBASE}/lib/libkpathsea.a) BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base RUN_DEPENDS+= tex:${PORTSDIR}/print/teTeX-base CONFIGURE_ARGS+= --enable-dvi GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas +PLIST_SUB+= DVI="" . if defined(WITH_T1LIB) LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib CONFIGURE_ARGS+= --enable-t1lib . endif +.else +PLIST_SUB+= DVI="@comment " .endif .if !defined(WITHOUT_NAUTILUS) @@ -89,20 +93,24 @@ DJVU_DIR?= -nox11 LIB_DEPENDS+= djvulibre.20:${PORTSDIR}/graphics/djvulibre${DJVU_DIR} CONFIGURE_ARGS+= --enable-djvu GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas +PLIST_SUB+= DJVU="" .else CONFIGURE_ARGS+= --disable-djvu +PLIST_SUB+= DJVU="@comment " .endif .if !defined(WITHOUT_DBUS) LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .endif -.if defined(WITH_COMICS) +.if !defined(WITHOUT_COMICS) +RUN_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip CONFIGURE_ARGS+= --enable-comics -GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas - -RUN_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar \ - unzip:${PORTSDIR}/archivers/unzip +GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas +PLIST_SUB+= COMICS="" +.else +CONFIGURE_ARGS+= --disable-comics +PLIST_SUB+= COMICS="@comment " .endif post-patch: diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo index 3f5fe39f0911..b498784ddc8f 100644 --- a/graphics/evince/distinfo +++ b/graphics/evince/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evince-2.20.2.tar.bz2) = 15214f5211d9f98ffa0afd8158b7d021 -SHA256 (gnome2/evince-2.20.2.tar.bz2) = c6e9f2d8a90f95bc235b21ffb5be0d183ce2bfaaea84a4eafdb2449a2349129c -SIZE (gnome2/evince-2.20.2.tar.bz2) = 1614179 +MD5 (gnome2/evince-2.22.0.tar.bz2) = 9fc7eb5757549626b7515b853a5f6b97 +SHA256 (gnome2/evince-2.22.0.tar.bz2) = 293778da77d42d8474bb401dc1a50d8e7d67b40b84ddce5fd39f871fef06a7ca +SIZE (gnome2/evince-2.22.0.tar.bz2) = 1618429 diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist index 2014c40f8274..79fa10615bd5 100644 --- a/graphics/evince/pkg-plist +++ b/graphics/evince/pkg-plist @@ -1,8 +1,59 @@ bin/evince bin/evince-thumbnailer -%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.a -%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.la -%%NAUTILUS%%lib/nautilus/extensions-1.0/libevince-properties-page.so +include/evince-2.20/evince/ev-async-renderer.h +include/evince-2.20/evince/ev-attachment.h +include/evince-2.20/evince/ev-document-find.h +include/evince-2.20/evince/ev-document-fonts.h +include/evince-2.20/evince/ev-document-forms.h +include/evince-2.20/evince/ev-document-images.h +include/evince-2.20/evince/ev-document-info.h +include/evince-2.20/evince/ev-document-links.h +include/evince-2.20/evince/ev-document-misc.h +include/evince-2.20/evince/ev-document-security.h +include/evince-2.20/evince/ev-document-thumbnails.h +include/evince-2.20/evince/ev-document-transition.h +include/evince-2.20/evince/ev-document.h +include/evince-2.20/evince/ev-file-exporter.h +include/evince-2.20/evince/ev-file-helpers.h +include/evince-2.20/evince/ev-form-field.h +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-render-context.h +include/evince-2.20/evince/ev-selection.h +include/evince-2.20/evince/ev-transition-effect.h +%%COMICS%%lib/evince/backends/comicsdocument.evince-backend +%%DJVU%%lib/evince/backends/djvudocument.evince-backend +%%DVI%%lib/evince/backends/dvidocument.evince-backend +%%COMICS%%lib/evince/backends/libcomicsdocument.a +%%COMICS%%lib/evince/backends/libcomicsdocument.la +%%COMICS%%lib/evince/backends/libcomicsdocument.so +%%DJVU%%lib/evince/backends/libdjvudocument.a +%%DJVU%%lib/evince/backends/libdjvudocument.la +%%DJVU%%lib/evince/backends/libdjvudocument.so +%%DVI%%lib/evince/backends/libdvidocument.a +%%DVI%%lib/evince/backends/libdvidocument.la +%%DVI%%lib/evince/backends/libdvidocument.so +lib/evince/backends/libpdfdocument.a +lib/evince/backends/libpdfdocument.la +lib/evince/backends/libpdfdocument.so +lib/evince/backends/libpsdocument.a +lib/evince/backends/libpsdocument.la +lib/evince/backends/libpsdocument.so +lib/evince/backends/libtiffdocument.a +lib/evince/backends/libtiffdocument.la +lib/evince/backends/libtiffdocument.so +lib/evince/backends/pdfdocument.evince-backend +lib/evince/backends/psdocument.evince-backend +lib/evince/backends/tiffdocument.evince-backend +%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.a +%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.la +%%NAUTILUS%%lib/nautilus/extensions-2.0/libevince-properties-page.so +lib/libevbackend.a +lib/libevbackend.la +lib/libevbackend.so +lib/libevbackend.so.0 share/applications/evince.desktop %%DOCSDIR%%/EvAttachment.html %%DOCSDIR%%/EvJobPrint.html @@ -42,7 +93,6 @@ share/applications/evince.desktop %%DOCSDIR%%/evince-ev-metadata-manager.html %%DOCSDIR%%/evince-ev-page-cache.html %%DOCSDIR%%/evince-ev-pixbuf-cache.html -%%DOCSDIR%%/evince-ev-print-job.html %%DOCSDIR%%/evince-ev-properties-dialog.html %%DOCSDIR%%/evince-ev-properties-fonts.html %%DOCSDIR%%/evince-ev-selection.html @@ -125,12 +175,15 @@ 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/zh_CN/evince.xml +share/gnome/help/evince/zh_CN/figures/evince_start_window.png share/icons/hicolor/16x16/apps/evince.png share/icons/hicolor/22x22/apps/evince.png share/icons/hicolor/24x24/apps/evince.png share/icons/hicolor/48x48/apps/evince.png share/icons/hicolor/scalable/apps/evince.svg share/locale/ar/LC_MESSAGES/evince.mo +share/locale/as/LC_MESSAGES/evince.mo share/locale/be/LC_MESSAGES/evince.mo share/locale/be@latin/LC_MESSAGES/evince.mo share/locale/bg/LC_MESSAGES/evince.mo @@ -152,6 +205,7 @@ share/locale/eu/LC_MESSAGES/evince.mo share/locale/fa/LC_MESSAGES/evince.mo share/locale/fi/LC_MESSAGES/evince.mo share/locale/fr/LC_MESSAGES/evince.mo +share/locale/ga/LC_MESSAGES/evince.mo share/locale/gl/LC_MESSAGES/evince.mo share/locale/gu/LC_MESSAGES/evince.mo share/locale/he/LC_MESSAGES/evince.mo @@ -162,6 +216,7 @@ share/locale/it/LC_MESSAGES/evince.mo share/locale/ja/LC_MESSAGES/evince.mo share/locale/ka/LC_MESSAGES/evince.mo share/locale/ko/LC_MESSAGES/evince.mo +share/locale/kn/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 @@ -184,6 +239,7 @@ share/locale/ru/LC_MESSAGES/evince.mo share/locale/rw/LC_MESSAGES/evince.mo share/locale/sk/LC_MESSAGES/evince.mo share/locale/sl/LC_MESSAGES/evince.mo +share/locale/si/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 @@ -215,7 +271,10 @@ 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-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/uk/figures @dirrm share/gnome/help/evince/uk @dirrm share/gnome/help/evince/sv/figures @@ -267,10 +326,17 @@ share/omf/evince/evince-uk.omf @dirrm %%DOCSDIR%% @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 +@dirrm lib/evince/backends +@dirrm lib/evince +@dirrm include/evince-2.20/evince +@dirrm include/evince-2.20 @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/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrmtry share/locale/oc/LC_MESSAGES @@ -287,4 +353,5 @@ share/omf/evince/evince-uk.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile index 4234b9da6c19..f59518fa8164 100644 --- a/graphics/goocanvas/Makefile +++ b/graphics/goocanvas/Makefile @@ -3,19 +3,18 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/goocanvas/Makefile,v 1.1 2006/09/21 00:08:36 ahze Exp $ +# $MCom: ports/graphics/goocanvas/Makefile,v 1.3 2008/02/27 16:19:11 ahze Exp $ PORTNAME= goocanvas -PORTVERSION= 0.4 -PORTREVISION= 1 +PORTVERSION= 0.9 CATEGORIES= graphics MASTER_SITES= SOURCEFORGE MAINTAINER= ahze@FreeBSD.org COMMENT= Canvas widget for GTK+ -USE_GNOME= gtk20 gnomehack -GNU_CONFIGURE= yes +USE_GNOME= gtk20 gnomehack ltverhack +USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes post-patch: diff --git a/graphics/goocanvas/distinfo b/graphics/goocanvas/distinfo index a8d1fb65788e..554b76e2d757 100644 --- a/graphics/goocanvas/distinfo +++ b/graphics/goocanvas/distinfo @@ -1,3 +1,3 @@ -MD5 (goocanvas-0.4.tar.gz) = a53edae318e87d13269c2fbd2fe34cd3 -SHA256 (goocanvas-0.4.tar.gz) = 6e9594a6864e73e23fec540a430a454c2168394d9ec793e9d6adb1530f5d096a -SIZE (goocanvas-0.4.tar.gz) = 566546 +MD5 (goocanvas-0.9.tar.gz) = 600f28e51736b9d768108c32172b0726 +SHA256 (goocanvas-0.9.tar.gz) = d9435a02e1aea2317ed73106f12c803400679f4e43bf4af54ba419c48e6ea27b +SIZE (goocanvas-0.9.tar.gz) = 749439 diff --git a/graphics/goocanvas/pkg-plist b/graphics/goocanvas/pkg-plist index b4740333eb2b..d71962945f5d 100644 --- a/graphics/goocanvas/pkg-plist +++ b/graphics/goocanvas/pkg-plist @@ -1,57 +1,58 @@ include/goocanvas-1.0/goocanvas.h include/goocanvas-1.0/goocanvasellipse.h -include/goocanvas-1.0/goocanvasellipseview.h +include/goocanvas-1.0/goocanvasenumtypes.h include/goocanvas-1.0/goocanvasgroup.h -include/goocanvas-1.0/goocanvasgroupview.h include/goocanvas-1.0/goocanvasimage.h -include/goocanvas-1.0/goocanvasimageview.h include/goocanvas-1.0/goocanvasitem.h +include/goocanvas-1.0/goocanvasitemmodel.h include/goocanvas-1.0/goocanvasitemsimple.h -include/goocanvas-1.0/goocanvasitemview.h -include/goocanvas-1.0/goocanvasitemviewsimple.h -include/goocanvas-1.0/goocanvasmodel.h -include/goocanvas-1.0/goocanvasmodelsimple.h +include/goocanvas-1.0/goocanvasmarshal.h include/goocanvas-1.0/goocanvaspath.h -include/goocanvas-1.0/goocanvaspathview.h include/goocanvas-1.0/goocanvaspolyline.h -include/goocanvas-1.0/goocanvaspolylineview.h include/goocanvas-1.0/goocanvasrect.h -include/goocanvas-1.0/goocanvasrectview.h +include/goocanvas-1.0/goocanvasstyle.h +include/goocanvas-1.0/goocanvastable.h include/goocanvas-1.0/goocanvastext.h -include/goocanvas-1.0/goocanvastextview.h include/goocanvas-1.0/goocanvasutils.h -include/goocanvas-1.0/goocanvasview.h +include/goocanvas-1.0/goocanvaswidget.h lib/libgoocanvas.a lib/libgoocanvas.la lib/libgoocanvas.so -lib/libgoocanvas.so.0 +lib/libgoocanvas.so.3 libdata/pkgconfig/goocanvas.pc +%%DOCSDIR%%/goocanvas/GooCanvas.html %%DOCSDIR%%/goocanvas/GooCanvasEllipse.html -%%DOCSDIR%%/goocanvas/GooCanvasEllipseView.html +%%DOCSDIR%%/goocanvas/GooCanvasEllipseModel.html %%DOCSDIR%%/goocanvas/GooCanvasGroup.html -%%DOCSDIR%%/goocanvas/GooCanvasGroupView.html +%%DOCSDIR%%/goocanvas/GooCanvasGroupModel.html %%DOCSDIR%%/goocanvas/GooCanvasImage.html -%%DOCSDIR%%/goocanvas/GooCanvasImageView.html -%%DOCSDIR%%/goocanvas/GooCanvasItem.html +%%DOCSDIR%%/goocanvas/GooCanvasImageModel.html +%%DOCSDIR%%/goocanvas/GooCanvasItemModelSimple.html %%DOCSDIR%%/goocanvas/GooCanvasItemSimple.html -%%DOCSDIR%%/goocanvas/GooCanvasItemView.html -%%DOCSDIR%%/goocanvas/GooCanvasModel.html -%%DOCSDIR%%/goocanvas/GooCanvasModelSimple.html %%DOCSDIR%%/goocanvas/GooCanvasPath.html -%%DOCSDIR%%/goocanvas/GooCanvasPathView.html +%%DOCSDIR%%/goocanvas/GooCanvasPathModel.html %%DOCSDIR%%/goocanvas/GooCanvasPolyline.html -%%DOCSDIR%%/goocanvas/GooCanvasPolylineView.html +%%DOCSDIR%%/goocanvas/GooCanvasPolylineModel.html %%DOCSDIR%%/goocanvas/GooCanvasRect.html -%%DOCSDIR%%/goocanvas/GooCanvasRectView.html +%%DOCSDIR%%/goocanvas/GooCanvasRectModel.html +%%DOCSDIR%%/goocanvas/GooCanvasStyle.html +%%DOCSDIR%%/goocanvas/GooCanvasTable.html +%%DOCSDIR%%/goocanvas/GooCanvasTableModel.html %%DOCSDIR%%/goocanvas/GooCanvasText.html -%%DOCSDIR%%/goocanvas/GooCanvasTextView.html -%%DOCSDIR%%/goocanvas/GooCanvasView.html +%%DOCSDIR%%/goocanvas/GooCanvasTextModel.html +%%DOCSDIR%%/goocanvas/GooCanvasWidget.html %%DOCSDIR%%/goocanvas/ch01.html %%DOCSDIR%%/goocanvas/ch02.html %%DOCSDIR%%/goocanvas/ch03.html %%DOCSDIR%%/goocanvas/ch04.html +%%DOCSDIR%%/goocanvas/ch05.html %%DOCSDIR%%/goocanvas/goocanvas-GooCanvas-Types.html -%%DOCSDIR%%/goocanvas/goocanvas-goocanvasitemviewsimple.html +%%DOCSDIR%%/goocanvas/goocanvas-creating-items.html +%%DOCSDIR%%/goocanvas/goocanvas-goocanvasitem.html +%%DOCSDIR%%/goocanvas/goocanvas-goocanvasitemmodel.html +%%DOCSDIR%%/goocanvas/goocanvas-model-view-canvas.html +%%DOCSDIR%%/goocanvas/goocanvas-overview.html +%%DOCSDIR%%/goocanvas/goocanvas-simple-canvas.html %%DOCSDIR%%/goocanvas/goocanvas.devhelp %%DOCSDIR%%/goocanvas/goocanvas.devhelp2 %%DOCSDIR%%/goocanvas/home.png diff --git a/graphics/gstreamer-plugins-aalib/Makefile b/graphics/gstreamer-plugins-aalib/Makefile index 48f9dc503777..d591578e0ad2 100644 --- a/graphics/gstreamer-plugins-aalib/Makefile +++ b/graphics/gstreamer-plugins-aalib/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-aalib/Makefile,v 1.5 2008/03/19 14:05:33 ahze Exp $ # PORTREVISION= 2 diff --git a/graphics/gstreamer-plugins-cairo/Makefile b/graphics/gstreamer-plugins-cairo/Makefile index 7f9e44bb76fa..fd18fcb0697f 100644 --- a/graphics/gstreamer-plugins-cairo/Makefile +++ b/graphics/gstreamer-plugins-cairo/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.2 2005/10/14 20:39:57 adamw Exp $ +# $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.6 2008/03/19 14:05:34 ahze Exp $ # PORTREVISION= 2 diff --git a/graphics/gstreamer-plugins-gdkpixbuf/Makefile b/graphics/gstreamer-plugins-gdkpixbuf/Makefile new file mode 100644 index 000000000000..ae4ab4ce3dda --- /dev/null +++ b/graphics/gstreamer-plugins-gdkpixbuf/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: gstreamer-plugins-gdkpixbuf +# Date created: 3 Oct 2004 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-gdkpixbuf/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ +# + +PORTREVISION= 2 +CATEGORIES= graphics + +COMMENT= Gstreamer image decoder plugin + +GST_PLUGIN= gdk_pixbuf + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/gstreamer-plugins-jpeg/Makefile b/graphics/gstreamer-plugins-jpeg/Makefile index 48ec12edff5f..aa8a1a51f93d 100644 --- a/graphics/gstreamer-plugins-jpeg/Makefile +++ b/graphics/gstreamer-plugins-jpeg/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-jpeg/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ # PORTREVISION= 2 diff --git a/graphics/gstreamer-plugins-libcaca/Makefile b/graphics/gstreamer-plugins-libcaca/Makefile index 9282ccfac855..4f68f1651a3f 100644 --- a/graphics/gstreamer-plugins-libcaca/Makefile +++ b/graphics/gstreamer-plugins-libcaca/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-libcaca/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= graphics COMMENT= Gstreamer color ascii art plugin diff --git a/graphics/gstreamer-plugins-libpng/Makefile b/graphics/gstreamer-plugins-libpng/Makefile index 0c7901a5e776..4a0786d8e61f 100644 --- a/graphics/gstreamer-plugins-libpng/Makefile +++ b/graphics/gstreamer-plugins-libpng/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/graphics/gstreamer-plugins-libpng/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ PORTREVISION= 2 CATEGORIES= graphics diff --git a/graphics/gstreamer-plugins-libvisual/Makefile b/graphics/gstreamer-plugins-libvisual/Makefile index d445f68b1d12..dc416c7007b2 100644 --- a/graphics/gstreamer-plugins-libvisual/Makefile +++ b/graphics/gstreamer-plugins-libvisual/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/graphics/gstreamer-plugins-libvisual/Makefile,v 1.6 2008/03/21 04:01:32 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer libvisual plugin diff --git a/graphics/gstreamer-plugins-swfdec/Makefile b/graphics/gstreamer-plugins-swfdec/Makefile index fb02ba2169e0..b07349ebbade 100644 --- a/graphics/gstreamer-plugins-swfdec/Makefile +++ b/graphics/gstreamer-plugins-swfdec/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/gstreamer-plugins-swfdec80/Makefile,v 1.2 2006/02/24 18:50:34 marcus Exp $ +# $MCom: ports/graphics/gstreamer-plugins-swfdec/Makefile,v 1.5 2008/03/19 14:05:35 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics COMMENT= Gstreamer flash redering plugin diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index cac2427866ca..413a57b3456c 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -7,6 +7,7 @@ PORTNAME= inkscape PORTVERSION= 0.45.1 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -57,6 +58,10 @@ post-patch: ${WRKSRC}/src/display/bezier-utils.cpp @${REINPLACE_CMD} -e 's|libpng >= 1.2|libpng12 >= 1.2|g' \ ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name "*.h" -o -name "*.cpp" | ${XARGS} \ + ${REINPLACE_CMD} -e 's|glib/gmessages.h|glib/gtestutils.h|g' + @${REINPLACE_CMD} -e 's|SigC::Connection|sigc::connection|g' \ + ${WRKSRC}/src/seltrans.h post-install: @-update-desktop-database diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist index 9e6253f9d142..71832c2f3bbe 100644 --- a/graphics/inkscape/pkg-plist +++ b/graphics/inkscape/pkg-plist @@ -399,10 +399,6 @@ share/locale/vi/LC_MESSAGES/inkscape.mo share/locale/zh_CN/LC_MESSAGES/inkscape.mo share/locale/zh_TW/LC_MESSAGES/inkscape.mo share/pixmaps/inkscape.png -@dirrmtry share/locale/km/LC_MESSAGES -@dirrmtry share/locale/km -@dirrmtry share/locale/en_US@piglatin/LC_MESSAGES -@dirrmtry share/locale/en_US@piglatin @dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/tutorials @dirrm %%DATADIR%%/templates @@ -420,3 +416,11 @@ share/pixmaps/inkscape.png @dirrm %%DATADIR%% @dirrmtry share/applications @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km +@dirrmtry share/locale/en_US@piglatin/LC_MESSAGES +@dirrmtry share/locale/en_US@piglatin +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile index 2712f78f730e..5a8659ba7296 100644 --- a/graphics/libgnomecanvasmm26/Makefile +++ b/graphics/libgnomecanvasmm26/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.16 2007/09/17 16:42:56 marcus Exp $ +# $MCom: ports/graphics/libgnomecanvasmm26/Makefile,v 1.18 2008/03/08 16:48:36 marcus Exp $ # PORTNAME= libgnomecanvasmm -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 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 9bb8e0f2a27b..e1f92bfc1553 100644 --- a/graphics/libgnomecanvasmm26/distinfo +++ b/graphics/libgnomecanvasmm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomecanvasmm-2.20.0.tar.bz2) = 2a7cdcfd093db49c41e455e7b744e1c2 -SHA256 (gnome2/libgnomecanvasmm-2.20.0.tar.bz2) = 4fd42d16d286dad698724e800c968921e3a4784fd5b1d3a6a5e4f7f88e714b08 -SIZE (gnome2/libgnomecanvasmm-2.20.0.tar.bz2) = 321375 +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 diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index af084078833f..521e371c77e5 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,11 +3,11 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.117 2007/08/29 20:04:44 mezz Exp $ +# $MCom: ports/graphics/librsvg2/Makefile,v 1.121 2008/03/04 18:51:53 kwm Exp $ # PORTNAME= librsvg2 -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.2 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -47,7 +47,7 @@ OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no .if defined(WITH_MOZILLA_PLUGIN) USE_GECKO= firefox mozilla seamonkey xulrunner firefox15 -.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" +.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" CONFIGURE_ENV+= MOZILLA_CONFIG=no CONFIGURE_ARGS+=--enable-mozilla-plugin=yes diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 08837dd1b57d..3bd793ec5d8e 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/librsvg-2.20.0.tar.bz2) = 14cc098b68e72ee6a8cdd55edc1ea1b4 -SHA256 (gnome2/librsvg-2.20.0.tar.bz2) = f980a58e766c42eb0d9d942fd2068f02aa19e68c7e57f822de60b739da1a1fb0 -SIZE (gnome2/librsvg-2.20.0.tar.bz2) = 463714 +MD5 (gnome2/librsvg-2.22.2.tar.bz2) = aae602677ce201b1a0ed6a0c18c207f2 +SHA256 (gnome2/librsvg-2.22.2.tar.bz2) = 2bfc1853ecdc545bf3767ed92c93b8796f2075f522c8eab1693c96f11d55a59e +SIZE (gnome2/librsvg-2.22.2.tar.bz2) = 464857 diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile index 174564b80b19..48fc6ef557b9 100644 --- a/graphics/py-goocanvas/Makefile +++ b/graphics/py-goocanvas/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/py-goocanvas/Makefile,v 1.2 2006/10/13 05:28:57 ahze Exp $ +# $MCom: ports/graphics/py-goocanvas/Makefile,v 1.4 2008/02/27 16:19:50 ahze Exp $ PORTNAME= goocanvas -PORTVERSION= 0.4.1 -PORTREVISION= 2 +PORTVERSION= 0.9.0 CATEGORIES= graphics MASTER_SITES= BERLIOS MASTER_SITE_SUBDIR= py${PORTNAME} @@ -17,7 +16,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= ahze@FreeBSD.org COMMENT= GooCanvas python bindings -LIB_DEPENDS= goocanvas.0:${PORTSDIR}/graphics/goocanvas +LIB_DEPENDS= goocanvas.3:${PORTSDIR}/graphics/goocanvas PLIST_FILES= %%PYTHON_SITELIBDIR%%/goocanvasmodule.la \ %%PYTHON_SITELIBDIR%%/goocanvasmodule.so diff --git a/graphics/py-goocanvas/distinfo b/graphics/py-goocanvas/distinfo index 4e9c3a29e573..63e62b0acb2a 100644 --- a/graphics/py-goocanvas/distinfo +++ b/graphics/py-goocanvas/distinfo @@ -1,3 +1,3 @@ -MD5 (pygoocanvas-0.4.1.tar.gz) = 9a435f6cf0bf8452adf4cfa39084ab80 -SHA256 (pygoocanvas-0.4.1.tar.gz) = f8df7dcb98d4940aaa1a79d78133238d2ea5aa7aee4c094a3970efb5dd04e782 -SIZE (pygoocanvas-0.4.1.tar.gz) = 347756 +MD5 (pygoocanvas-0.9.0.tar.gz) = 1988b7572d553d954ffd159e7e61cb17 +SHA256 (pygoocanvas-0.9.0.tar.gz) = 3fa0944b57253b9981a1ea1baa92fc03a0d746a49d779b9c5f51080959c7e011 +SIZE (pygoocanvas-0.9.0.tar.gz) = 430723 diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile index 638343622f86..12b51707e02e 100644 --- a/graphics/ruby-cairo/Makefile +++ b/graphics/ruby-cairo/Makefile @@ -3,12 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/ruby-cairo/Makefile,v 1.4 2006/09/09 20:07:18 mezz Exp $ +# $MCom: ports/graphics/ruby-cairo/Makefile,v 1.6 2008/02/28 21:28:18 mezz Exp $ # PORTNAME= cairo -PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTVERSION= 1.5.1 CATEGORIES= graphics ruby MASTER_SITES= http://cairographics.org/releases/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -28,8 +27,9 @@ DOCS= AUTHORS COPYING ChangeLog GPL NEWS README post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${RUBY_MODEXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/ + @${MKDIR} ${RUBY_MODEXAMPLESDIR}/agg + @${INSTALL_DATA} ${WRKSRC}/samples/*.rb ${RUBY_MODEXAMPLESDIR}/ + @${INSTALL_DATA} ${WRKSRC}/samples/agg/*.rb ${RUBY_MODEXAMPLESDIR}/agg/ @${MKDIR} ${RUBY_MODDOCDIR} .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ diff --git a/graphics/ruby-cairo/distinfo b/graphics/ruby-cairo/distinfo index c44c8ac13acf..24c7a0ba2466 100644 --- a/graphics/ruby-cairo/distinfo +++ b/graphics/ruby-cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (rcairo-1.4.1.tar.gz) = f71b78681c3986436347387c06e66ad8 -SHA256 (rcairo-1.4.1.tar.gz) = b16c3a2fcf02dc1c7e06603f0111427d036c1d506f37397f17662fb1a3bb3644 -SIZE (rcairo-1.4.1.tar.gz) = 43291 +MD5 (rcairo-1.5.1.tar.gz) = 6778eaa1a32e289c47adcd40ef0f2595 +SHA256 (rcairo-1.5.1.tar.gz) = de937298cf8ffa129e452946ba52aa2614e930a77346895da2eec72c7700ef3b +SIZE (rcairo-1.5.1.tar.gz) = 68494 diff --git a/graphics/ruby-cairo/pkg-plist b/graphics/ruby-cairo/pkg-plist index 755268fb1599..c22f4815af26 100644 --- a/graphics/ruby-cairo/pkg-plist +++ b/graphics/ruby-cairo/pkg-plist @@ -1,9 +1,16 @@ %%RUBY_SITELIBDIR%%/cairo.rb +%%RUBY_SITELIBDIR%%/cairo/color.rb +%%RUBY_SITELIBDIR%%/cairo/colors.rb +%%RUBY_SITELIBDIR%%/cairo/constants.rb %%RUBY_SITELIBDIR%%/cairo/context.rb +%%RUBY_SITELIBDIR%%/cairo/context/blur.rb %%RUBY_SITELIBDIR%%/cairo/context/circle.rb +%%RUBY_SITELIBDIR%%/cairo/context/color.rb %%RUBY_SITELIBDIR%%/cairo/context/path.rb -%%RUBY_SITELIBDIR%%/cairo/context/quad.rb %%RUBY_SITELIBDIR%%/cairo/context/rectangle.rb +%%RUBY_SITELIBDIR%%/cairo/context/triangle.rb +%%RUBY_SITELIBDIR%%/cairo/path.rb +%%RUBY_SITELIBDIR%%/cairo/point.rb %%RUBY_SITEARCHLIBDIR%%/cairo.so %%RUBY_SITEARCHLIBDIR%%/rb_cairo.h %%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS @@ -12,12 +19,15 @@ %%PORTDOCS%%%%RUBY_MODDOCDIR%%/GPL %%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/agg/aa_test.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/blur.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pac.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pac2.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/png.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scalable.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/text-on-path.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/text2.rb +%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/agg %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% %%PORTDOCS%%@dirrm %%RUBY_SITELIBDIR%%/cairo/context diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile index 727b46ad7eb3..cce4ee5d2919 100644 --- a/graphics/swfdec/Makefile +++ b/graphics/swfdec/Makefile @@ -7,15 +7,16 @@ # PORTNAME= swfdec -PORTVERSION= 0.5.5 +PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.5/ +MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.6/ MAINTAINER= alexbl@FreeBSD.org COMMENT= Flash Rendering Library -LIB_DEPENDS= oil-0.3.1:${PORTSDIR}/devel/liboil \ - soup-2.2.8:${PORTSDIR}/devel/libsoup +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:261 diff --git a/graphics/swfdec/distinfo b/graphics/swfdec/distinfo index 63f872cc7ce0..8359a495cd09 100644 --- a/graphics/swfdec/distinfo +++ b/graphics/swfdec/distinfo @@ -1,3 +1,3 @@ -MD5 (swfdec-0.5.5.tar.gz) = b988b014e210cee205aeccaca4d6a9a7 -SHA256 (swfdec-0.5.5.tar.gz) = 30b6f4f0ec424b60c91f8db272068f51cb3df204f6a65f155308389981bb99a6 -SIZE (swfdec-0.5.5.tar.gz) = 8667844 +MD5 (swfdec-0.6.0.tar.gz) = c012a5e6dd23558b86d2e08e2e43857b +SHA256 (swfdec-0.6.0.tar.gz) = bd7c9068ce545ef75f8820b94f6b0954194ca5b106a53463bf9a6ed448fa057f +SIZE (swfdec-0.6.0.tar.gz) = 8762575 diff --git a/graphics/swfdec/files/patch-swfdec-gtk_swfdec_gtk_system.c b/graphics/swfdec/files/patch-swfdec-gtk_swfdec_gtk_system.c new file mode 100644 index 000000000000..2a62e63dee30 --- /dev/null +++ b/graphics/swfdec/files/patch-swfdec-gtk_swfdec_gtk_system.c @@ -0,0 +1,16 @@ +--- swfdec-gtk/swfdec_gtk_system.c.orig 2008-02-22 15:38:09.000000000 -0500 ++++ swfdec-gtk/swfdec_gtk_system.c 2008-02-22 15:38:13.000000000 -0500 +@@ -114,8 +114,12 @@ swfdec_gtk_system_get_language (void) + static int + swfdec_gtk_system_get_utc_offset (void) + { ++ struct tm *t; ++ time_t tt; + tzset (); +- return timezone / 60; ++ tt = time (NULL); ++ t = localtime (&tt); ++ return t->tm_gmtoff / 60; + } + + /*** PUBLIC API ***/ diff --git a/graphics/swfdec/pkg-plist b/graphics/swfdec/pkg-plist index ba94d5763aec..4bece92d530e 100644 --- a/graphics/swfdec/pkg-plist +++ b/graphics/swfdec/pkg-plist @@ -1,62 +1,71 @@ -include/swfdec-%%VERSION%%/libswfdec-gtk/swfdec-gtk.h -include/swfdec-%%VERSION%%/libswfdec-gtk/swfdec_gtk_keys.h -include/swfdec-%%VERSION%%/libswfdec-gtk/swfdec_gtk_loader.h -include/swfdec-%%VERSION%%/libswfdec-gtk/swfdec_gtk_player.h -include/swfdec-%%VERSION%%/libswfdec-gtk/swfdec_gtk_widget.h -include/swfdec-%%VERSION%%/libswfdec/swfdec.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_as_array.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_as_context.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_as_debugger.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_as_frame.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_as_function.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_as_native_function.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_as_object.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_as_types.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_audio.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_buffer.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_enums.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_file_loader.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_keys.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_loader.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_player.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_rectangle.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_script.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_system.h -include/swfdec-%%VERSION%%/libswfdec/swfdec_url.h +include/swfdec-%%VERSION%%/swfdec-gtk/swfdec-gtk.h +include/swfdec-%%VERSION%%/swfdec-gtk/swfdec_gtk_keys.h +include/swfdec-%%VERSION%%/swfdec-gtk/swfdec_gtk_loader.h +include/swfdec-%%VERSION%%/swfdec-gtk/swfdec_gtk_player.h +include/swfdec-%%VERSION%%/swfdec-gtk/swfdec_gtk_socket.h +include/swfdec-%%VERSION%%/swfdec-gtk/swfdec_gtk_system.h +include/swfdec-%%VERSION%%/swfdec-gtk/swfdec_gtk_widget.h +include/swfdec-%%VERSION%%/swfdec/swfdec.h +include/swfdec-%%VERSION%%/swfdec/swfdec_as_array.h +include/swfdec-%%VERSION%%/swfdec/swfdec_as_context.h +include/swfdec-%%VERSION%%/swfdec/swfdec_as_debugger.h +include/swfdec-%%VERSION%%/swfdec/swfdec_as_frame.h +include/swfdec-%%VERSION%%/swfdec/swfdec_as_function.h +include/swfdec-%%VERSION%%/swfdec/swfdec_as_native_function.h +include/swfdec-%%VERSION%%/swfdec/swfdec_as_object.h +include/swfdec-%%VERSION%%/swfdec/swfdec_as_types.h +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_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_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 lib/libswfdec-%%VERSION%%.a lib/libswfdec-%%VERSION%%.la lib/libswfdec-%%VERSION%%.so -lib/libswfdec-%%VERSION%%.so.5 +lib/libswfdec-%%VERSION%%.so.90 lib/libswfdec-gtk-%%VERSION%%.a lib/libswfdec-gtk-%%VERSION%%.la lib/libswfdec-gtk-%%VERSION%%.so -lib/libswfdec-gtk-%%VERSION%%.so.5 +lib/libswfdec-gtk-%%VERSION%%.so.90 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 -share/gtk-doc/html/swfdec/SwfdecGtkLoader.html share/gtk-doc/html/swfdec/SwfdecGtkPlayer.html 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/SwfdecSocket.html +share/gtk-doc/html/swfdec/SwfdecStream.html share/gtk-doc/html/swfdec/SwfdecSystem.html share/gtk-doc/html/swfdec/ch01.html share/gtk-doc/html/swfdec/ch02.html share/gtk-doc/html/swfdec/ch03.html +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/left.png share/gtk-doc/html/swfdec/right.png share/gtk-doc/html/swfdec/style.css -share/gtk-doc/html/swfdec/swfdec-Enumerations.html +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-SwfdecAsArray.html -share/gtk-doc/html/swfdec/swfdec-SwfdecAsFrame.html -share/gtk-doc/html/swfdec/swfdec-SwfdecAsFunction.html -share/gtk-doc/html/swfdec/swfdec-SwfdecAsObject.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 @@ -71,6 +80,6 @@ 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%%/libswfdec-gtk -@dirrm include/swfdec-%%VERSION%%/libswfdec +@dirrm include/swfdec-%%VERSION%%/swfdec-gtk +@dirrm include/swfdec-%%VERSION%%/swfdec @dirrm include/swfdec-%%VERSION%% diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index eaf37e8dd9cc..026a95ac4e61 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -7,7 +7,7 @@ PORTNAME= vips PORTVERSION= 7.12.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/vips-${PORTVERSION:R}/ diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index f08068a09b90..a2c86d66d05a 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -3,11 +3,12 @@ # Whom: Adam Weinberger, based off kiesel's ximian-exchange port # # $FreeBSD$ -# $MCom: ports-stable/mail/evolution-exchange/Makefile,v 1.1 2007/11/30 21:39:26 marcus Exp $ +# $MCom: ports/mail/evolution-exchange/Makefile,v 1.110 2008/03/13 03:13:38 marcus Exp $ # PORTNAME= evolution-exchange -PORTVERSION= 2.12.3 +PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -22,11 +23,11 @@ RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution USE_BZIP2= yes USE_GETTEXT= yes USE_XLIB= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_BDB= 41 USE_OPENLDAP= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnometarget +USE_GNOME= gnomeprefix intlhack gnomehack gnometarget ltasneededhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ @@ -34,10 +35,10 @@ CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ --disable-compile-warnings \ --with-libdb=${LOCALBASE} -EVO_VERSION= 2.12 -VERSION= 2.12 +EVO_VERSION= 2.22 +VERSION= 2.22 PLIST_SUB= VERSION=${VERSION} EVO_VERSION=${EVO_VERSION} \ - EDS_VERSION="1.2" OLDDOCSDIR="share/doc/ximian-connector" + EDS_VERSION="1.2" GCONF_SCHEMAS= apps_exchange_addressbook-${VERSION}.schemas diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo index 0f94b27c8bf1..b7986d562b64 100644 --- a/mail/evolution-exchange/distinfo +++ b/mail/evolution-exchange/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-exchange-2.12.3.tar.bz2) = 1bdda76724a17fb7606abcdfdb6ec170 -SHA256 (gnome2/evolution-exchange-2.12.3.tar.bz2) = 96f86d5a36f9f5583e5d4c14e6e48d0a42ccd4f7e4e04bf8b5616232cd82b50b -SIZE (gnome2/evolution-exchange-2.12.3.tar.bz2) = 1064907 +MD5 (gnome2/evolution-exchange-2.22.0.tar.bz2) = fea02f97cc8fe62dca0d50ffdc19e416 +SHA256 (gnome2/evolution-exchange-2.22.0.tar.bz2) = fb1296b0690625a3ce3ef196f36857fdd682f8a574c8003f2834bb23659a3b94 +SIZE (gnome2/evolution-exchange-2.22.0.tar.bz2) = 1091609 diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist index 7ee15d2a4bdb..84f53a2cad42 100644 --- a/mail/evolution-exchange/pkg-plist +++ b/mail/evolution-exchange/pkg-plist @@ -5,64 +5,63 @@ lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage -%%OLDDOCSDIR%%/E2kContext.html -%%OLDDOCSDIR%%/E2kGlobalCatalog.html -%%OLDDOCSDIR%%/E2kSecurityDescriptor.html -%%OLDDOCSDIR%%/ch01.html -%%OLDDOCSDIR%%/ch02.html -%%OLDDOCSDIR%%/ch03.html -%%OLDDOCSDIR%%/ch04.html -%%OLDDOCSDIR%%/ch05.html -%%OLDDOCSDIR%%/ch06.html -%%OLDDOCSDIR%%/home.png -%%OLDDOCSDIR%%/index.html -%%OLDDOCSDIR%%/index.sgml -%%OLDDOCSDIR%%/left.png -%%OLDDOCSDIR%%/right.png -%%OLDDOCSDIR%%/style.css -%%OLDDOCSDIR%%/up.png -%%OLDDOCSDIR%%/ximian-connector-E2kAutoconfig.html -%%OLDDOCSDIR%%/ximian-connector-E2kContext-(private).html -%%OLDDOCSDIR%%/ximian-connector-E2kOperation-(private).html -%%OLDDOCSDIR%%/ximian-connector-E2kOperation.html -%%OLDDOCSDIR%%/ximian-connector-E2kProperties.html -%%OLDDOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html -%%OLDDOCSDIR%%/ximian-connector-E2kResult-(private).html -%%OLDDOCSDIR%%/ximian-connector-E2kSid.html -%%OLDDOCSDIR%%/ximian-connector-E2kUserDialog.html -%%OLDDOCSDIR%%/ximian-connector-MAPI.html -%%OLDDOCSDIR%%/ximian-connector-autoconfig.html -%%OLDDOCSDIR%%/ximian-connector-bug-private.html -%%OLDDOCSDIR%%/ximian-connector-bug-xml.html -%%OLDDOCSDIR%%/ximian-connector-calendar.html -%%OLDDOCSDIR%%/ximian-connector-delegation.html -%%OLDDOCSDIR%%/ximian-connector-e2k-action.html -%%OLDDOCSDIR%%/ximian-connector-e2k-encoding-utils.html -%%OLDDOCSDIR%%/ximian-connector-e2k-freebusy.html -%%OLDDOCSDIR%%/ximian-connector-e2k-http-utils.html -%%OLDDOCSDIR%%/ximian-connector-e2k-kerberos.html -%%OLDDOCSDIR%%/ximian-connector-e2k-restriction.html -%%OLDDOCSDIR%%/ximian-connector-e2k-result.html -%%OLDDOCSDIR%%/ximian-connector-e2k-rule.html -%%OLDDOCSDIR%%/ximian-connector-e2k-uri.html -%%OLDDOCSDIR%%/ximian-connector-e2k-utils.html -%%OLDDOCSDIR%%/ximian-connector-e2k-xml-utils.html -%%OLDDOCSDIR%%/ximian-connector-favorites.html -%%OLDDOCSDIR%%/ximian-connector-fba.html -%%OLDDOCSDIR%%/ximian-connector-freebusy.html -%%OLDDOCSDIR%%/ximian-connector-mail-threading.html -%%OLDDOCSDIR%%/ximian-connector-mail.html -%%OLDDOCSDIR%%/ximian-connector-ntlm.html -%%OLDDOCSDIR%%/ximian-connector-oof.html -%%OLDDOCSDIR%%/ximian-connector-other-users.html -%%OLDDOCSDIR%%/ximian-connector-permissions.html -%%OLDDOCSDIR%%/ximian-connector-test-utils.html -%%OLDDOCSDIR%%/ximian-connector-xntlm-des.html -%%OLDDOCSDIR%%/ximian-connector-xntlm-md4.html -%%OLDDOCSDIR%%/ximian-connector-xntlm.html -%%OLDDOCSDIR%%/ximian-connector.devhelp -%%OLDDOCSDIR%%/ximian-connector.devhelp2 -%%OLDDOCSDIR%%/ximian-connnector-booking.html +%%DOCSDIR%%/E2kContext.html +%%DOCSDIR%%/E2kGlobalCatalog.html +%%DOCSDIR%%/E2kSecurityDescriptor.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/ch03.html +%%DOCSDIR%%/ch04.html +%%DOCSDIR%%/ch05.html +%%DOCSDIR%%/ch06.html +%%DOCSDIR%%/evolution-exchange-E2kAutoconfig.html +%%DOCSDIR%%/evolution-exchange-E2kContext-(private).html +%%DOCSDIR%%/evolution-exchange-E2kOperation-(private).html +%%DOCSDIR%%/evolution-exchange-E2kOperation.html +%%DOCSDIR%%/evolution-exchange-E2kProperties.html +%%DOCSDIR%%/evolution-exchange-E2kRestriction-(vaporware).html +%%DOCSDIR%%/evolution-exchange-E2kResult-(private).html +%%DOCSDIR%%/evolution-exchange-E2kSid.html +%%DOCSDIR%%/evolution-exchange-E2kUserDialog.html +%%DOCSDIR%%/evolution-exchange-MAPI.html +%%DOCSDIR%%/evolution-exchange-e2k-action.html +%%DOCSDIR%%/evolution-exchange-e2k-freebusy.html +%%DOCSDIR%%/evolution-exchange-e2k-http-utils.html +%%DOCSDIR%%/evolution-exchange-e2k-kerberos.html +%%DOCSDIR%%/evolution-exchange-e2k-restriction.html +%%DOCSDIR%%/evolution-exchange-e2k-result.html +%%DOCSDIR%%/evolution-exchange-e2k-rule.html +%%DOCSDIR%%/evolution-exchange-e2k-uri.html +%%DOCSDIR%%/evolution-exchange-e2k-utils.html +%%DOCSDIR%%/evolution-exchange-e2k-xml-utils.html +%%DOCSDIR%%/evolution-exchange-test-utils.html +%%DOCSDIR%%/evolution-exchange-xntlm-des.html +%%DOCSDIR%%/evolution-exchange-xntlm-md4.html +%%DOCSDIR%%/evolution-exchange-xntlm.html +%%DOCSDIR%%/evolution-exchange.devhelp +%%DOCSDIR%%/evolution-exchange.devhelp2 +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png +%%DOCSDIR%%/ximian-connector-autoconfig.html +%%DOCSDIR%%/ximian-connector-bug-private.html +%%DOCSDIR%%/ximian-connector-bug-xml.html +%%DOCSDIR%%/ximian-connector-calendar.html +%%DOCSDIR%%/ximian-connector-delegation.html +%%DOCSDIR%%/ximian-connector-favorites.html +%%DOCSDIR%%/ximian-connector-fba.html +%%DOCSDIR%%/ximian-connector-freebusy.html +%%DOCSDIR%%/ximian-connector-mail-threading.html +%%DOCSDIR%%/ximian-connector-mail.html +%%DOCSDIR%%/ximian-connector-ntlm.html +%%DOCSDIR%%/ximian-connector-oof.html +%%DOCSDIR%%/ximian-connector-other-users.html +%%DOCSDIR%%/ximian-connector-permissions.html +%%DOCSDIR%%/ximian-connnector-booking.html %%DATADIR%%/%%VERSION%%/glade/exchange-autoconfig-wizard.glade %%DATADIR%%/%%VERSION%%/glade/exchange-change-password.glade %%DATADIR%%/%%VERSION%%/glade/exchange-delegates.glade @@ -76,6 +75,7 @@ libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage %%DATADIR%%/%%VERSION%%/images/exchange-oof-48.png %%DATADIR%%/%%VERSION%%/ui/ximian-connector.xml share/locale/ar/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo +share/locale/as/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/bn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @@ -97,6 +97,7 @@ share/locale/fi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/gu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo +share/locale/he/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/hi/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/id/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @@ -110,6 +111,7 @@ share/locale/lv/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/mk/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ml/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/mn/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo +share/locale/mr/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ne/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @@ -124,6 +126,7 @@ share/locale/pt_BR/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ro/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/ru/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo share/locale/rw/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo +share/locale/si/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo 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 @@ -144,18 +147,24 @@ share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo @dirrm %%DATADIR%%/%%VERSION%%/glade @dirrm %%DATADIR%%/%%VERSION%% @dirrm %%DATADIR%% -@dirrm %%OLDDOCSDIR%% +@dirrm %%DOCSDIR%% @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/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/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/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/mail/evolution-sharp/Makefile b/mail/evolution-sharp/Makefile index 57292b201901..0b1e9fb5f800 100644 --- a/mail/evolution-sharp/Makefile +++ b/mail/evolution-sharp/Makefile @@ -3,14 +3,15 @@ # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # # $FreeBSD$ +# $MCom: ports/mail/evolution-sharp/Makefile,v 1.4 2008/02/12 15:16:27 kwm Exp $ # $Id: Makefile,v 1.29 2007/01/26 03:11:38 tmclau02 Exp $ # PORTNAME= evolution-sharp -PORTVERSION= 0.14.0.1 +PORTVERSION= 0.15.91 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.14 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.15 MAINTAINER= bsd-sharp-list@forge.novell.com COMMENT= Mono bindings for evolution diff --git a/mail/evolution-sharp/distinfo b/mail/evolution-sharp/distinfo index b4a11d3aaf22..de7a43811ef2 100644 --- a/mail/evolution-sharp/distinfo +++ b/mail/evolution-sharp/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-sharp-0.14.0.1.tar.bz2) = ca44b64db3edaa248b03bdf00ea662fd -SHA256 (evolution-sharp-0.14.0.1.tar.bz2) = 6a2b4af6dadc7b674706f1cc217551bdc2d8c72768d2e53dd0e29e26440ba459 -SIZE (evolution-sharp-0.14.0.1.tar.bz2) = 266653 +MD5 (evolution-sharp-0.15.91.tar.bz2) = 0caeb630daf13590d70bdb977ae4bb13 +SHA256 (evolution-sharp-0.15.91.tar.bz2) = 99f3fea16b90290243cecc168463c37c66b1c8385a9c373a5df232a676869c4d +SIZE (evolution-sharp-0.15.91.tar.bz2) = 266810 diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 645a340557e9..3247a6037c06 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,11 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/mail/evolution/Makefile,v 1.1 2007/11/30 21:33:37 marcus Exp $ +# $MCom: ports/mail/evolution/Makefile,v 1.168 2008/03/14 05:32:17 marcus Exp $ # PORTNAME= evolution -PORTVERSION= 2.12.3 +PORTVERSION= 2.22.0 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -24,9 +25,9 @@ USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes USE_XLIB= yes -USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver \ - gtkhtml3 desktopfileutils gnomedocutils libgnomeprintui -GNU_CONFIGURE= yes +USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \ + desktopfileutils gnomedocutils ltasneededhack +USE_AUTOTOOLS= libtool:15 INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes @@ -37,16 +38,16 @@ CONFIGURE_ARGS= --enable-nss=yes \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= apps-evolution-mail-notification.schemas \ - apps-evolution-mail-prompts-checkdefault.schemas \ - apps_evolution_addressbook.schemas \ +GCONF_SCHEMAS= apps_evolution_addressbook.schemas \ + apps-evolution-attachment-reminder.schemas \ apps_evolution_calendar.schemas \ + apps-evolution-mail-notification.schemas \ + apps-evolution-mail-prompts-checkdefault.schemas \ apps_evolution_shell.schemas \ - apps-evolution-attachment-reminder.schemas \ bogo-junk-plugin.schemas \ evolution-mail.schemas -EVO_VERSION= 2.12 +EVO_VERSION= 2.22 PLIST_SUB= VERSION=${EVO_VERSION} \ PORTVERSION=2.12 @@ -59,14 +60,6 @@ OPTIONS= PILOT "Enable Palm Pilot sync support" off \ USE_LDCONFIG= ${PREFIX}/lib/evolution/${EVO_VERSION} .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" -.if defined(PACKAGE_BUILDING) -WITH_DBUS= yes -.endif - -.if exists(${LOCALBASE}/lib/libdbus-glib-1.so) -WITH_DBUS= yes -.endif - .if defined(WITH_PILOT) LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} \ @@ -87,13 +80,6 @@ CONFIGURE_ARGS+=--with-openldap=no RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin .endif -.if defined(WITH_DBUS) -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -PLIST_SUB+= DBUS="" -.else -PLIST_SUB+= DBUS="@comment " -.endif - .if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so) CONFIGURE_ARGS+= --with-krb5=/usr .else diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index b90add59d776..a0e18b221bc3 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-2.12.3.tar.bz2) = 554698d7387aee82c5f4d4520760503d -SHA256 (gnome2/evolution-2.12.3.tar.bz2) = 1703f6888c1549a1b9b89112bed73504f4ae2db5b2fb8f926adb5cf3a490d6bf -SIZE (gnome2/evolution-2.12.3.tar.bz2) = 25938535 +MD5 (gnome2/evolution-2.22.0.tar.bz2) = 22567465cfba2658fd0a9be03f8c854f +SHA256 (gnome2/evolution-2.22.0.tar.bz2) = 03a6842c195d950b1273f7d492b274b40e03311161d5f68ef87f9c45bf2d1e63 +SIZE (gnome2/evolution-2.22.0.tar.bz2) = 29556434 diff --git a/mail/evolution/files/patch-mail_em-migrate.c b/mail/evolution/files/patch-mail_em-migrate.c index 6aa2e9a13838..e2df9c618799 100644 --- a/mail/evolution/files/patch-mail_em-migrate.c +++ b/mail/evolution/files/patch-mail_em-migrate.c @@ -1,11 +1,11 @@ ---- mail/em-migrate.c.orig Tue Dec 21 15:09:30 2004 -+++ mail/em-migrate.c Tue Dec 21 15:09:46 2004 -@@ -1447,7 +1447,7 @@ +--- mail/em-migrate.c.orig 2007-12-15 16:58:56.000000000 +0100 ++++ mail/em-migrate.c 2007-12-21 16:17:32.000000000 +0100 +@@ -1493,7 +1493,7 @@ ut.actime = st.st_atime; ut.modtime = st.st_mtime; utime (dest, &ut); - chmod (dest, st.st_mode); + chmod (dest, st.st_mode | S_IWUSR); - + return 0; - + diff --git a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in b/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in new file mode 100644 index 000000000000..1a1cdba37469 --- /dev/null +++ b/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in @@ -0,0 +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 + $(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) + + liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c index a6440719257b..800f60386963 100644 --- a/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c +++ b/mail/evolution/files/patch-widgets_e-timezone-dialog_e-timezone-dialog.c @@ -1,6 +1,6 @@ ---- widgets/e-timezone-dialog/e-timezone-dialog.c.orig Mon Jul 10 21:50:12 2006 -+++ widgets/e-timezone-dialog/e-timezone-dialog.c Mon Jul 10 22:11:54 2006 -@@ -80,7 +80,9 @@ struct _ETimezoneDialogPrivate { +--- widgets/e-timezone-dialog/e-timezone-dialog.c.orig 2007-11-30 05:24:05.000000000 +0100 ++++ widgets/e-timezone-dialog/e-timezone-dialog.c 2007-12-21 16:24:39.000000000 +0100 +@@ -82,7 +82,9 @@ #ifndef G_OS_WIN32 /* Declared properly in time.h already */ extern char *tzname[2]; @@ -10,8 +10,8 @@ extern int daylight; #endif -@@ -317,9 +319,20 @@ static const icaltimezone* - get_local_timezone() +@@ -326,9 +328,20 @@ + get_local_timezone(void) { icaltimezone *zone; + long offset; @@ -19,7 +19,7 @@ + time_t tt; + struct tm tm; +#endif - + tzset(); - zone = icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]); +#ifdef __BSD_VISIBLE diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 9e56f67e195c..74032d9281c3 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -26,6 +26,7 @@ include/evolution-%%VERSION%%/e-util/e-gui-utils.h include/evolution-%%VERSION%%/e-util/e-html-utils.h include/evolution-%%VERSION%%/e-util/e-icon-factory.h 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.h @@ -40,6 +41,7 @@ include/evolution-%%VERSION%%/e-util/e-sorter.h include/evolution-%%VERSION%%/e-util/e-text-event-processor-emacs-like.h include/evolution-%%VERSION%%/e-util/e-text-event-processor-types.h include/evolution-%%VERSION%%/e-util/e-text-event-processor.h +include/evolution-%%VERSION%%/e-util/e-util-labels.h include/evolution-%%VERSION%%/e-util/e-util-marshal.h include/evolution-%%VERSION%%/e-util/e-util.h include/evolution-%%VERSION%%/e-util/e-xml-utils.h @@ -88,6 +90,7 @@ include/evolution-%%VERSION%%/menus/gal-view-instance-save-as-dialog.h include/evolution-%%VERSION%%/menus/gal-view-instance.h include/evolution-%%VERSION%%/menus/gal-view-new-dialog.h include/evolution-%%VERSION%%/menus/gal-view.h +include/evolution-%%VERSION%%/misc/e-account-combo-box.h include/evolution-%%VERSION%%/misc/e-activity-handler.h include/evolution-%%VERSION%%/misc/e-attachment-bar.h include/evolution-%%VERSION%%/misc/e-attachment.h @@ -126,6 +129,7 @@ include/evolution-%%VERSION%%/misc/e-selection-model-array.h include/evolution-%%VERSION%%/misc/e-selection-model-simple.h include/evolution-%%VERSION%%/misc/e-selection-model.h include/evolution-%%VERSION%%/misc/e-send-options.h +include/evolution-%%VERSION%%/misc/e-signature-combo-box.h include/evolution-%%VERSION%%/misc/e-spinner.c include/evolution-%%VERSION%%/misc/e-spinner.h include/evolution-%%VERSION%%/misc/e-task-bar.h @@ -205,167 +209,225 @@ include/evolution-%%VERSION%%/table/e-tree-selection-model.h include/evolution-%%VERSION%%/table/e-tree-sorted.h include/evolution-%%VERSION%%/table/e-tree-table-adapter.h include/evolution-%%VERSION%%/table/e-tree.h -include/evolution-%%VERSION%%/text/e-completion-callbacks.h -include/evolution-%%VERSION%%/text/e-completion-match.h -include/evolution-%%VERSION%%/text/e-completion-view.h -include/evolution-%%VERSION%%/text/e-completion.h -include/evolution-%%VERSION%%/text/e-entry.h -include/evolution-%%VERSION%%/text/e-table-text-model.h include/evolution-%%VERSION%%/text/e-text-model-repos.h -include/evolution-%%VERSION%%/text/e-text-model-uri.h include/evolution-%%VERSION%%/text/e-text-model.h include/evolution-%%VERSION%%/text/e-text.h +lib/evolution/%%VERSION%%/components/libevolution-addressbook.a lib/evolution/%%VERSION%%/components/libevolution-addressbook.la lib/evolution/%%VERSION%%/components/libevolution-addressbook.so +lib/evolution/%%VERSION%%/components/libevolution-calendar.a lib/evolution/%%VERSION%%/components/libevolution-calendar.la lib/evolution/%%VERSION%%/components/libevolution-calendar.so -lib/evolution/%%VERSION%%/components/libevolution-mail.la -lib/evolution/%%VERSION%%/components/libevolution-mail.so +%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.a %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.la %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libeaddress_conduit.so +%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.a %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.la %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libecalendar_conduit.so +%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.a %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.la %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libememo_conduit.so +%%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.a %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.la %%PILOT:%%lib/evolution/%%VERSION%%/conduits/libetodo_conduit.so +lib/evolution/%%VERSION%%/components/libevolution-mail.a +lib/evolution/%%VERSION%%/components/libevolution-mail.la +lib/evolution/%%VERSION%%/components/libevolution-mail.so +lib/evolution/%%VERSION%%/libeabutil.a lib/evolution/%%VERSION%%/libeabutil.la lib/evolution/%%VERSION%%/libeabutil.so lib/evolution/%%VERSION%%/libeabutil.so.0 +lib/evolution/%%VERSION%%/libeconduit.a lib/evolution/%%VERSION%%/libeconduit.la lib/evolution/%%VERSION%%/libeconduit.so lib/evolution/%%VERSION%%/libeconduit.so.0 +lib/evolution/%%VERSION%%/libecontacteditor.a lib/evolution/%%VERSION%%/libecontacteditor.la lib/evolution/%%VERSION%%/libecontacteditor.so lib/evolution/%%VERSION%%/libecontacteditor.so.0 +lib/evolution/%%VERSION%%/libecontactlisteditor.a lib/evolution/%%VERSION%%/libecontactlisteditor.la lib/evolution/%%VERSION%%/libecontactlisteditor.so lib/evolution/%%VERSION%%/libecontactlisteditor.so.0 +lib/evolution/%%VERSION%%/libefilterbar.a lib/evolution/%%VERSION%%/libefilterbar.la lib/evolution/%%VERSION%%/libefilterbar.so lib/evolution/%%VERSION%%/libefilterbar.so.0 +lib/evolution/%%VERSION%%/libemiscwidgets.a lib/evolution/%%VERSION%%/libemiscwidgets.la lib/evolution/%%VERSION%%/libemiscwidgets.so lib/evolution/%%VERSION%%/libemiscwidgets.so.0 +lib/evolution/%%VERSION%%/libeshell.a lib/evolution/%%VERSION%%/libeshell.la lib/evolution/%%VERSION%%/libeshell.so lib/evolution/%%VERSION%%/libeshell.so.0 +lib/evolution/%%VERSION%%/libessmime.a lib/evolution/%%VERSION%%/libessmime.la lib/evolution/%%VERSION%%/libessmime.so lib/evolution/%%VERSION%%/libessmime.so.0 +lib/evolution/%%VERSION%%/libetable.a lib/evolution/%%VERSION%%/libetable.la lib/evolution/%%VERSION%%/libetable.so lib/evolution/%%VERSION%%/libetable.so.0 +lib/evolution/%%VERSION%%/libetext.a lib/evolution/%%VERSION%%/libetext.la lib/evolution/%%VERSION%%/libetext.so lib/evolution/%%VERSION%%/libetext.so.0 +lib/evolution/%%VERSION%%/libetimezonedialog.a lib/evolution/%%VERSION%%/libetimezonedialog.la lib/evolution/%%VERSION%%/libetimezonedialog.so lib/evolution/%%VERSION%%/libetimezonedialog.so.0 +lib/evolution/%%VERSION%%/libeutil.a lib/evolution/%%VERSION%%/libeutil.la lib/evolution/%%VERSION%%/libeutil.so lib/evolution/%%VERSION%%/libeutil.so.0 +lib/evolution/%%VERSION%%/libevolution-a11y.a lib/evolution/%%VERSION%%/libevolution-a11y.la lib/evolution/%%VERSION%%/libevolution-a11y.so lib/evolution/%%VERSION%%/libevolution-a11y.so.0 +lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.a lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.la lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so lib/evolution/%%VERSION%%/libevolution-addressbook-a11y.so.0 +lib/evolution/%%VERSION%%/libevolution-addressbook-importers.a lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so.0 +lib/evolution/%%VERSION%%/libevolution-calendar-a11y.a lib/evolution/%%VERSION%%/libevolution-calendar-a11y.la lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so lib/evolution/%%VERSION%%/libevolution-calendar-a11y.so.0 +lib/evolution/%%VERSION%%/libevolution-calendar-importers.a lib/evolution/%%VERSION%%/libevolution-calendar-importers.la lib/evolution/%%VERSION%%/libevolution-calendar-importers.so lib/evolution/%%VERSION%%/libevolution-calendar-importers.so.0 +lib/evolution/%%VERSION%%/libevolution-mail-importers.a lib/evolution/%%VERSION%%/libevolution-mail-importers.la lib/evolution/%%VERSION%%/libevolution-mail-importers.so lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0 +lib/evolution/%%VERSION%%/libevolution-smime.a lib/evolution/%%VERSION%%/libevolution-smime.la lib/evolution/%%VERSION%%/libevolution-smime.so lib/evolution/%%VERSION%%/libevolution-smime.so.0 +lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a lib/evolution/%%VERSION%%/libevolution-widgets-a11y.la lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0 +lib/evolution/%%VERSION%%/libfilter.a lib/evolution/%%VERSION%%/libfilter.la lib/evolution/%%VERSION%%/libfilter.so lib/evolution/%%VERSION%%/libfilter.so.0 +lib/evolution/%%VERSION%%/libmenus.a lib/evolution/%%VERSION%%/libmenus.la lib/evolution/%%VERSION%%/libmenus.so lib/evolution/%%VERSION%%/libmenus.so.0 lib/evolution/%%VERSION%%/plugins/attachment-reminder.glade +lib/evolution/%%VERSION%%/plugins/libmail-account-disable.a lib/evolution/%%VERSION%%/plugins/libmail-account-disable.la lib/evolution/%%VERSION%%/plugins/libmail-account-disable.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-backup-restore.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-bogo-junk-plugin.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-bogo-junk-plugin.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-bogo-junk-plugin.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.la 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-evolution-attachment-reminder.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.la 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-exchange-operations.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-operations.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-groupwise-features.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-imap-features.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-all-read.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so -%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.la -%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.la 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 +lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-sa-junk-plugin.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.a lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.la 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/org-gnome-addressbook-file.eplug @@ -382,6 +444,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.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 @@ -405,7 +468,6 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml lib/evolution/%%VERSION%%/plugins/org-gnome-mark-all-read.eplug lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug -%%DBUS%%lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.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 @@ -439,6 +501,7 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/default/fi/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/fr/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/ja/mail/local/Inbox +%%DATADIR%%/%%VERSION%%/default/ko/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/lt/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/mk/mail/local/Inbox %%DATADIR%%/%%VERSION%%/default/nl/mail/local/Inbox @@ -470,7 +533,6 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/etspec/e-addressbook-view.etspec %%DATADIR%%/%%VERSION%%/etspec/e-cal-list-view.etspec %%DATADIR%%/%%VERSION%%/etspec/e-calendar-table.etspec -%%DATADIR%%/%%VERSION%%/etspec/e-contact-list-editor.etspec %%DATADIR%%/%%VERSION%%/etspec/e-meeting-time-sel.etspec %%DATADIR%%/%%VERSION%%/etspec/e-memo-table.etspec %%DATADIR%%/%%VERSION%%/etspec/message-list.etspec @@ -488,7 +550,6 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/glade/e-foreign-folder-dialog.glade %%DATADIR%%/%%VERSION%%/glade/e-itip-control.glade %%DATADIR%%/%%VERSION%%/glade/e-send-options.glade -%%DATADIR%%/%%VERSION%%/glade/e-table-config-no-group.glade %%DATADIR%%/%%VERSION%%/glade/e-table-config.glade %%DATADIR%%/%%VERSION%%/glade/e-table-field-chooser.glade %%DATADIR%%/%%VERSION%%/glade/e-timezone-dialog.glade @@ -533,11 +594,59 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/help/quickref/de/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/es/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/fr/quickref.pdf +%%DATADIR%%/%%VERSION%%/help/quickref/hu/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/it/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/pl/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/pt/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/sq/quickref.pdf %%DATADIR%%/%%VERSION%%/help/quickref/sv/quickref.pdf +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/folder-copy.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/folder-move.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/go-today.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/mail-copy.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/mail-move.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-day.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/view-calendar-list.png +%%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/places/mail-inbox.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-outbox.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/places/mail-sent.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/go-today.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-day.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-list.png +%%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/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/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/places/mail-inbox.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places/mail-outbox.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/places/mail-sent.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/actions/view-calendar-day.png +%%DATADIR%%/%%VERSION%%/icons/hicolor/32x32/actions/view-calendar-list.png +%%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/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/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 @@ -547,6 +656,7 @@ share/applications/evolution.desktop %%DATADIR%%/%%VERSION%%/images/world_map-960.png %%DATADIR%%/%%VERSION%%/memotypes.xml %%DATADIR%%/%%VERSION%%/searchtypes.xml +%%DATADIR%%/%%VERSION%%/sounds/default_alarm.wav %%DATADIR%%/%%VERSION%%/tasktypes.xml %%DATADIR%%/%%VERSION%%/ui/evolution-addressbook.xml %%DATADIR%%/%%VERSION%%/ui/evolution-calendar.xml @@ -625,7 +735,12 @@ share/gnome/help/evolution/C/figures/evo_cal_prop_a.png share/gnome/help/evolution/C/figures/evo_calender_appointmnt.png share/gnome/help/evolution/C/figures/evo_calstatus_a.png share/gnome/help/evolution/C/figures/evo_contacteditor_a.png +share/gnome/help/evolution/C/figures/evo_crash_recovery.png +share/gnome/help/evolution/C/figures/evo_custom_header.png +share/gnome/help/evolution/C/figures/evo_debuglogs_a.png share/gnome/help/evolution/C/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/C/figures/evo_dialog-info.png +share/gnome/help/evolution/C/figures/evo_dialog-warning.png share/gnome/help/evolution/C/figures/evo_edit_rule_a.png share/gnome/help/evolution/C/figures/evo_edit_search.png share/gnome/help/evolution/C/figures/evo_email_a.png @@ -640,6 +755,8 @@ share/gnome/help/evolution/C/figures/evo_imapheader_a.png share/gnome/help/evolution/C/figures/evo_imapreceive_a.png share/gnome/help/evolution/C/figures/evo_import_asst_a.png share/gnome/help/evolution/C/figures/evo_junk_a.png +share/gnome/help/evolution/C/figures/evo_label_a.PNG +share/gnome/help/evolution/C/figures/evo_labels_a.png share/gnome/help/evolution/C/figures/evo_mail_a.png share/gnome/help/evolution/C/figures/evo_mail_callout_a.png share/gnome/help/evolution/C/figures/evo_mail_notifier.png @@ -686,6 +803,7 @@ share/gnome/help/evolution/C/figures/full-4.png share/gnome/help/evolution/C/figures/full-5.png share/gnome/help/evolution/C/figures/full-6.png share/gnome/help/evolution/C/figures/full-7.png +share/gnome/help/evolution/C/figures/google_cal_view.png share/gnome/help/evolution/C/figures/mail-druid-pic.png share/gnome/help/evolution/C/figures/mail-inbox.png share/gnome/help/evolution/C/figures/mail-threaded.png @@ -706,6 +824,126 @@ share/gnome/help/evolution/C/figures/sub-others-folder.png 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-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/calendar.png +share/gnome/help/evolution/cs/figures/categories_a.png +share/gnome/help/evolution/cs/figures/collap_head_a.png +share/gnome/help/evolution/cs/figures/config-cal.png +share/gnome/help/evolution/cs/figures/config-mail.png +share/gnome/help/evolution/cs/figures/contact-editor.png +share/gnome/help/evolution/cs/figures/contact.png +share/gnome/help/evolution/cs/figures/contacts_mainwindow_a.png +share/gnome/help/evolution/cs/figures/delgt-add.png +share/gnome/help/evolution/cs/figures/evo_account_editor_a.png +share/gnome/help/evolution/cs/figures/evo_account_info_a.png +share/gnome/help/evolution/cs/figures/evo_add_rule_a.png +share/gnome/help/evolution/cs/figures/evo_adv_search_a.png +share/gnome/help/evolution/cs/figures/evo_allday_a.png +share/gnome/help/evolution/cs/figures/evo_attachreminder_plugin.png +share/gnome/help/evolution/cs/figures/evo_backup.png +share/gnome/help/evolution/cs/figures/evo_backup_prgsbar.png +share/gnome/help/evolution/cs/figures/evo_backup_warning.png +share/gnome/help/evolution/cs/figures/evo_blink.png +share/gnome/help/evolution/cs/figures/evo_cal_a.png +share/gnome/help/evolution/cs/figures/evo_cal_advsearch.png +share/gnome/help/evolution/cs/figures/evo_cal_callout_a.png +share/gnome/help/evolution/cs/figures/evo_cal_prop_a.png +share/gnome/help/evolution/cs/figures/evo_calender_appointmnt.png +share/gnome/help/evolution/cs/figures/evo_calstatus_a.png +share/gnome/help/evolution/cs/figures/evo_contacteditor_a.png +share/gnome/help/evolution/cs/figures/evo_crash_recovery.png +share/gnome/help/evolution/cs/figures/evo_custom_header.png +share/gnome/help/evolution/cs/figures/evo_debuglogs_a.png +share/gnome/help/evolution/cs/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/cs/figures/evo_dialog-info.png +share/gnome/help/evolution/cs/figures/evo_dialog-warning.png +share/gnome/help/evolution/cs/figures/evo_edit_rule_a.png +share/gnome/help/evolution/cs/figures/evo_edit_search.png +share/gnome/help/evolution/cs/figures/evo_email_a.png +share/gnome/help/evolution/cs/figures/evo_flag_follow_up_a.png +share/gnome/help/evolution/cs/figures/evo_gwreceive_a.png +share/gnome/help/evolution/cs/figures/evo_gwreceiveedit_a.png +share/gnome/help/evolution/cs/figures/evo_gwreceiveoptedit_a.png +share/gnome/help/evolution/cs/figures/evo_gwstatustrack.png +share/gnome/help/evolution/cs/figures/evo_identity_a.png +share/gnome/help/evolution/cs/figures/evo_identityedit_a.png +share/gnome/help/evolution/cs/figures/evo_imapheader_a.png +share/gnome/help/evolution/cs/figures/evo_imapreceive_a.png +share/gnome/help/evolution/cs/figures/evo_import_asst_a.png +share/gnome/help/evolution/cs/figures/evo_junk_a.png +share/gnome/help/evolution/cs/figures/evo_label_a.PNG +share/gnome/help/evolution/cs/figures/evo_labels_a.png +share/gnome/help/evolution/cs/figures/evo_mail_a.png +share/gnome/help/evolution/cs/figures/evo_mail_callout_a.png +share/gnome/help/evolution/cs/figures/evo_mail_notifier.png +share/gnome/help/evolution/cs/figures/evo_maildirreceive_a.png +share/gnome/help/evolution/cs/figures/evo_mboxreceive_a.png +share/gnome/help/evolution/cs/figures/evo_memo_a.png +share/gnome/help/evolution/cs/figures/evo_mereceive_a.png +share/gnome/help/evolution/cs/figures/evo_message_filters_a.png +share/gnome/help/evolution/cs/figures/evo_mhreceive_a.png +share/gnome/help/evolution/cs/figures/evo_newmail.png +share/gnome/help/evolution/cs/figures/evo_newmess_a.png +share/gnome/help/evolution/cs/figures/evo_offline.png +share/gnome/help/evolution/cs/figures/evo_popreceive_a.png +share/gnome/help/evolution/cs/figures/evo_proxyadd_a.png +share/gnome/help/evolution/cs/figures/evo_receive_setup2_a.png +share/gnome/help/evolution/cs/figures/evo_receive_setup_a.png +share/gnome/help/evolution/cs/figures/evo_rmdrnotes_a.png +share/gnome/help/evolution/cs/figures/evo_rule_a.png +share/gnome/help/evolution/cs/figures/evo_select_add_folder.png +share/gnome/help/evolution/cs/figures/evo_select_folder.png +share/gnome/help/evolution/cs/figures/evo_send_option_a.png +share/gnome/help/evolution/cs/figures/evo_send_setup_a.png +share/gnome/help/evolution/cs/figures/evo_sendstatus_a.png +share/gnome/help/evolution/cs/figures/evo_shd_memo_a.png +share/gnome/help/evolution/cs/figures/evo_timezone_a.png +share/gnome/help/evolution/cs/figures/evo_usereceive_a.png +share/gnome/help/evolution/cs/figures/exchange-delegation.png +share/gnome/help/evolution/cs/figures/exchange-identity.png +share/gnome/help/evolution/cs/figures/exchange-receive-options.png +share/gnome/help/evolution/cs/figures/exchange-receive.png +share/gnome/help/evolution/cs/figures/exchg-identity.png +share/gnome/help/evolution/cs/figures/exchng-identity.png +share/gnome/help/evolution/cs/figures/exchng-rec-mail.png +share/gnome/help/evolution/cs/figures/exchng-rec-mails.png +share/gnome/help/evolution/cs/figures/exchng-rec-option.png +share/gnome/help/evolution/cs/figures/exchng-rec-options.png +share/gnome/help/evolution/cs/figures/exchng-settings.png +share/gnome/help/evolution/cs/figures/filter-new-fig.png +share/gnome/help/evolution/cs/figures/free_busy.png +share/gnome/help/evolution/cs/figures/full-1.png +share/gnome/help/evolution/cs/figures/full-2.png +share/gnome/help/evolution/cs/figures/full-3.png +share/gnome/help/evolution/cs/figures/full-4.png +share/gnome/help/evolution/cs/figures/full-5.png +share/gnome/help/evolution/cs/figures/full-6.png +share/gnome/help/evolution/cs/figures/full-7.png +share/gnome/help/evolution/cs/figures/google_cal_view.png +share/gnome/help/evolution/cs/figures/mail-druid-pic.png +share/gnome/help/evolution/cs/figures/mail-inbox.png +share/gnome/help/evolution/cs/figures/mail-threaded.png +share/gnome/help/evolution/cs/figures/mail_mainwindow_a.png +share/gnome/help/evolution/cs/figures/mailer_preferences.png +share/gnome/help/evolution/cs/figures/mainwindow-pic.png +share/gnome/help/evolution/cs/figures/minus.png +share/gnome/help/evolution/cs/figures/newmsg.png +share/gnome/help/evolution/cs/figures/plus.png +share/gnome/help/evolution/cs/figures/proxy-cal.png +share/gnome/help/evolution/cs/figures/proxy-login.png +share/gnome/help/evolution/cs/figures/quick_add_a.png +share/gnome/help/evolution/cs/figures/quick_reference.png +share/gnome/help/evolution/cs/figures/replymsg.png +share/gnome/help/evolution/cs/figures/schedule.png +share/gnome/help/evolution/cs/figures/stock_search.png +share/gnome/help/evolution/cs/figures/sub-others-folder.png +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-Free-Busy.png share/gnome/help/evolution/de/figures/account_editor_a.png @@ -737,7 +975,12 @@ share/gnome/help/evolution/de/figures/evo_cal_prop_a.png share/gnome/help/evolution/de/figures/evo_calender_appointmnt.png share/gnome/help/evolution/de/figures/evo_calstatus_a.png share/gnome/help/evolution/de/figures/evo_contacteditor_a.png +share/gnome/help/evolution/de/figures/evo_crash_recovery.png +share/gnome/help/evolution/de/figures/evo_custom_header.png +share/gnome/help/evolution/de/figures/evo_debuglogs_a.png share/gnome/help/evolution/de/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/de/figures/evo_dialog-info.png +share/gnome/help/evolution/de/figures/evo_dialog-warning.png share/gnome/help/evolution/de/figures/evo_edit_rule_a.png share/gnome/help/evolution/de/figures/evo_edit_search.png share/gnome/help/evolution/de/figures/evo_email_a.png @@ -752,6 +995,8 @@ share/gnome/help/evolution/de/figures/evo_imapheader_a.png share/gnome/help/evolution/de/figures/evo_imapreceive_a.png share/gnome/help/evolution/de/figures/evo_import_asst_a.png share/gnome/help/evolution/de/figures/evo_junk_a.png +share/gnome/help/evolution/de/figures/evo_label_a.PNG +share/gnome/help/evolution/de/figures/evo_labels_a.png share/gnome/help/evolution/de/figures/evo_mail_a.png share/gnome/help/evolution/de/figures/evo_mail_callout_a.png share/gnome/help/evolution/de/figures/evo_mail_notifier.png @@ -798,6 +1043,7 @@ share/gnome/help/evolution/de/figures/full-4.png share/gnome/help/evolution/de/figures/full-5.png share/gnome/help/evolution/de/figures/full-6.png share/gnome/help/evolution/de/figures/full-7.png +share/gnome/help/evolution/de/figures/google_cal_view.png share/gnome/help/evolution/de/figures/mail-druid-pic.png share/gnome/help/evolution/de/figures/mail-inbox.png share/gnome/help/evolution/de/figures/mail-threaded.png @@ -849,7 +1095,12 @@ share/gnome/help/evolution/el/figures/evo_cal_prop_a.png share/gnome/help/evolution/el/figures/evo_calender_appointmnt.png share/gnome/help/evolution/el/figures/evo_calstatus_a.png share/gnome/help/evolution/el/figures/evo_contacteditor_a.png +share/gnome/help/evolution/el/figures/evo_crash_recovery.png +share/gnome/help/evolution/el/figures/evo_custom_header.png +share/gnome/help/evolution/el/figures/evo_debuglogs_a.png share/gnome/help/evolution/el/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/el/figures/evo_dialog-info.png +share/gnome/help/evolution/el/figures/evo_dialog-warning.png share/gnome/help/evolution/el/figures/evo_edit_rule_a.png share/gnome/help/evolution/el/figures/evo_edit_search.png share/gnome/help/evolution/el/figures/evo_email_a.png @@ -864,6 +1115,8 @@ share/gnome/help/evolution/el/figures/evo_imapheader_a.png share/gnome/help/evolution/el/figures/evo_imapreceive_a.png share/gnome/help/evolution/el/figures/evo_import_asst_a.png share/gnome/help/evolution/el/figures/evo_junk_a.png +share/gnome/help/evolution/el/figures/evo_label_a.PNG +share/gnome/help/evolution/el/figures/evo_labels_a.png share/gnome/help/evolution/el/figures/evo_mail_a.png share/gnome/help/evolution/el/figures/evo_mail_callout_a.png share/gnome/help/evolution/el/figures/evo_mail_notifier.png @@ -910,6 +1163,7 @@ share/gnome/help/evolution/el/figures/full-4.png share/gnome/help/evolution/el/figures/full-5.png share/gnome/help/evolution/el/figures/full-6.png share/gnome/help/evolution/el/figures/full-7.png +share/gnome/help/evolution/el/figures/google_cal_view.png share/gnome/help/evolution/el/figures/mail-druid-pic.png share/gnome/help/evolution/el/figures/mail-inbox.png share/gnome/help/evolution/el/figures/mail-threaded.png @@ -961,7 +1215,12 @@ share/gnome/help/evolution/en_GB/figures/evo_cal_prop_a.png share/gnome/help/evolution/en_GB/figures/evo_calender_appointmnt.png share/gnome/help/evolution/en_GB/figures/evo_calstatus_a.png share/gnome/help/evolution/en_GB/figures/evo_contacteditor_a.png +share/gnome/help/evolution/en_GB/figures/evo_crash_recovery.png +share/gnome/help/evolution/en_GB/figures/evo_custom_header.png +share/gnome/help/evolution/en_GB/figures/evo_debuglogs_a.png share/gnome/help/evolution/en_GB/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/en_GB/figures/evo_dialog-info.png +share/gnome/help/evolution/en_GB/figures/evo_dialog-warning.png share/gnome/help/evolution/en_GB/figures/evo_edit_rule_a.png share/gnome/help/evolution/en_GB/figures/evo_edit_search.png share/gnome/help/evolution/en_GB/figures/evo_email_a.png @@ -976,6 +1235,8 @@ share/gnome/help/evolution/en_GB/figures/evo_imapheader_a.png share/gnome/help/evolution/en_GB/figures/evo_imapreceive_a.png share/gnome/help/evolution/en_GB/figures/evo_import_asst_a.png share/gnome/help/evolution/en_GB/figures/evo_junk_a.png +share/gnome/help/evolution/en_GB/figures/evo_label_a.PNG +share/gnome/help/evolution/en_GB/figures/evo_labels_a.png share/gnome/help/evolution/en_GB/figures/evo_mail_a.png share/gnome/help/evolution/en_GB/figures/evo_mail_callout_a.png share/gnome/help/evolution/en_GB/figures/evo_mail_notifier.png @@ -1022,6 +1283,7 @@ share/gnome/help/evolution/en_GB/figures/full-4.png share/gnome/help/evolution/en_GB/figures/full-5.png share/gnome/help/evolution/en_GB/figures/full-6.png share/gnome/help/evolution/en_GB/figures/full-7.png +share/gnome/help/evolution/en_GB/figures/google_cal_view.png share/gnome/help/evolution/en_GB/figures/mail-druid-pic.png share/gnome/help/evolution/en_GB/figures/mail-inbox.png share/gnome/help/evolution/en_GB/figures/mail-threaded.png @@ -1073,7 +1335,12 @@ share/gnome/help/evolution/es/figures/evo_cal_prop_a.png share/gnome/help/evolution/es/figures/evo_calender_appointmnt.png share/gnome/help/evolution/es/figures/evo_calstatus_a.png share/gnome/help/evolution/es/figures/evo_contacteditor_a.png +share/gnome/help/evolution/es/figures/evo_crash_recovery.png +share/gnome/help/evolution/es/figures/evo_custom_header.png +share/gnome/help/evolution/es/figures/evo_debuglogs_a.png share/gnome/help/evolution/es/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/es/figures/evo_dialog-info.png +share/gnome/help/evolution/es/figures/evo_dialog-warning.png share/gnome/help/evolution/es/figures/evo_edit_rule_a.png share/gnome/help/evolution/es/figures/evo_edit_search.png share/gnome/help/evolution/es/figures/evo_email_a.png @@ -1088,6 +1355,8 @@ share/gnome/help/evolution/es/figures/evo_imapheader_a.png share/gnome/help/evolution/es/figures/evo_imapreceive_a.png share/gnome/help/evolution/es/figures/evo_import_asst_a.png share/gnome/help/evolution/es/figures/evo_junk_a.png +share/gnome/help/evolution/es/figures/evo_label_a.PNG +share/gnome/help/evolution/es/figures/evo_labels_a.png share/gnome/help/evolution/es/figures/evo_mail_a.png share/gnome/help/evolution/es/figures/evo_mail_callout_a.png share/gnome/help/evolution/es/figures/evo_mail_notifier.png @@ -1134,6 +1403,7 @@ share/gnome/help/evolution/es/figures/full-4.png share/gnome/help/evolution/es/figures/full-5.png share/gnome/help/evolution/es/figures/full-6.png share/gnome/help/evolution/es/figures/full-7.png +share/gnome/help/evolution/es/figures/google_cal_view.png share/gnome/help/evolution/es/figures/mail-druid-pic.png share/gnome/help/evolution/es/figures/mail-inbox.png share/gnome/help/evolution/es/figures/mail-threaded.png @@ -1185,7 +1455,12 @@ share/gnome/help/evolution/fr/figures/evo_cal_prop_a.png share/gnome/help/evolution/fr/figures/evo_calender_appointmnt.png share/gnome/help/evolution/fr/figures/evo_calstatus_a.png share/gnome/help/evolution/fr/figures/evo_contacteditor_a.png +share/gnome/help/evolution/fr/figures/evo_crash_recovery.png +share/gnome/help/evolution/fr/figures/evo_custom_header.png +share/gnome/help/evolution/fr/figures/evo_debuglogs_a.png share/gnome/help/evolution/fr/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/fr/figures/evo_dialog-info.png +share/gnome/help/evolution/fr/figures/evo_dialog-warning.png share/gnome/help/evolution/fr/figures/evo_edit_rule_a.png share/gnome/help/evolution/fr/figures/evo_edit_search.png share/gnome/help/evolution/fr/figures/evo_email_a.png @@ -1200,6 +1475,8 @@ share/gnome/help/evolution/fr/figures/evo_imapheader_a.png share/gnome/help/evolution/fr/figures/evo_imapreceive_a.png share/gnome/help/evolution/fr/figures/evo_import_asst_a.png share/gnome/help/evolution/fr/figures/evo_junk_a.png +share/gnome/help/evolution/fr/figures/evo_label_a.PNG +share/gnome/help/evolution/fr/figures/evo_labels_a.png share/gnome/help/evolution/fr/figures/evo_mail_a.png share/gnome/help/evolution/fr/figures/evo_mail_callout_a.png share/gnome/help/evolution/fr/figures/evo_mail_notifier.png @@ -1246,6 +1523,7 @@ share/gnome/help/evolution/fr/figures/full-4.png share/gnome/help/evolution/fr/figures/full-5.png share/gnome/help/evolution/fr/figures/full-6.png share/gnome/help/evolution/fr/figures/full-7.png +share/gnome/help/evolution/fr/figures/google_cal_view.png share/gnome/help/evolution/fr/figures/mail-druid-pic.png share/gnome/help/evolution/fr/figures/mail-inbox.png share/gnome/help/evolution/fr/figures/mail-threaded.png @@ -1266,6 +1544,126 @@ share/gnome/help/evolution/fr/figures/sub-others-folder.png 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-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/calendar.png +share/gnome/help/evolution/mk/figures/categories_a.png +share/gnome/help/evolution/mk/figures/collap_head_a.png +share/gnome/help/evolution/mk/figures/config-cal.png +share/gnome/help/evolution/mk/figures/config-mail.png +share/gnome/help/evolution/mk/figures/contact-editor.png +share/gnome/help/evolution/mk/figures/contact.png +share/gnome/help/evolution/mk/figures/contacts_mainwindow_a.png +share/gnome/help/evolution/mk/figures/delgt-add.png +share/gnome/help/evolution/mk/figures/evo_account_editor_a.png +share/gnome/help/evolution/mk/figures/evo_account_info_a.png +share/gnome/help/evolution/mk/figures/evo_add_rule_a.png +share/gnome/help/evolution/mk/figures/evo_adv_search_a.png +share/gnome/help/evolution/mk/figures/evo_allday_a.png +share/gnome/help/evolution/mk/figures/evo_attachreminder_plugin.png +share/gnome/help/evolution/mk/figures/evo_backup.png +share/gnome/help/evolution/mk/figures/evo_backup_prgsbar.png +share/gnome/help/evolution/mk/figures/evo_backup_warning.png +share/gnome/help/evolution/mk/figures/evo_blink.png +share/gnome/help/evolution/mk/figures/evo_cal_a.png +share/gnome/help/evolution/mk/figures/evo_cal_advsearch.png +share/gnome/help/evolution/mk/figures/evo_cal_callout_a.png +share/gnome/help/evolution/mk/figures/evo_cal_prop_a.png +share/gnome/help/evolution/mk/figures/evo_calender_appointmnt.png +share/gnome/help/evolution/mk/figures/evo_calstatus_a.png +share/gnome/help/evolution/mk/figures/evo_contacteditor_a.png +share/gnome/help/evolution/mk/figures/evo_crash_recovery.png +share/gnome/help/evolution/mk/figures/evo_custom_header.png +share/gnome/help/evolution/mk/figures/evo_debuglogs_a.png +share/gnome/help/evolution/mk/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/mk/figures/evo_dialog-info.png +share/gnome/help/evolution/mk/figures/evo_dialog-warning.png +share/gnome/help/evolution/mk/figures/evo_edit_rule_a.png +share/gnome/help/evolution/mk/figures/evo_edit_search.png +share/gnome/help/evolution/mk/figures/evo_email_a.png +share/gnome/help/evolution/mk/figures/evo_flag_follow_up_a.png +share/gnome/help/evolution/mk/figures/evo_gwreceive_a.png +share/gnome/help/evolution/mk/figures/evo_gwreceiveedit_a.png +share/gnome/help/evolution/mk/figures/evo_gwreceiveoptedit_a.png +share/gnome/help/evolution/mk/figures/evo_gwstatustrack.png +share/gnome/help/evolution/mk/figures/evo_identity_a.png +share/gnome/help/evolution/mk/figures/evo_identityedit_a.png +share/gnome/help/evolution/mk/figures/evo_imapheader_a.png +share/gnome/help/evolution/mk/figures/evo_imapreceive_a.png +share/gnome/help/evolution/mk/figures/evo_import_asst_a.png +share/gnome/help/evolution/mk/figures/evo_junk_a.png +share/gnome/help/evolution/mk/figures/evo_label_a.PNG +share/gnome/help/evolution/mk/figures/evo_labels_a.png +share/gnome/help/evolution/mk/figures/evo_mail_a.png +share/gnome/help/evolution/mk/figures/evo_mail_callout_a.png +share/gnome/help/evolution/mk/figures/evo_mail_notifier.png +share/gnome/help/evolution/mk/figures/evo_maildirreceive_a.png +share/gnome/help/evolution/mk/figures/evo_mboxreceive_a.png +share/gnome/help/evolution/mk/figures/evo_memo_a.png +share/gnome/help/evolution/mk/figures/evo_mereceive_a.png +share/gnome/help/evolution/mk/figures/evo_message_filters_a.png +share/gnome/help/evolution/mk/figures/evo_mhreceive_a.png +share/gnome/help/evolution/mk/figures/evo_newmail.png +share/gnome/help/evolution/mk/figures/evo_newmess_a.png +share/gnome/help/evolution/mk/figures/evo_offline.png +share/gnome/help/evolution/mk/figures/evo_popreceive_a.png +share/gnome/help/evolution/mk/figures/evo_proxyadd_a.png +share/gnome/help/evolution/mk/figures/evo_receive_setup2_a.png +share/gnome/help/evolution/mk/figures/evo_receive_setup_a.png +share/gnome/help/evolution/mk/figures/evo_rmdrnotes_a.png +share/gnome/help/evolution/mk/figures/evo_rule_a.png +share/gnome/help/evolution/mk/figures/evo_select_add_folder.png +share/gnome/help/evolution/mk/figures/evo_select_folder.png +share/gnome/help/evolution/mk/figures/evo_send_option_a.png +share/gnome/help/evolution/mk/figures/evo_send_setup_a.png +share/gnome/help/evolution/mk/figures/evo_sendstatus_a.png +share/gnome/help/evolution/mk/figures/evo_shd_memo_a.png +share/gnome/help/evolution/mk/figures/evo_timezone_a.png +share/gnome/help/evolution/mk/figures/evo_usereceive_a.png +share/gnome/help/evolution/mk/figures/exchange-delegation.png +share/gnome/help/evolution/mk/figures/exchange-identity.png +share/gnome/help/evolution/mk/figures/exchange-receive-options.png +share/gnome/help/evolution/mk/figures/exchange-receive.png +share/gnome/help/evolution/mk/figures/exchg-identity.png +share/gnome/help/evolution/mk/figures/exchng-identity.png +share/gnome/help/evolution/mk/figures/exchng-rec-mail.png +share/gnome/help/evolution/mk/figures/exchng-rec-mails.png +share/gnome/help/evolution/mk/figures/exchng-rec-option.png +share/gnome/help/evolution/mk/figures/exchng-rec-options.png +share/gnome/help/evolution/mk/figures/exchng-settings.png +share/gnome/help/evolution/mk/figures/filter-new-fig.png +share/gnome/help/evolution/mk/figures/free_busy.png +share/gnome/help/evolution/mk/figures/full-1.png +share/gnome/help/evolution/mk/figures/full-2.png +share/gnome/help/evolution/mk/figures/full-3.png +share/gnome/help/evolution/mk/figures/full-4.png +share/gnome/help/evolution/mk/figures/full-5.png +share/gnome/help/evolution/mk/figures/full-6.png +share/gnome/help/evolution/mk/figures/full-7.png +share/gnome/help/evolution/mk/figures/google_cal_view.png +share/gnome/help/evolution/mk/figures/mail-druid-pic.png +share/gnome/help/evolution/mk/figures/mail-inbox.png +share/gnome/help/evolution/mk/figures/mail-threaded.png +share/gnome/help/evolution/mk/figures/mail_mainwindow_a.png +share/gnome/help/evolution/mk/figures/mailer_preferences.png +share/gnome/help/evolution/mk/figures/mainwindow-pic.png +share/gnome/help/evolution/mk/figures/minus.png +share/gnome/help/evolution/mk/figures/newmsg.png +share/gnome/help/evolution/mk/figures/plus.png +share/gnome/help/evolution/mk/figures/proxy-cal.png +share/gnome/help/evolution/mk/figures/proxy-login.png +share/gnome/help/evolution/mk/figures/quick_add_a.png +share/gnome/help/evolution/mk/figures/quick_reference.png +share/gnome/help/evolution/mk/figures/replymsg.png +share/gnome/help/evolution/mk/figures/schedule.png +share/gnome/help/evolution/mk/figures/stock_search.png +share/gnome/help/evolution/mk/figures/sub-others-folder.png +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-Free-Busy.png share/gnome/help/evolution/oc/figures/account_editor_a.png @@ -1297,7 +1695,12 @@ share/gnome/help/evolution/oc/figures/evo_cal_prop_a.png share/gnome/help/evolution/oc/figures/evo_calender_appointmnt.png share/gnome/help/evolution/oc/figures/evo_calstatus_a.png share/gnome/help/evolution/oc/figures/evo_contacteditor_a.png +share/gnome/help/evolution/oc/figures/evo_crash_recovery.png +share/gnome/help/evolution/oc/figures/evo_custom_header.png +share/gnome/help/evolution/oc/figures/evo_debuglogs_a.png share/gnome/help/evolution/oc/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/oc/figures/evo_dialog-info.png +share/gnome/help/evolution/oc/figures/evo_dialog-warning.png share/gnome/help/evolution/oc/figures/evo_edit_rule_a.png share/gnome/help/evolution/oc/figures/evo_edit_search.png share/gnome/help/evolution/oc/figures/evo_email_a.png @@ -1312,6 +1715,8 @@ share/gnome/help/evolution/oc/figures/evo_imapheader_a.png share/gnome/help/evolution/oc/figures/evo_imapreceive_a.png share/gnome/help/evolution/oc/figures/evo_import_asst_a.png share/gnome/help/evolution/oc/figures/evo_junk_a.png +share/gnome/help/evolution/oc/figures/evo_label_a.PNG +share/gnome/help/evolution/oc/figures/evo_labels_a.png share/gnome/help/evolution/oc/figures/evo_mail_a.png share/gnome/help/evolution/oc/figures/evo_mail_callout_a.png share/gnome/help/evolution/oc/figures/evo_mail_notifier.png @@ -1358,6 +1763,7 @@ share/gnome/help/evolution/oc/figures/full-4.png share/gnome/help/evolution/oc/figures/full-5.png share/gnome/help/evolution/oc/figures/full-6.png share/gnome/help/evolution/oc/figures/full-7.png +share/gnome/help/evolution/oc/figures/google_cal_view.png share/gnome/help/evolution/oc/figures/mail-druid-pic.png share/gnome/help/evolution/oc/figures/mail-inbox.png share/gnome/help/evolution/oc/figures/mail-threaded.png @@ -1409,7 +1815,12 @@ share/gnome/help/evolution/ru/figures/evo_cal_prop_a.png share/gnome/help/evolution/ru/figures/evo_calender_appointmnt.png share/gnome/help/evolution/ru/figures/evo_calstatus_a.png share/gnome/help/evolution/ru/figures/evo_contacteditor_a.png +share/gnome/help/evolution/ru/figures/evo_crash_recovery.png +share/gnome/help/evolution/ru/figures/evo_custom_header.png +share/gnome/help/evolution/ru/figures/evo_debuglogs_a.png share/gnome/help/evolution/ru/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/ru/figures/evo_dialog-info.png +share/gnome/help/evolution/ru/figures/evo_dialog-warning.png share/gnome/help/evolution/ru/figures/evo_edit_rule_a.png share/gnome/help/evolution/ru/figures/evo_edit_search.png share/gnome/help/evolution/ru/figures/evo_email_a.png @@ -1424,6 +1835,8 @@ share/gnome/help/evolution/ru/figures/evo_imapheader_a.png share/gnome/help/evolution/ru/figures/evo_imapreceive_a.png share/gnome/help/evolution/ru/figures/evo_import_asst_a.png share/gnome/help/evolution/ru/figures/evo_junk_a.png +share/gnome/help/evolution/ru/figures/evo_label_a.PNG +share/gnome/help/evolution/ru/figures/evo_labels_a.png share/gnome/help/evolution/ru/figures/evo_mail_a.png share/gnome/help/evolution/ru/figures/evo_mail_callout_a.png share/gnome/help/evolution/ru/figures/evo_mail_notifier.png @@ -1470,6 +1883,7 @@ share/gnome/help/evolution/ru/figures/full-4.png share/gnome/help/evolution/ru/figures/full-5.png share/gnome/help/evolution/ru/figures/full-6.png share/gnome/help/evolution/ru/figures/full-7.png +share/gnome/help/evolution/ru/figures/google_cal_view.png share/gnome/help/evolution/ru/figures/mail-druid-pic.png share/gnome/help/evolution/ru/figures/mail-inbox.png share/gnome/help/evolution/ru/figures/mail-threaded.png @@ -1521,7 +1935,12 @@ share/gnome/help/evolution/sv/figures/evo_cal_prop_a.png share/gnome/help/evolution/sv/figures/evo_calender_appointmnt.png share/gnome/help/evolution/sv/figures/evo_calstatus_a.png share/gnome/help/evolution/sv/figures/evo_contacteditor_a.png +share/gnome/help/evolution/sv/figures/evo_crash_recovery.png +share/gnome/help/evolution/sv/figures/evo_custom_header.png +share/gnome/help/evolution/sv/figures/evo_debuglogs_a.png share/gnome/help/evolution/sv/figures/evo_delegate_permission_a.png +share/gnome/help/evolution/sv/figures/evo_dialog-info.png +share/gnome/help/evolution/sv/figures/evo_dialog-warning.png share/gnome/help/evolution/sv/figures/evo_edit_rule_a.png share/gnome/help/evolution/sv/figures/evo_edit_search.png share/gnome/help/evolution/sv/figures/evo_email_a.png @@ -1536,6 +1955,8 @@ share/gnome/help/evolution/sv/figures/evo_imapheader_a.png share/gnome/help/evolution/sv/figures/evo_imapreceive_a.png share/gnome/help/evolution/sv/figures/evo_import_asst_a.png share/gnome/help/evolution/sv/figures/evo_junk_a.png +share/gnome/help/evolution/sv/figures/evo_label_a.PNG +share/gnome/help/evolution/sv/figures/evo_labels_a.png share/gnome/help/evolution/sv/figures/evo_mail_a.png share/gnome/help/evolution/sv/figures/evo_mail_callout_a.png share/gnome/help/evolution/sv/figures/evo_mail_notifier.png @@ -1582,6 +2003,7 @@ share/gnome/help/evolution/sv/figures/full-4.png share/gnome/help/evolution/sv/figures/full-5.png share/gnome/help/evolution/sv/figures/full-6.png share/gnome/help/evolution/sv/figures/full-7.png +share/gnome/help/evolution/sv/figures/google_cal_view.png share/gnome/help/evolution/sv/figures/mail-druid-pic.png share/gnome/help/evolution/sv/figures/mail-inbox.png share/gnome/help/evolution/sv/figures/mail-threaded.png @@ -1606,12 +2028,7 @@ share/icons/hicolor/16x16/apps/evolution.png share/icons/hicolor/22x22/apps/evolution.png share/icons/hicolor/24x24/apps/evolution.png share/icons/hicolor/32x32/apps/evolution.png -share/icons/hicolor/48x48/apps/preferences-autocompletion.png -share/icons/hicolor/48x48/apps/preferences-calendar-and-tasks.png -share/icons/hicolor/48x48/apps/preferences-certificates.png -share/icons/hicolor/48x48/apps/preferences-composer.png -share/icons/hicolor/48x48/apps/preferences-mail-accounts.png -share/icons/hicolor/48x48/apps/preferences-mail.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 @@ -1625,6 +2042,7 @@ 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/az/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/be@latin/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -1658,6 +2076,7 @@ share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ka/LC_MESSAGES/evolution-%%VERSION%%.mo +share/locale/kn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ku/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -1701,11 +2120,13 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo share/mime-info/evolution.keys share/mime-info/evolution.mime share/omf/evolution/evolution-C.omf +share/omf/evolution/evolution-cs.omf share/omf/evolution/evolution-de.omf share/omf/evolution/evolution-el.omf share/omf/evolution/evolution-en_GB.omf share/omf/evolution/evolution-es.omf share/omf/evolution/evolution-fr.omf +share/omf/evolution/evolution-mk.omf share/omf/evolution/evolution-oc.omf share/omf/evolution/evolution-ru.omf share/omf/evolution/evolution-sv.omf @@ -1717,6 +2138,8 @@ share/omf/evolution/evolution-sv.omf @dirrm share/gnome/help/evolution/ru @dirrm share/gnome/help/evolution/oc/figures @dirrm share/gnome/help/evolution/oc +@dirrm share/gnome/help/evolution/mk/figures +@dirrm share/gnome/help/evolution/mk @dirrm share/gnome/help/evolution/fr/figures @dirrm share/gnome/help/evolution/fr @dirrm share/gnome/help/evolution/es/figures @@ -1727,6 +2150,8 @@ share/omf/evolution/evolution-sv.omf @dirrm share/gnome/help/evolution/el @dirrm share/gnome/help/evolution/de/figures @dirrm share/gnome/help/evolution/de +@dirrm share/gnome/help/evolution/cs/figures +@dirrm share/gnome/help/evolution/cs @dirrm share/gnome/help/evolution/C/figures @dirrm share/gnome/help/evolution/C @dirrm share/gnome/help/evolution @@ -1738,12 +2163,31 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/views/addressbook @dirrm %%DATADIR%%/%%VERSION%%/views @dirrm %%DATADIR%%/%%VERSION%%/ui +@dirrm %%DATADIR%%/%%VERSION%%/sounds @dirrm %%DATADIR%%/%%VERSION%%/images +@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 +@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/actions +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24 +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/places +@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/actions +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16 +@dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor +@dirrm %%DATADIR%%/%%VERSION%%/icons @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/sv @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/sq @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/pt @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/pl @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/it +@dirrm %%DATADIR%%/%%VERSION%%/help/quickref/hu @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/fr @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/es @dirrm %%DATADIR%%/%%VERSION%%/help/quickref/de @@ -1775,6 +2219,9 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/default/lt/mail/local @dirrm %%DATADIR%%/%%VERSION%%/default/lt/mail @dirrm %%DATADIR%%/%%VERSION%%/default/lt +@dirrm %%DATADIR%%/%%VERSION%%/default/ko/mail/local +@dirrm %%DATADIR%%/%%VERSION%%/default/ko/mail +@dirrm %%DATADIR%%/%%VERSION%%/default/ko @dirrm %%DATADIR%%/%%VERSION%%/default/ja/mail/local @dirrm %%DATADIR%%/%%VERSION%%/default/ja/mail @dirrm %%DATADIR%%/%%VERSION%%/default/ja @@ -1796,10 +2243,10 @@ share/omf/evolution/evolution-sv.omf @dirrm %%DATADIR%%/%%VERSION%%/default @dirrm %%DATADIR%%/%%VERSION%% @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm libexec/evolution/%%VERSION%% @dirrm libexec/evolution @dirrm lib/evolution/%%VERSION%%/plugins -%%PILOT:%%@dirrm lib/evolution/%%VERSION%%/conduits @dirrm lib/evolution/%%VERSION%%/components @dirrm lib/evolution/%%VERSION%% @dirrm lib/evolution @@ -1838,6 +2285,7 @@ share/omf/evolution/evolution-sv.omf @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 -@dirrmtry share/applications diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile index cf830f3ce1ae..42952dbc40d1 100644 --- a/mail/gnome-gmail-notifier/Makefile +++ b/mail/gnome-gmail-notifier/Makefile @@ -15,7 +15,7 @@ MAINTAINER= flz@FreeBSD.org COMMENT= A Gmail Inbox Monitor for the GNOME2 desktop LIB_PC_DEPENDS= libnotify:devel/libnotify \ - libsoup-2.2:devel/libsoup \ + libsoup-2.2:devel/libsoup22 \ gnome-keyring-1:security/gnome-keyring BUILD_DEPENDS= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|:C|:|.pc:${PORTSDIR}/|} diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index d96b2299ae54..0f83b14b0bd8 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/math/gcalctool/Makefile,v 1.82 2007/10/17 21:36:12 mezz Exp $ +# $MCom: ports/math/gcalctool/Makefile,v 1.92 2008/03/10 15:55:04 ahze Exp $ # PORTNAME= gcalctool -PORTVERSION= 5.20.2 -PORTREVISION= 1 +PORTVERSION= 5.22.0 PORTEPOCH= 2 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -25,7 +24,7 @@ USE_GETTEXT= yes USE_XLIB= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils libglade2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo index 215b552f6d76..a54547b6767a 100644 --- a/math/gcalctool/distinfo +++ b/math/gcalctool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gcalctool-5.20.2.tar.bz2) = bcde10b8029d3a513183e8aac9506c1f -SHA256 (gnome2/gcalctool-5.20.2.tar.bz2) = b871c8b7fa2c4afa78b6a1708cffe04ae389ee20ff34e5fb2ddb4b78071edacd -SIZE (gnome2/gcalctool-5.20.2.tar.bz2) = 1343757 +MD5 (gnome2/gcalctool-5.22.0.tar.bz2) = 037ef812fe5562b4dda55b9eea82b77b +SHA256 (gnome2/gcalctool-5.22.0.tar.bz2) = c9f675c14fdbaf1a2f61f3d457e3a941ae5257b111509ae73579325f7d010afb +SIZE (gnome2/gcalctool-5.22.0.tar.bz2) = 1550068 diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist index c0964e2f6542..cbb7c6d2b0b9 100644 --- a/math/gcalctool/pkg-plist +++ b/math/gcalctool/pkg-plist @@ -1,6 +1,8 @@ bin/gcalctool bin/gnome-calculator share/applications/gcalctool.desktop +%%DATADIR%%/gcalctool.glade +share/gnome/help/gcalctool/C/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png @@ -14,48 +16,55 @@ 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/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 share/gnome/help/gcalctool/de/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/de/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/de/gcalctool.xml +share/gnome/help/gcalctool/es/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/es/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/es/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/es/gcalctool.xml +share/gnome/help/gcalctool/fr/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/fr/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/fr/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/fr/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/fr/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/fr/gcalctool.xml +share/gnome/help/gcalctool/it/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/it/figures/gcalctool_basic_window.png 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/it/legal.xml 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 share/gnome/help/gcalctool/ko/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/ko/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/ko/gcalctool.xml +share/gnome/help/gcalctool/oc/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/oc/figures/gcalctool_basic_window.png share/gnome/help/gcalctool/oc/figures/gcalctool_financial_window.png share/gnome/help/gcalctool/oc/figures/gcalctool_menu_symbol.png share/gnome/help/gcalctool/oc/figures/gcalctool_scientific_window.png share/gnome/help/gcalctool/oc/gcalctool.xml +share/gnome/help/gcalctool/pt_BR/figures/gcalctool_advanced_window.png share/gnome/help/gcalctool/pt_BR/figures/gcalctool_basic_window.png 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/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 @@ -79,10 +88,13 @@ 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 +share/locale/as/LC_MESSAGES/gcalctool.mo share/locale/az/LC_MESSAGES/gcalctool.mo share/locale/be/LC_MESSAGES/gcalctool.mo +share/locale/be@latin/LC_MESSAGES/gcalctool.mo share/locale/bg/LC_MESSAGES/gcalctool.mo share/locale/bn/LC_MESSAGES/gcalctool.mo share/locale/bn_IN/LC_MESSAGES/gcalctool.mo @@ -114,6 +126,7 @@ share/locale/id/LC_MESSAGES/gcalctool.mo share/locale/it/LC_MESSAGES/gcalctool.mo share/locale/ja/LC_MESSAGES/gcalctool.mo share/locale/ka/LC_MESSAGES/gcalctool.mo +share/locale/kn/LC_MESSAGES/gcalctool.mo share/locale/ko/LC_MESSAGES/gcalctool.mo share/locale/ku/LC_MESSAGES/gcalctool.mo share/locale/lt/LC_MESSAGES/gcalctool.mo @@ -127,6 +140,7 @@ share/locale/ms/LC_MESSAGES/gcalctool.mo share/locale/nb/LC_MESSAGES/gcalctool.mo share/locale/ne/LC_MESSAGES/gcalctool.mo share/locale/nl/LC_MESSAGES/gcalctool.mo +share/locale/nn/LC_MESSAGES/gcalctool.mo share/locale/oc/LC_MESSAGES/gcalctool.mo share/locale/or/LC_MESSAGES/gcalctool.mo share/locale/pa/LC_MESSAGES/gcalctool.mo @@ -198,6 +212,8 @@ share/omf/gcalctool/gcalctool-zh_TW.omf @dirrm share/gnome/help/gcalctool/C/figures @dirrm share/gnome/help/gcalctool/C @dirrm share/gnome/help/gcalctool +@dirrm %%DATADIR%% +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -222,4 +238,7 @@ share/omf/gcalctool/gcalctool-zh_TW.omf @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/math/gnumeric/Makefile b/math/gnumeric/Makefile index d9ccdeefbce9..0785e8642d3f 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -3,7 +3,7 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/math/gnumeric/Makefile,v 1.39 2007/09/16 21:42:03 marcus Exp $ +# $MCom: ports/math/gnumeric/Makefile,v 1.42 2008/03/11 12:45:31 ahze Exp $ # PORTNAME= gnumeric @@ -60,6 +60,9 @@ post-extract: post-patch: @${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in + @${REINPLACE_CMD} -e 's|gda-3.0 >= 3.1.1|gda-3.0 >= 3.0.1|g' \ + -e 's|gnomedb-3.0 >= 3.0.1|gnomedb-3.0 >= 3.0.0|g' \ + ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/applications diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist index 953d7bb4d988..dd8c2595dc48 100644 --- a/math/gnumeric/pkg-plist +++ b/math/gnumeric/pkg-plist @@ -938,6 +938,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo @dirrm include/libspreadsheet-1.8/spreadsheet @dirrm include/libspreadsheet-1.8 @unexec update-desktop-database > /dev/null || /usr/bin/true +@dirrmtry share/applications @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/rw/LC_MESSAGES @@ -948,4 +949,3 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo @dirrmtry share/locale/mr @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/applications diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile index 997a6b4b2c0f..d05b7d9fb70d 100644 --- a/misc/gnome-devel-docs/Makefile +++ b/misc/gnome-devel-docs/Makefile @@ -3,10 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.1 2007/09/18 15:23:15 ahze Exp $ +# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.3 2008/03/11 04:00:33 mezz Exp $ +# PORTNAME= gnome-devel-docs -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= misc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,6 +21,7 @@ RUN_DEPENDS= gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes +USE_GNOME= gnometarget INSTALLS_OMF= yes .include <bsd.port.mk> diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo index b8d1c3b1a78c..3e10d12e378d 100644 --- a/misc/gnome-devel-docs/distinfo +++ b/misc/gnome-devel-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 64d6e3594b2c6422ea8d17b78f501020 -SHA256 (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 0d966471c8199350df7d3ecc712cde7efd9c52d8d4d31c87060bc5d70c5448ff -SIZE (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 2373648 +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 diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist index 3f2151d25f3f..fa595e2d0494 100644 --- a/misc/gnome-devel-docs/pkg-plist +++ b/misc/gnome-devel-docs/pkg-plist @@ -95,6 +95,7 @@ share/gnome/help/hig-book/C/hig-ch-layout.xml share/gnome/help/hig-book/C/hig-ch-menus.xml 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 @@ -103,28 +104,17 @@ 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/alert-button-order.png -share/gnome/help/hig-book/C/images/alert-spacing.png -share/gnome/help/hig-book/C/images/alert-text.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/applications-menu.png -share/gnome/help/hig-book/C/images/assistant-first-page.png -share/gnome/help/hig-book/C/images/assistant-middle-page.png -share/gnome/help/hig-book/C/images/authentication-alert.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/checklist-window-done.png -share/gnome/help/hig-book/C/images/checklist-window-in-progress.png -share/gnome/help/hig-book/C/images/checklist-window-start.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/confirmation-alert.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 @@ -159,6 +149,7 @@ 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 @@ -169,9 +160,7 @@ 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/error-alert.png share/gnome/help/hig-book/C/images/evolution-icon.png -share/gnome/help/hig-book/C/images/explicit-apply.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 @@ -219,7 +208,6 @@ 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/information-alert.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 @@ -234,7 +222,6 @@ 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/mdi.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 @@ -278,17 +265,12 @@ 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/preferences-window.png -share/gnome/help/hig-book/C/images/primary-window.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/progress-window-copy.png -share/gnome/help/hig-book/C/images/progress-window.png -share/gnome/help/hig-book/C/images/property-window.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 @@ -297,8 +279,6 @@ 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/save_alert.png -share/gnome/help/hig-book/C/images/sdi.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 @@ -306,17 +286,38 @@ 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/tabbed-dialog-box.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/toolbox-small.png -share/gnome/help/hig-book/C/images/toolbox.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/window-title.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 +share/gnome/help/hig-book/C/images/windows-alert-error.png +share/gnome/help/hig-book/C/images/windows-alert-information.png +share/gnome/help/hig-book/C/images/windows-alert-save.png +share/gnome/help/hig-book/C/images/windows-alert-spacing.png +share/gnome/help/hig-book/C/images/windows-alert-text.png +share/gnome/help/hig-book/C/images/windows-assistant-first-page.png +share/gnome/help/hig-book/C/images/windows-assistant-middle-page.png +share/gnome/help/hig-book/C/images/windows-dialog-tabbed.png +share/gnome/help/hig-book/C/images/windows-explicit-apply.png +share/gnome/help/hig-book/C/images/windows-mdi.png +share/gnome/help/hig-book/C/images/windows-preferences.png +share/gnome/help/hig-book/C/images/windows-primary.png +share/gnome/help/hig-book/C/images/windows-progress-checklist-done.png +share/gnome/help/hig-book/C/images/windows-progress-checklist-start.png +share/gnome/help/hig-book/C/images/windows-progress-checklist.png +share/gnome/help/hig-book/C/images/windows-progress-copy-file.png +share/gnome/help/hig-book/C/images/windows-progress.png +share/gnome/help/hig-book/C/images/windows-properties.png +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/platform-overview/C/apx-modules.xml @@ -343,6 +344,18 @@ share/gnome/help/platform-overview/es/ipc-network.xml share/gnome/help/platform-overview/es/legal-fdl.xml share/gnome/help/platform-overview/es/platform-overview.xml share/gnome/help/platform-overview/es/platform.xml +share/gnome/help/platform-overview/fr/apx-modules.xml +share/gnome/help/platform-overview/fr/bindings.xml +share/gnome/help/platform-overview/fr/core-tech.xml +share/gnome/help/platform-overview/fr/desktop-tech.xml +share/gnome/help/platform-overview/fr/figures/graphics.png +share/gnome/help/platform-overview/fr/figures/i18n.png +share/gnome/help/platform-overview/fr/figures/pango.png +share/gnome/help/platform-overview/fr/intro.xml +share/gnome/help/platform-overview/fr/ipc-network.xml +share/gnome/help/platform-overview/fr/legal-fdl.xml +share/gnome/help/platform-overview/fr/platform-overview.xml +share/gnome/help/platform-overview/fr/platform.xml share/gnome/help/platform-overview/it/apx-modules.xml share/gnome/help/platform-overview/it/bindings.xml share/gnome/help/platform-overview/it/core-tech.xml @@ -355,21 +368,53 @@ share/gnome/help/platform-overview/it/ipc-network.xml share/gnome/help/platform-overview/it/legal-fdl.xml share/gnome/help/platform-overview/it/platform-overview.xml share/gnome/help/platform-overview/it/platform.xml +share/gnome/help/platform-overview/oc/apx-modules.xml +share/gnome/help/platform-overview/oc/bindings.xml +share/gnome/help/platform-overview/oc/core-tech.xml +share/gnome/help/platform-overview/oc/desktop-tech.xml +share/gnome/help/platform-overview/oc/figures/graphics.png +share/gnome/help/platform-overview/oc/figures/i18n.png +share/gnome/help/platform-overview/oc/figures/pango.png +share/gnome/help/platform-overview/oc/intro.xml +share/gnome/help/platform-overview/oc/ipc-network.xml +share/gnome/help/platform-overview/oc/legal-fdl.xml +share/gnome/help/platform-overview/oc/platform-overview.xml +share/gnome/help/platform-overview/oc/platform.xml +share/gnome/help/platform-overview/ru/apx-modules.xml +share/gnome/help/platform-overview/ru/bindings.xml +share/gnome/help/platform-overview/ru/core-tech.xml +share/gnome/help/platform-overview/ru/desktop-tech.xml +share/gnome/help/platform-overview/ru/figures/graphics.png +share/gnome/help/platform-overview/ru/figures/i18n.png +share/gnome/help/platform-overview/ru/figures/pango.png +share/gnome/help/platform-overview/ru/intro.xml +share/gnome/help/platform-overview/ru/ipc-network.xml +share/gnome/help/platform-overview/ru/legal-fdl.xml +share/gnome/help/platform-overview/ru/platform-overview.xml +share/gnome/help/platform-overview/ru/platform.xml 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/platform-overview/platform-overview-C.omf share/omf/platform-overview/platform-overview-es.omf +share/omf/platform-overview/platform-overview-fr.omf 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/integration-guide @dirrm share/omf/hig-book @dirrm share/omf/gdp-style-guide @dirrm share/omf/gdp-handbook -@dirrm share/omf +@dirrm share/gnome/help/platform-overview/ru/figures +@dirrm share/gnome/help/platform-overview/ru +@dirrm share/gnome/help/platform-overview/oc/figures +@dirrm share/gnome/help/platform-overview/oc @dirrm share/gnome/help/platform-overview/it/figures @dirrm share/gnome/help/platform-overview/it +@dirrm share/gnome/help/platform-overview/fr/figures +@dirrm share/gnome/help/platform-overview/fr @dirrm share/gnome/help/platform-overview/es/figures @dirrm share/gnome/help/platform-overview/es @dirrm share/gnome/help/platform-overview/C/figures diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 537cd00c49ee..ed09d16aad3f 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -3,15 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.107 2007/09/18 02:01:24 ahze Exp $ +# $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.113 2008/03/11 17:31:58 mezz Exp $ # PORTNAME= gnome-icon-theme -PORTVERSION= 2.20.0 -PORTREVISION= 1 +PORTVERSION= 2.22.0 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 diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo index 150d02fc7b51..8741f3f0af06 100644 --- a/misc/gnome-icon-theme/distinfo +++ b/misc/gnome-icon-theme/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 56857a6d5f26c236b48fcf6760549d1b -SHA256 (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 3c911a7a35f6633bde3cc29bb6134e67dfec05dc13f5d6f03c04c6fa08448663 -SIZE (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 3470014 +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 diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist index dbd63d1e653f..cab97f2a7163 100644 --- a/misc/gnome-icon-theme/pkg-plist +++ b/misc/gnome-icon-theme/pkg-plist @@ -158,7 +158,6 @@ 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 @@ -296,7 +295,6 @@ 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 @@ -320,7 +318,6 @@ 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 @@ -328,7 +325,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 share/icons/gnome/16x16/actions/zoom-out.png @@ -616,20 +613,26 @@ share/icons/gnome/16x16/emblems/emblem-urgent.png share/icons/gnome/16x16/emblems/emblem-web.png share/icons/gnome/16x16/emblems/stock_mail-priority-high.png share/icons/gnome/16x16/emotes/face-angel.png +share/icons/gnome/16x16/emotes/face-angry.png share/icons/gnome/16x16/emotes/face-cool.png share/icons/gnome/16x16/emotes/face-crying.png share/icons/gnome/16x16/emotes/face-devilish.png share/icons/gnome/16x16/emotes/face-embarrassed.png share/icons/gnome/16x16/emotes/face-kiss.png +share/icons/gnome/16x16/emotes/face-laugh.png share/icons/gnome/16x16/emotes/face-monkey.png share/icons/gnome/16x16/emotes/face-plain.png share/icons/gnome/16x16/emotes/face-raspberry.png share/icons/gnome/16x16/emotes/face-sad.png +share/icons/gnome/16x16/emotes/face-sick.png share/icons/gnome/16x16/emotes/face-smile-big.png share/icons/gnome/16x16/emotes/face-smile.png share/icons/gnome/16x16/emotes/face-smirk.png share/icons/gnome/16x16/emotes/face-surprise.png +share/icons/gnome/16x16/emotes/face-tired.png +share/icons/gnome/16x16/emotes/face-uncertain.png share/icons/gnome/16x16/emotes/face-wink.png +share/icons/gnome/16x16/emotes/face-worried.png share/icons/gnome/16x16/emotes/stock_smiley-1.png share/icons/gnome/16x16/emotes/stock_smiley-10.png share/icons/gnome/16x16/emotes/stock_smiley-11.png @@ -886,6 +889,8 @@ share/icons/gnome/16x16/status/info.png share/icons/gnome/16x16/status/mail-attachment.png share/icons/gnome/16x16/status/mail-read.png share/icons/gnome/16x16/status/mail-replied.png +share/icons/gnome/16x16/status/mail-signed-verified.png +share/icons/gnome/16x16/status/mail-signed.png share/icons/gnome/16x16/status/mail-unread.png share/icons/gnome/16x16/status/media-playlist-repeat.png share/icons/gnome/16x16/status/media-playlist-shuffle.png @@ -1885,7 +1890,6 @@ 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 @@ -2023,7 +2027,6 @@ 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 @@ -2047,7 +2050,6 @@ 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 @@ -2055,7 +2057,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 share/icons/gnome/22x22/actions/zoom-out.png @@ -2342,20 +2344,26 @@ share/icons/gnome/22x22/emblems/emblem-urgent.png share/icons/gnome/22x22/emblems/emblem-web.png share/icons/gnome/22x22/emblems/stock_mail-priority-high.png share/icons/gnome/22x22/emotes/face-angel.png +share/icons/gnome/22x22/emotes/face-angry.png share/icons/gnome/22x22/emotes/face-cool.png share/icons/gnome/22x22/emotes/face-crying.png share/icons/gnome/22x22/emotes/face-devilish.png share/icons/gnome/22x22/emotes/face-embarrassed.png share/icons/gnome/22x22/emotes/face-kiss.png +share/icons/gnome/22x22/emotes/face-laugh.png share/icons/gnome/22x22/emotes/face-monkey.png share/icons/gnome/22x22/emotes/face-plain.png share/icons/gnome/22x22/emotes/face-raspberry.png share/icons/gnome/22x22/emotes/face-sad.png +share/icons/gnome/22x22/emotes/face-sick.png share/icons/gnome/22x22/emotes/face-smile-big.png share/icons/gnome/22x22/emotes/face-smile.png share/icons/gnome/22x22/emotes/face-smirk.png share/icons/gnome/22x22/emotes/face-surprise.png +share/icons/gnome/22x22/emotes/face-tired.png +share/icons/gnome/22x22/emotes/face-uncertain.png share/icons/gnome/22x22/emotes/face-wink.png +share/icons/gnome/22x22/emotes/face-worried.png share/icons/gnome/22x22/emotes/stock_smiley-1.png share/icons/gnome/22x22/emotes/stock_smiley-10.png share/icons/gnome/22x22/emotes/stock_smiley-11.png @@ -2610,6 +2618,8 @@ share/icons/gnome/22x22/status/info.png share/icons/gnome/22x22/status/mail-attachment.png share/icons/gnome/22x22/status/mail-read.png share/icons/gnome/22x22/status/mail-replied.png +share/icons/gnome/22x22/status/mail-signed-verified.png +share/icons/gnome/22x22/status/mail-signed.png share/icons/gnome/22x22/status/mail-unread.png share/icons/gnome/22x22/status/media-playlist-repeat.png share/icons/gnome/22x22/status/media-playlist-shuffle.png @@ -2843,7 +2853,6 @@ 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 @@ -2981,7 +2990,6 @@ 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 @@ -3005,7 +3013,6 @@ 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 @@ -3013,7 +3020,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 share/icons/gnome/24x24/actions/zoom-out.png @@ -3333,20 +3340,26 @@ share/icons/gnome/24x24/emblems/emblem-urgent.png share/icons/gnome/24x24/emblems/emblem-web.png share/icons/gnome/24x24/emblems/stock_mail-priority-high.png share/icons/gnome/24x24/emotes/face-angel.png +share/icons/gnome/24x24/emotes/face-angry.png share/icons/gnome/24x24/emotes/face-cool.png share/icons/gnome/24x24/emotes/face-crying.png share/icons/gnome/24x24/emotes/face-devilish.png share/icons/gnome/24x24/emotes/face-embarrassed.png share/icons/gnome/24x24/emotes/face-kiss.png +share/icons/gnome/24x24/emotes/face-laugh.png share/icons/gnome/24x24/emotes/face-monkey.png share/icons/gnome/24x24/emotes/face-plain.png share/icons/gnome/24x24/emotes/face-raspberry.png share/icons/gnome/24x24/emotes/face-sad.png +share/icons/gnome/24x24/emotes/face-sick.png share/icons/gnome/24x24/emotes/face-smile-big.png share/icons/gnome/24x24/emotes/face-smile.png share/icons/gnome/24x24/emotes/face-smirk.png share/icons/gnome/24x24/emotes/face-surprise.png +share/icons/gnome/24x24/emotes/face-tired.png +share/icons/gnome/24x24/emotes/face-uncertain.png share/icons/gnome/24x24/emotes/face-wink.png +share/icons/gnome/24x24/emotes/face-worried.png share/icons/gnome/24x24/emotes/stock_smiley-1.png share/icons/gnome/24x24/emotes/stock_smiley-10.png share/icons/gnome/24x24/emotes/stock_smiley-11.png @@ -3607,6 +3620,8 @@ share/icons/gnome/24x24/status/info.png share/icons/gnome/24x24/status/mail-attachment.png share/icons/gnome/24x24/status/mail-read.png share/icons/gnome/24x24/status/mail-replied.png +share/icons/gnome/24x24/status/mail-signed-verified.png +share/icons/gnome/24x24/status/mail-signed.png share/icons/gnome/24x24/status/mail-unread.png share/icons/gnome/24x24/status/media-playlist-repeat.png share/icons/gnome/24x24/status/media-playlist-shuffle.png @@ -4456,7 +4471,6 @@ 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 @@ -4589,7 +4603,6 @@ 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 @@ -4611,7 +4624,6 @@ 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 @@ -4619,7 +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 share/icons/gnome/32x32/actions/zoom-out.png @@ -4896,20 +4908,26 @@ share/icons/gnome/32x32/emblems/emblem-urgent.png share/icons/gnome/32x32/emblems/emblem-web.png share/icons/gnome/32x32/emblems/stock_mail-priority-high.png share/icons/gnome/32x32/emotes/face-angel.png +share/icons/gnome/32x32/emotes/face-angry.png share/icons/gnome/32x32/emotes/face-cool.png share/icons/gnome/32x32/emotes/face-crying.png share/icons/gnome/32x32/emotes/face-devilish.png share/icons/gnome/32x32/emotes/face-embarrassed.png share/icons/gnome/32x32/emotes/face-kiss.png +share/icons/gnome/32x32/emotes/face-laugh.png share/icons/gnome/32x32/emotes/face-monkey.png share/icons/gnome/32x32/emotes/face-plain.png share/icons/gnome/32x32/emotes/face-raspberry.png share/icons/gnome/32x32/emotes/face-sad.png +share/icons/gnome/32x32/emotes/face-sick.png share/icons/gnome/32x32/emotes/face-smile-big.png share/icons/gnome/32x32/emotes/face-smile.png share/icons/gnome/32x32/emotes/face-smirk.png share/icons/gnome/32x32/emotes/face-surprise.png +share/icons/gnome/32x32/emotes/face-tired.png +share/icons/gnome/32x32/emotes/face-uncertain.png share/icons/gnome/32x32/emotes/face-wink.png +share/icons/gnome/32x32/emotes/face-worried.png share/icons/gnome/32x32/emotes/stock_smiley-1.png share/icons/gnome/32x32/emotes/stock_smiley-10.png share/icons/gnome/32x32/emotes/stock_smiley-11.png @@ -5585,7 +5603,6 @@ 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 @@ -5718,7 +5735,6 @@ 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 @@ -5740,7 +5756,6 @@ 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 @@ -5748,7 +5763,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 share/icons/gnome/scalable/actions/zoom-out.svg @@ -6045,20 +6060,26 @@ share/icons/gnome/scalable/emblems/emblem-web.svg share/icons/gnome/scalable/emblems/stock_mail-priority-high.icon share/icons/gnome/scalable/emblems/stock_mail-priority-high.svg share/icons/gnome/scalable/emotes/face-angel.svg +share/icons/gnome/scalable/emotes/face-angry.svg share/icons/gnome/scalable/emotes/face-cool.svg share/icons/gnome/scalable/emotes/face-crying.svg share/icons/gnome/scalable/emotes/face-devilish.svg share/icons/gnome/scalable/emotes/face-embarrassed.svg share/icons/gnome/scalable/emotes/face-kiss.svg +share/icons/gnome/scalable/emotes/face-laugh.svg share/icons/gnome/scalable/emotes/face-monkey.svg share/icons/gnome/scalable/emotes/face-plain.svg share/icons/gnome/scalable/emotes/face-raspberry.svg share/icons/gnome/scalable/emotes/face-sad.svg +share/icons/gnome/scalable/emotes/face-sick.svg share/icons/gnome/scalable/emotes/face-smile-big.svg share/icons/gnome/scalable/emotes/face-smile.svg share/icons/gnome/scalable/emotes/face-smirk.svg share/icons/gnome/scalable/emotes/face-surprise.svg +share/icons/gnome/scalable/emotes/face-tired.svg +share/icons/gnome/scalable/emotes/face-uncertain.svg share/icons/gnome/scalable/emotes/face-wink.svg +share/icons/gnome/scalable/emotes/face-worried.svg share/icons/gnome/scalable/emotes/stock_smiley-1.svg share/icons/gnome/scalable/emotes/stock_smiley-10.svg share/icons/gnome/scalable/emotes/stock_smiley-11.svg @@ -6420,6 +6441,8 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg @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/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index 6d4bce23777c..cafe1e61a773 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.40 2007/10/13 21:06:54 marcus Exp $ +# $MCom: ports/misc/gnome-user-docs/Makefile,v 1.42 2008/03/10 17:39:04 ahze Exp $ # PORTNAME= gnome-user-docs -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo index 9a0f5ece6467..c7022e4e55c6 100644 --- a/misc/gnome-user-docs/distinfo +++ b/misc/gnome-user-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-user-docs-2.20.1.tar.bz2) = d6bba44acaed20117769ec8dce378f71 -SHA256 (gnome2/gnome-user-docs-2.20.1.tar.bz2) = cec02e5e31bc7ab1fa892314368d6021e6c80ded8af3f727122aa355f86d18c9 -SIZE (gnome2/gnome-user-docs-2.20.1.tar.bz2) = 9827506 +MD5 (gnome2/gnome-user-docs-2.22.0.tar.bz2) = f3af808e754701b83105eab2f5ca690c +SHA256 (gnome2/gnome-user-docs-2.22.0.tar.bz2) = 0328a0b750730788c1669b902fd93ad09313d62cdaa391131ce1bbec4a6c8fa7 +SIZE (gnome2/gnome-user-docs-2.22.0.tar.bz2) = 10876875 diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist index fbf3f44041f1..c94903d08db3 100644 --- a/misc/gnome-user-docs/pkg-plist +++ b/misc/gnome-user-docs/pkg-plist @@ -141,6 +141,33 @@ 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/accessx.png +share/gnome/help/gnome-access-guide/fi/figures/bouncekeys.png +share/gnome/help/gnome-access-guide/fi/figures/button.png +share/gnome/help/gnome-access-guide/fi/figures/check_box.png +share/gnome/help/gnome-access-guide/fi/figures/dropdown_combination_box.png +share/gnome/help/gnome-access-guide/fi/figures/dropdown_list_box.png +share/gnome/help/gnome-access-guide/fi/figures/mousekeys.png +share/gnome/help/gnome-access-guide/fi/figures/move_object_arrows.png +share/gnome/help/gnome-access-guide/fi/figures/move_object_before.png +share/gnome/help/gnome-access-guide/fi/figures/move_object_jump.png +share/gnome/help/gnome-access-guide/fi/figures/move_object_push.png +share/gnome/help/gnome-access-guide/fi/figures/radio_button.png +share/gnome/help/gnome-access-guide/fi/figures/slider.png +share/gnome/help/gnome-access-guide/fi/figures/slowkeys.png +share/gnome/help/gnome-access-guide/fi/figures/spin_box.png +share/gnome/help/gnome-access-guide/fi/figures/stickyaltlatch.png +share/gnome/help/gnome-access-guide/fi/figures/stickyaltlock.png +share/gnome/help/gnome-access-guide/fi/figures/stickyctrllatch.png +share/gnome/help/gnome-access-guide/fi/figures/stickyctrllock.png +share/gnome/help/gnome-access-guide/fi/figures/stickyshiftlatch.png +share/gnome/help/gnome-access-guide/fi/figures/stickyshiftlock.png +share/gnome/help/gnome-access-guide/fi/figures/stickywindowlatch.png +share/gnome/help/gnome-access-guide/fi/figures/stickywindowlock.png +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/accessx.png share/gnome/help/gnome-access-guide/fr/figures/bouncekeys.png share/gnome/help/gnome-access-guide/fr/figures/button.png @@ -195,6 +222,33 @@ 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/accessx.png +share/gnome/help/gnome-access-guide/oc/figures/bouncekeys.png +share/gnome/help/gnome-access-guide/oc/figures/button.png +share/gnome/help/gnome-access-guide/oc/figures/check_box.png +share/gnome/help/gnome-access-guide/oc/figures/dropdown_combination_box.png +share/gnome/help/gnome-access-guide/oc/figures/dropdown_list_box.png +share/gnome/help/gnome-access-guide/oc/figures/mousekeys.png +share/gnome/help/gnome-access-guide/oc/figures/move_object_arrows.png +share/gnome/help/gnome-access-guide/oc/figures/move_object_before.png +share/gnome/help/gnome-access-guide/oc/figures/move_object_jump.png +share/gnome/help/gnome-access-guide/oc/figures/move_object_push.png +share/gnome/help/gnome-access-guide/oc/figures/radio_button.png +share/gnome/help/gnome-access-guide/oc/figures/slider.png +share/gnome/help/gnome-access-guide/oc/figures/slowkeys.png +share/gnome/help/gnome-access-guide/oc/figures/spin_box.png +share/gnome/help/gnome-access-guide/oc/figures/stickyaltlatch.png +share/gnome/help/gnome-access-guide/oc/figures/stickyaltlock.png +share/gnome/help/gnome-access-guide/oc/figures/stickyctrllatch.png +share/gnome/help/gnome-access-guide/oc/figures/stickyctrllock.png +share/gnome/help/gnome-access-guide/oc/figures/stickyshiftlatch.png +share/gnome/help/gnome-access-guide/oc/figures/stickyshiftlock.png +share/gnome/help/gnome-access-guide/oc/figures/stickywindowlatch.png +share/gnome/help/gnome-access-guide/oc/figures/stickywindowlock.png +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/accessx.png share/gnome/help/gnome-access-guide/pt/figures/bouncekeys.png share/gnome/help/gnome-access-guide/pt/figures/button.png @@ -264,9 +318,14 @@ share/gnome/help/system-admin-guide/C/screensavers.xml 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/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/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 @@ -1118,6 +1177,83 @@ share/gnome/help/user-guide/ko/gospanel.xml share/gnome/help/user-guide/ko/gosstartsession.xml share/gnome/help/user-guide/ko/gostools.xml share/gnome/help/user-guide/ko/user-guide.xml +share/gnome/help/user-guide/oc/figures/ask_pointer.png +share/gnome/help/user-guide/oc/figures/busy_pointer.png +share/gnome/help/user-guide/oc/figures/com_file_manager_menu.png +share/gnome/help/user-guide/oc/figures/copy_pointer.png +share/gnome/help/user-guide/oc/figures/force_quit.png +share/gnome/help/user-guide/oc/figures/four_hide_button.png +share/gnome/help/user-guide/oc/figures/gedit_window.png +share/gnome/help/user-guide/oc/figures/gnome_panel.png +share/gnome/help/user-guide/oc/figures/hyperlink_pointer.png +share/gnome/help/user-guide/oc/figures/ibeam_pointer.png +share/gnome/help/user-guide/oc/figures/link_pointer.png +share/gnome/help/user-guide/oc/figures/lockscreen_icon.png +share/gnome/help/user-guide/oc/figures/logout_icon.png +share/gnome/help/user-guide/oc/figures/menu_bar_applet.png +share/gnome/help/user-guide/oc/figures/menu_panel.png +share/gnome/help/user-guide/oc/figures/move_panel_object_pointer.png +share/gnome/help/user-guide/oc/figures/move_pointer.png +share/gnome/help/user-guide/oc/figures/movewindow_pointer.png +share/gnome/help/user-guide/oc/figures/naut_browser_mode.png +share/gnome/help/user-guide/oc/figures/naut_button_bar.png +share/gnome/help/user-guide/oc/figures/naut_computer_launcher.png +share/gnome/help/user-guide/oc/figures/naut_emblem.png +share/gnome/help/user-guide/oc/figures/naut_go_to_location.png +share/gnome/help/user-guide/oc/figures/naut_link_emblem.png +share/gnome/help/user-guide/oc/figures/naut_noread_emblem.png +share/gnome/help/user-guide/oc/figures/naut_normal_size_button.png +share/gnome/help/user-guide/oc/figures/naut_nowrite_emblem.png +share/gnome/help/user-guide/oc/figures/naut_refine_search.png +share/gnome/help/user-guide/oc/figures/naut_sampleemblem1_icon.png +share/gnome/help/user-guide/oc/figures/naut_sampleemblem2_icon.png +share/gnome/help/user-guide/oc/figures/naut_sampleemblem3_icon.png +share/gnome/help/user-guide/oc/figures/naut_sampleemblem_icon.png +share/gnome/help/user-guide/oc/figures/naut_samplesymlink_icon.png +share/gnome/help/user-guide/oc/figures/naut_search_bar.png +share/gnome/help/user-guide/oc/figures/naut_search_results.png +share/gnome/help/user-guide/oc/figures/naut_spatial_icon_view.png +share/gnome/help/user-guide/oc/figures/naut_spatial_list_view.png +share/gnome/help/user-guide/oc/figures/naut_spatial_mode.png +share/gnome/help/user-guide/oc/figures/naut_spatial_view.png +share/gnome/help/user-guide/oc/figures/naut_starthere_launcher.png +share/gnome/help/user-guide/oc/figures/naut_trash_launcher.png +share/gnome/help/user-guide/oc/figures/naut_zoom_in_button.png +share/gnome/help/user-guide/oc/figures/naut_zoom_out_button.png +share/gnome/help/user-guide/oc/figures/nautilus_restore_saved_search.png +share/gnome/help/user-guide/oc/figures/normal_pointer.png +share/gnome/help/user-guide/oc/figures/not_available_pointer.png +share/gnome/help/user-guide/oc/figures/notification_area_icon.png +share/gnome/help/user-guide/oc/figures/open_drawer.png +share/gnome/help/user-guide/oc/figures/openwindows_menu.png +share/gnome/help/user-guide/oc/figures/panel_object_popup_menu.png +share/gnome/help/user-guide/oc/figures/resize_pointer.png +share/gnome/help/user-guide/oc/figures/run_button.png +share/gnome/help/user-guide/oc/figures/sample_applet.png +share/gnome/help/user-guide/oc/figures/screenshot_button.png +share/gnome/help/user-guide/oc/figures/searchtool_button.png +share/gnome/help/user-guide/oc/figures/show_desktop_button.png +share/gnome/help/user-guide/oc/figures/titlebar_anno_window.png +share/gnome/help/user-guide/oc/figures/titlebar_window.png +share/gnome/help/user-guide/oc/figures/typical_menu.png +share/gnome/help/user-guide/oc/figures/window_list_applet.png +share/gnome/help/user-guide/oc/figures/window_list_group_applet.png +share/gnome/help/user-guide/oc/figures/workspace_switcher_applet.png +share/gnome/help/user-guide/oc/figures/yelp_add_bookmark.png +share/gnome/help/user-guide/oc/figures/yelp_edit_bookmarks.png +share/gnome/help/user-guide/oc/figures/yelp_preferences.png +share/gnome/help/user-guide/oc/figures/yelp_window.png +share/gnome/help/user-guide/oc/glossary.xml +share/gnome/help/user-guide/oc/gosbasic.xml +share/gnome/help/user-guide/oc/goscustdesk.xml +share/gnome/help/user-guide/oc/goseditmainmenu.xml +share/gnome/help/user-guide/oc/gosfeedback.xml +share/gnome/help/user-guide/oc/gosnautilus.xml +share/gnome/help/user-guide/oc/gosoverview.xml +share/gnome/help/user-guide/oc/gospanel.xml +share/gnome/help/user-guide/oc/gosstartsession.xml +share/gnome/help/user-guide/oc/gostools.xml +share/gnome/help/user-guide/oc/user-guide.xml share/gnome/help/user-guide/pa/figures/ask_pointer.png share/gnome/help/user-guide/pa/figures/busy_pointer.png share/gnome/help/user-guide/pa/figures/com_file_manager_menu.png @@ -1585,14 +1721,21 @@ share/omf/gnome-access-guide/gnome-access-guide-de.omf share/omf/gnome-access-guide/gnome-access-guide-el.omf share/omf/gnome-access-guide/gnome-access-guide-en_GB.omf share/omf/gnome-access-guide/gnome-access-guide-es.omf +share/omf/gnome-access-guide/gnome-access-guide-fi.omf share/omf/gnome-access-guide/gnome-access-guide-fr.omf share/omf/gnome-access-guide/gnome-access-guide-it.omf +share/omf/gnome-access-guide/gnome-access-guide-oc.omf 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-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-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 @@ -1607,6 +1750,7 @@ 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-ko.omf +share/omf/user-guide/user-guide-oc.omf share/omf/user-guide/user-guide-pa.omf share/omf/user-guide/user-guide-pt.omf share/omf/user-guide/user-guide-pt_BR.omf @@ -1628,6 +1772,8 @@ share/omf/user-guide/user-guide-zh_CN.omf @dirrm share/gnome/help/user-guide/pt @dirrm share/gnome/help/user-guide/pa/figures @dirrm share/gnome/help/user-guide/pa +@dirrm share/gnome/help/user-guide/oc/figures +@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/it/figures @@ -1654,19 +1800,28 @@ share/omf/user-guide/user-guide-zh_CN.omf @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/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/ca @dirrm share/gnome/help/system-admin-guide/C @dirrm share/gnome/help/system-admin-guide @dirrm share/gnome/help/gnome-access-guide/sv/figures @dirrm share/gnome/help/gnome-access-guide/sv @dirrm share/gnome/help/gnome-access-guide/pt/figures @dirrm share/gnome/help/gnome-access-guide/pt +@dirrm share/gnome/help/gnome-access-guide/oc/figures +@dirrm share/gnome/help/gnome-access-guide/oc @dirrm share/gnome/help/gnome-access-guide/it/figures @dirrm share/gnome/help/gnome-access-guide/it @dirrm share/gnome/help/gnome-access-guide/fr/figures @dirrm share/gnome/help/gnome-access-guide/fr +@dirrm share/gnome/help/gnome-access-guide/fi/figures +@dirrm share/gnome/help/gnome-access-guide/fi @dirrm share/gnome/help/gnome-access-guide/es/figures @dirrm share/gnome/help/gnome-access-guide/es @dirrm share/gnome/help/gnome-access-guide/en_GB/figures diff --git a/misc/pciids/Makefile b/misc/pciids/Makefile index f792eb9a1d98..6c6e55027e21 100644 --- a/misc/pciids/Makefile +++ b/misc/pciids/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/misc/pciids/Makefile,v 1.8 2006/10/26 16:14:10 ahze Exp $ +# $MCom: ports/misc/pciids/Makefile,v 1.11 2008/03/23 06:57:57 marcus Exp $ PORTNAME= pciids -PORTVERSION= 20080109 +PORTVERSION= 20080312 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ahze diff --git a/misc/pciids/distinfo b/misc/pciids/distinfo index 406ed754fef8..d142c5f69189 100644 --- a/misc/pciids/distinfo +++ b/misc/pciids/distinfo @@ -1,3 +1,3 @@ -MD5 (pciids-20080109.tar.bz2) = a5ac7d673913770a21b0cb9383cbfe56 -SHA256 (pciids-20080109.tar.bz2) = 22b939f1cde29c38e720221723df1c33faf173d054b4f19cd65cec79715d0d37 -SIZE (pciids-20080109.tar.bz2) = 257226 +MD5 (pciids-20080312.tar.bz2) = 404a4bde5b22a06d34b3bf3c4ffab560 +SHA256 (pciids-20080312.tar.bz2) = 9d50cdd2564802f7b7a414c954055af029101d1672d88e06bfe1f13c4e2e966e +SIZE (pciids-20080312.tar.bz2) = 263363 diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile index 3d16a6dff9bb..4ed1919bb039 100644 --- a/misc/shared-mime-info/Makefile +++ b/misc/shared-mime-info/Makefile @@ -3,11 +3,12 @@ # Whom: olgeni@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/misc/shared-mime-info/Makefile,v 1.11 2007/08/09 19:33:41 marcus Exp $ +# $MCom: ports/misc/shared-mime-info/Makefile,v 1.13 2008/02/01 04:17:52 mezz Exp $ # PORTNAME= shared-mime-info PORTVERSION= 0.23 +PORTREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= http://people.freedesktop.org/~hadess/ @@ -29,7 +30,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install MIMEDIRS= ${LOCALBASE}/share/mime \ ${PREFIX}/share/mime MIMESUBDIRS= application audio image inode message model multipart \ - packages text video + packages text video x-epoc x-content post-patch: @${REINPLACE_CMD} -e 's|%%MIMEDIRS%%|${MIMEDIRS}|g' \ @@ -41,5 +42,6 @@ post-install: @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ s|%%MIMEDIRS%%|${MIMEDIRS}|' \ < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} + @${MKDIR} ${PREFIX}/share/mime/x-content .include <bsd.port.mk> diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c index 045f753d2035..5706a2b89fe3 100644 --- a/misc/shared-mime-info/files/patch-update-mime-database.c +++ b/misc/shared-mime-info/files/patch-update-mime-database.c @@ -1,6 +1,14 @@ ---- update-mime-database.c.orig 2007-06-27 15:46:53.000000000 -0400 -+++ update-mime-database.c 2007-08-09 15:32:31.000000000 -0400 -@@ -445,7 +445,8 @@ static void remove_old(Type *type, xmlNo +--- update-mime-database.c.orig 2007-07-02 04:00:13.000000000 -0500 ++++ update-mime-database.c 2008-01-28 23:42:30.000000000 -0600 +@@ -54,6 +54,7 @@ + "model", + "multipart", + "x-epoc", ++ "x-content", + }; + + /* Represents a MIME type */ +@@ -445,7 +446,8 @@ } } @@ -10,7 +18,7 @@ } /* 'node' is a <mime-type> node from a source file, whose type is 'type'. -@@ -1510,7 +1511,7 @@ static void check_in_path_xdg_data(const +@@ -1510,7 +1512,7 @@ env = getenv("XDG_DATA_DIRS"); if (!env) diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist index 44edec6954b0..8955e3e34c17 100644 --- a/misc/shared-mime-info/pkg-plist +++ b/misc/shared-mime-info/pkg-plist @@ -562,6 +562,8 @@ share/mime/video/x-ogm+ogg.xml share/mime/video/x-sgi-movie.xml share/mime/video/x-theora+ogg.xml share/mime/x-epoc/x-sisx-app.xml +@exec /bin/mkdir -p %D/share/mime/x-content +@dirrmtry share/mime/x-content @dirrmtry share/mime/x-epoc @dirrmtry share/mime/video @dirrmtry share/mime/text diff --git a/multimedia/Makefile b/multimedia/Makefile index 638f5a081671..92a32511163e 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -15,6 +15,7 @@ SUBDIR += bsdbktr_tvtune SUBDIR += camserv SUBDIR += castpodder + SUBDIR += cheese SUBDIR += clive SUBDIR += devede SUBDIR += dirac @@ -78,6 +79,7 @@ SUBDIR += gstreamer-plugins-ugly SUBDIR += gstreamer-plugins-x264 SUBDIR += gstreamer-plugins-xvid + SUBDIR += gstreamermm SUBDIR += gsubedit SUBDIR += gtksubtitler SUBDIR += gxanim @@ -215,11 +217,13 @@ SUBDIR += subtitleoffsetmodifier SUBDIR += subtitleripper SUBDIR += subtools + SUBDIR += swfdec-gnome SUBDIR += tcmplex-panteltje SUBDIR += tivodecode SUBDIR += tkxanim SUBDIR += tosvcd SUBDIR += totem + SUBDIR += totem-pl-parser SUBDIR += totem-xine SUBDIR += tovid SUBDIR += toxine diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile index 3e77335d2027..87663411f5a4 100644 --- a/multimedia/bmpx/Makefile +++ b/multimedia/bmpx/Makefile @@ -7,7 +7,7 @@ PORTNAME= bmpx PORTVERSION= 0.40.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://files.backtrace.info/releases/0.40/ @@ -25,7 +25,7 @@ LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sexymm.2:${PORTSDIR}/x11-toolkits/libsexymm \ ofa.0:${PORTSDIR}/audio/libofa \ - soup-2.2.8:${PORTSDIR}/devel/libsoup + soup-2.2.8:${PORTSDIR}/devel/libsoup22 CONFLICTS= bmpx-devel-[0-9]* diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile new file mode 100644 index 000000000000..f50fa467a6fa --- /dev/null +++ b/multimedia/cheese/Makefile @@ -0,0 +1,46 @@ +# New ports collection makefile for: cheese +# Date created: 13 January 2008 +# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/multimedia/cheese/Makefile,v 1.9 2008/03/10 21:10:13 mezz Exp $ +# + +PORTNAME= cheese +PORTVERSION= 2.22.0 +CATEGORIES= multimedia gnome +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A Photobooth-inspired app for taking pictures and videos from webcam + +USE_XORG= xxf86vm +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnomeprefix gnometarget intlhack evolutiondataserver \ + librsvg2 gnomedocutils +USE_GETTEXT= yes +USE_GSTREAMER= good +INSTALLS_OMF= yes +INSTALLS_ICONS= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +DOCS= AUTHORS COPYING ChangeLog NEWS README +GCONF_SCHEMAS= cheese.schemas + +post-patch: + @${REINPLACE_CMD} -e 's|[$$]GMSGFMT[$$]|$$MSGFMT$$|g' \ + ${WRKSRC}/configure + +.ifndef (NOPORTDOCS) +post-install: + @${MKDIR} ${DOCSDIR} +.for i in ${DOCS} + @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} +.endfor +.endif + +.include <bsd.port.mk> diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo new file mode 100644 index 000000000000..eda11e9f23aa --- /dev/null +++ b/multimedia/cheese/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/cheese-2.22.0.tar.bz2) = 94aa1c9837d011c94e4c44d922cd4ea7 +SHA256 (gnome2/cheese-2.22.0.tar.bz2) = a406feaf742f42c8318a3442a25d6d4a6dc04bcbb6f3c20120417f4b43025223 +SIZE (gnome2/cheese-2.22.0.tar.bz2) = 1520881 diff --git a/multimedia/cheese/pkg-descr b/multimedia/cheese/pkg-descr new file mode 100644 index 000000000000..51402b10aa2e --- /dev/null +++ b/multimedia/cheese/pkg-descr @@ -0,0 +1,5 @@ +Cheese is a Photobooth-inspired GNOME application for taking pictures and +videos from a webcam. It also includes fancy graphical effects based on the +gstreamer-backend. + +WWW: http://www.gnome.org/projects/cheese/ diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist new file mode 100644 index 000000000000..f66210cc2734 --- /dev/null +++ b/multimedia/cheese/pkg-plist @@ -0,0 +1,134 @@ +bin/cheese +libexec/cheese/cheese-bugreport.sh +share/applications/cheese.desktop +%%DATADIR%%/cheese-ui.xml +%%DATADIR%%/cheese.ui +%%DATADIR%%/effects/Hulk.png +%%DATADIR%%/effects/Mauve.png +%%DATADIR%%/effects/NoirBlanc.png +%%DATADIR%%/effects/Saturation.png +%%DATADIR%%/effects/dicetv.png +%%DATADIR%%/effects/edgetv.png +%%DATADIR%%/effects/identity.png +%%DATADIR%%/effects/shagadelictv.png +%%DATADIR%%/effects/vertigotv.png +%%DATADIR%%/effects/videoflip_h.png +%%DATADIR%%/effects/videoflip_v.png +%%DATADIR%%/effects/warptv.png +%%DATADIR%%/pixmaps/camera-icon.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 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +share/gnome/help/cheese/C/cheese.xml +share/gnome/help/cheese/C/figures/cheese-effects-screenshot.jpg +share/gnome/help/cheese/C/figures/cheese-screenshot.jpg +share/gnome/help/cheese/C/legal.xml +share/gnome/help/cheese/es/cheese.xml +share/gnome/help/cheese/es/figures/cheese-effects-screenshot.jpg +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/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/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/icons/hicolor/16x16/apps/cheese.png +share/icons/hicolor/22x22/apps/cheese.png +share/icons/hicolor/24x24/apps/cheese.png +share/icons/hicolor/32x32/apps/cheese.png +share/icons/hicolor/48x48/apps/cheese.png +share/icons/hicolor/scalable/apps/cheese.svg +share/locale/ar/LC_MESSAGES/cheese.mo +share/locale/be@latin/LC_MESSAGES/cheese.mo +share/locale/bn_IN/LC_MESSAGES/cheese.mo +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/el/LC_MESSAGES/cheese.mo +share/locale/en_GB/LC_MESSAGES/cheese.mo +share/locale/es/LC_MESSAGES/cheese.mo +share/locale/et/LC_MESSAGES/cheese.mo +share/locale/eu/LC_MESSAGES/cheese.mo +share/locale/fi/LC_MESSAGES/cheese.mo +share/locale/fr/LC_MESSAGES/cheese.mo +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/hu/LC_MESSAGES/cheese.mo +share/locale/it/LC_MESSAGES/cheese.mo +share/locale/ja/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 +share/locale/ml/LC_MESSAGES/cheese.mo +share/locale/mr/LC_MESSAGES/cheese.mo +share/locale/nb/LC_MESSAGES/cheese.mo +share/locale/nl/LC_MESSAGES/cheese.mo +share/locale/oc/LC_MESSAGES/cheese.mo +share/locale/pa/LC_MESSAGES/cheese.mo +share/locale/pl/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/sv/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 +share/locale/zh_CN/LC_MESSAGES/cheese.mo +share/locale/zh_HK/LC_MESSAGES/cheese.mo +share/locale/zh_TW/LC_MESSAGES/cheese.mo +share/omf/cheese/cheese-C.omf +share/omf/cheese/cheese-es.omf +share/omf/cheese/cheese-fr.omf +share/omf/cheese/cheese-oc.omf +share/omf/cheese/cheese-ru.omf +share/omf/cheese/cheese-sv.omf +@dirrm share/omf/cheese +@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/oc/figures +@dirrm share/gnome/help/cheese/oc +@dirrm share/gnome/help/cheese/fr/figures +@dirrm share/gnome/help/cheese/fr +@dirrm share/gnome/help/cheese/es/figures +@dirrm share/gnome/help/cheese/es +@dirrm share/gnome/help/cheese/C/figures +@dirrm share/gnome/help/cheese/C +@dirrm share/gnome/help/cheese +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/sounds +@dirrm %%DATADIR%%/pixmaps +@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/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 diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile index aeeb5bf4112e..e9451e173993 100644 --- a/multimedia/gstreamer-plugins-bad/Makefile +++ b/multimedia/gstreamer-plugins-bad/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.7 2006/09/14 21:25:16 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.11 2008/03/19 14:05:35 ahze Exp $ # PORTREVISION= 2 @@ -25,8 +25,6 @@ PLIST_SUB= VERSION="${GST_VERSION}" NO_GSTREAMER_COMMON= yes PLIST= ${.CURDIR}/pkg-plist -USE_GL= yes - do-build: .for dir in ${BAD_GST_DIRS} @(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) diff --git a/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files b/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files deleted file mode 100644 index 89a06596412d..000000000000 --- a/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files +++ /dev/null @@ -1,195 +0,0 @@ -diff -urN /dev/null ext/ivorbis/vorbisdec.h ---- /dev/null Wed Dec 31 18:00:00 1969 -+++ ext/ivorbis/vorbisdec.h Thu Jul 5 14:49:17 2007 -@@ -0,0 +1,87 @@ -+/* -*- c-basic-offset: 2 -*- -+ * GStreamer -+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> -+ * -+ * Tremor modifications <2006>: -+ * Chris Lord, OpenedHand Ltd. <chris@openedhand.com>, http://www.o-hand.com/ -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 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 -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+ -+#ifndef __GST_IVORBIS_DEC_H__ -+#define __GST_IVORBIS_DEC_H__ -+ -+ -+#include <gst/gst.h> -+#include <tremor/ivorbiscodec.h> -+ -+G_BEGIN_DECLS -+ -+#define GST_TYPE_IVORBIS_DEC \ -+ (gst_ivorbis_dec_get_type()) -+#define GST_IVORBIS_DEC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IVORBIS_DEC,GstIVorbisDec)) -+#define GST_IVORBIS_DEC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IVORBIS_DEC,GstIVorbisDecClass)) -+#define GST_IS_IVORBIS_DEC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IVORBIS_DEC)) -+#define GST_IS_IVORBIS_DEC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IVORBIS_DEC)) -+ -+typedef struct _GstIVorbisDec GstIVorbisDec; -+typedef struct _GstIVorbisDecClass GstIVorbisDecClass; -+ -+/** -+ * GstIVorbisDec: -+ * -+ * Opaque data structure. -+ */ -+struct _GstIVorbisDec { -+ GstElement element; -+ -+ GstPad * sinkpad; -+ GstPad * srcpad; -+ -+ vorbis_dsp_state vd; -+ vorbis_info vi; -+ vorbis_comment vc; -+ vorbis_block vb; -+ guint64 granulepos; -+ -+ gboolean initialized; -+ -+ GList *queued; -+ -+ GstSegment segment; -+ gboolean discont; -+ -+ GstClockTime cur_timestamp; /* only used with non-ogg container formats */ -+ GstClockTime prev_timestamp; /* only used with non-ogg container formats */ -+ -+ GList *pendingevents; -+ GstTagList *taglist; -+}; -+ -+struct _GstIVorbisDecClass { -+ GstElementClass parent_class; -+}; -+ -+GType gst_ivorbis_dec_get_type(void); -+ -+G_END_DECLS -+ -+#endif /* __GST_IVORBIS_DEC_H__ */ -diff -urN /dev/null ext/ivorbis/vorbisenc.h ---- /dev/null Wed Dec 31 18:00:00 1969 -+++ ext/ivorbis/vorbisenc.h Thu Jul 5 14:49:43 2007 -@@ -0,0 +1,100 @@ -+/* GStreamer -+ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 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 -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+ -+#ifndef __VORBISENC_H__ -+#define __VORBISENC_H__ -+ -+ -+#include <gst/gst.h> -+ -+#include <tremor/ivorbiscodec.h> -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+#define GST_TYPE_VORBISENC \ -+ (vorbisenc_get_type()) -+#define GST_VORBISENC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc)) -+#define GST_VORBISENC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass)) -+#define GST_IS_VORBISENC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC)) -+#define GST_IS_VORBISENC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC)) -+ -+typedef struct _VorbisEnc VorbisEnc; -+typedef struct _VorbisEncClass VorbisEncClass; -+ -+struct _VorbisEnc { -+ GstElement element; -+ -+ GstPad *sinkpad, -+ *srcpad; -+ -+ ogg_stream_state os; /* take physical pages, weld into a logical -+ stream of packets */ -+ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ -+ ogg_packet op; /* one raw packet of data for decode */ -+ -+ vorbis_info vi; /* struct that stores all the static vorbis bitstream -+ settings */ -+ vorbis_comment vc; /* struct that stores all the user comments */ -+ -+ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ -+ vorbis_block vb; /* local working space for packet->PCM decode */ -+ -+ gboolean eos; -+ -+ gboolean managed; -+ gint bitrate; -+ gint min_bitrate; -+ gint max_bitrate; -+ gfloat quality; -+ gboolean quality_set; -+ gint serial; -+ -+ gint channels; -+ gint frequency; -+ -+ guint64 samples_in; -+ guint64 bytes_out; -+ -+ GstCaps *metadata; -+ -+ gboolean setup; -+ gboolean flush_header; -+ gchar *last_message; -+}; -+ -+struct _VorbisEncClass { -+ GstElementClass parent_class; -+}; -+ -+GType vorbisenc_get_type(void); -+ -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+ -+#endif /* __VORBISENC_H__ */ diff --git a/multimedia/gstreamer-plugins-bad/files/patch-ext-spc-gstspc.h b/multimedia/gstreamer-plugins-bad/files/patch-ext-spc-gstspc.h deleted file mode 100644 index 3badde73c573..000000000000 --- a/multimedia/gstreamer-plugins-bad/files/patch-ext-spc-gstspc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/spc/gstspc.h.orig Fri Dec 22 18:28:46 2006 -+++ ext/spc/gstspc.h Fri Dec 22 18:28:15 2006 -@@ -22,7 +22,7 @@ - - #include <gst/gst.h> - --#include <openspc.h> -+#include <OpenSPC.h> - - G_BEGIN_DECLS - diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist index 7c5297596d0c..01f03630769f 100644 --- a/multimedia/gstreamer-plugins-bad/pkg-plist +++ b/multimedia/gstreamer-plugins-bad/pkg-plist @@ -13,18 +13,21 @@ lib/gstreamer-%%VERSION%%/libgstcdxaparse.so lib/gstreamer-%%VERSION%%/libgstdeinterlace.a lib/gstreamer-%%VERSION%%/libgstdeinterlace.la lib/gstreamer-%%VERSION%%/libgstdeinterlace.so -lib/gstreamer-%%VERSION%%/libgstequalizer.a -lib/gstreamer-%%VERSION%%/libgstequalizer.la -lib/gstreamer-%%VERSION%%/libgstequalizer.so +lib/gstreamer-%%VERSION%%/libgstdvdspu.a +lib/gstreamer-%%VERSION%%/libgstdvdspu.la +lib/gstreamer-%%VERSION%%/libgstdvdspu.so +lib/gstreamer-%%VERSION%%/libgstfestival.a +lib/gstreamer-%%VERSION%%/libgstfestival.la +lib/gstreamer-%%VERSION%%/libgstfestival.so lib/gstreamer-%%VERSION%%/libgstfilter.a lib/gstreamer-%%VERSION%%/libgstfilter.la lib/gstreamer-%%VERSION%%/libgstfilter.so +lib/gstreamer-%%VERSION%%/libgstflvdemux.a +lib/gstreamer-%%VERSION%%/libgstflvdemux.la +lib/gstreamer-%%VERSION%%/libgstflvdemux.so lib/gstreamer-%%VERSION%%/libgstfreeze.a lib/gstreamer-%%VERSION%%/libgstfreeze.la lib/gstreamer-%%VERSION%%/libgstfreeze.so -lib/gstreamer-%%VERSION%%/libgstglimagesink.a -lib/gstreamer-%%VERSION%%/libgstglimagesink.la -lib/gstreamer-%%VERSION%%/libgstglimagesink.so lib/gstreamer-%%VERSION%%/libgsth264parse.a lib/gstreamer-%%VERSION%%/libgsth264parse.la lib/gstreamer-%%VERSION%%/libgsth264parse.so @@ -34,12 +37,15 @@ lib/gstreamer-%%VERSION%%/libgstinterleave.so lib/gstreamer-%%VERSION%%/libgstmodplug.a lib/gstreamer-%%VERSION%%/libgstmodplug.la lib/gstreamer-%%VERSION%%/libgstmodplug.so +lib/gstreamer-%%VERSION%%/libgstmpeg4videoparse.a +lib/gstreamer-%%VERSION%%/libgstmpeg4videoparse.la +lib/gstreamer-%%VERSION%%/libgstmpeg4videoparse.so +lib/gstreamer-%%VERSION%%/libgstmpegtsparse.a +lib/gstreamer-%%VERSION%%/libgstmpegtsparse.la +lib/gstreamer-%%VERSION%%/libgstmpegtsparse.so lib/gstreamer-%%VERSION%%/libgstmpegvideoparse.a lib/gstreamer-%%VERSION%%/libgstmpegvideoparse.la lib/gstreamer-%%VERSION%%/libgstmpegvideoparse.so -lib/gstreamer-%%VERSION%%/libgstmultifile.a -lib/gstreamer-%%VERSION%%/libgstmultifile.la -lib/gstreamer-%%VERSION%%/libgstmultifile.so lib/gstreamer-%%VERSION%%/libgstmve.a lib/gstreamer-%%VERSION%%/libgstmve.la lib/gstreamer-%%VERSION%%/libgstmve.so @@ -49,6 +55,9 @@ lib/gstreamer-%%VERSION%%/libgstnsf.so lib/gstreamer-%%VERSION%%/libgstnuvdemux.a lib/gstreamer-%%VERSION%%/libgstnuvdemux.la lib/gstreamer-%%VERSION%%/libgstnuvdemux.so +lib/gstreamer-%%VERSION%%/libgstrawparse.a +lib/gstreamer-%%VERSION%%/libgstrawparse.la +lib/gstreamer-%%VERSION%%/libgstrawparse.so %%I386%%lib/gstreamer-%%VERSION%%/libgstreal.a %%I386%%lib/gstreamer-%%VERSION%%/libgstreal.la %%I386%%lib/gstreamer-%%VERSION%%/libgstreal.so @@ -61,30 +70,30 @@ lib/gstreamer-%%VERSION%%/libgstrfbsrc.so lib/gstreamer-%%VERSION%%/libgstrtpmanager.a lib/gstreamer-%%VERSION%%/libgstrtpmanager.la lib/gstreamer-%%VERSION%%/libgstrtpmanager.so -lib/gstreamer-%%VERSION%%/libgstspectrum.a -lib/gstreamer-%%VERSION%%/libgstspectrum.la -lib/gstreamer-%%VERSION%%/libgstspectrum.so +lib/gstreamer-%%VERSION%%/libgstsdpelem.a +lib/gstreamer-%%VERSION%%/libgstsdpelem.la +lib/gstreamer-%%VERSION%%/libgstsdpelem.so +lib/gstreamer-%%VERSION%%/libgstselector.a +lib/gstreamer-%%VERSION%%/libgstselector.la +lib/gstreamer-%%VERSION%%/libgstselector.so lib/gstreamer-%%VERSION%%/libgstspeed.a lib/gstreamer-%%VERSION%%/libgstspeed.la lib/gstreamer-%%VERSION%%/libgstspeed.so -lib/gstreamer-%%VERSION%%/libgstswitch.a -lib/gstreamer-%%VERSION%%/libgstswitch.la -lib/gstreamer-%%VERSION%%/libgstswitch.so +lib/gstreamer-%%VERSION%%/libgstspeexresample.a +lib/gstreamer-%%VERSION%%/libgstspeexresample.la +lib/gstreamer-%%VERSION%%/libgstspeexresample.so +lib/gstreamer-%%VERSION%%/libgststereo.a +lib/gstreamer-%%VERSION%%/libgststereo.la +lib/gstreamer-%%VERSION%%/libgststereo.so lib/gstreamer-%%VERSION%%/libgsttta.a lib/gstreamer-%%VERSION%%/libgsttta.la lib/gstreamer-%%VERSION%%/libgsttta.so -lib/gstreamer-%%VERSION%%/libgstvideoparse.a -lib/gstreamer-%%VERSION%%/libgstvideoparse.la -lib/gstreamer-%%VERSION%%/libgstvideoparse.so lib/gstreamer-%%VERSION%%/libgstvideosignal.a lib/gstreamer-%%VERSION%%/libgstvideosignal.la lib/gstreamer-%%VERSION%%/libgstvideosignal.so lib/gstreamer-%%VERSION%%/libgstvmnc.a lib/gstreamer-%%VERSION%%/libgstvmnc.la lib/gstreamer-%%VERSION%%/libgstvmnc.so -lib/gstreamer-%%VERSION%%/libgstxingheader.a -lib/gstreamer-%%VERSION%%/libgstxingheader.la -lib/gstreamer-%%VERSION%%/libgstxingheader.so lib/gstreamer-%%VERSION%%/libgsty4menc.a lib/gstreamer-%%VERSION%%/libgsty4menc.la lib/gstreamer-%%VERSION%%/libgsty4menc.so @@ -94,20 +103,27 @@ lib/libgstapp-%%VERSION%%.so lib/libgstapp-%%VERSION%%.so.0 share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/ky/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/or/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo @dirrmtry include/gstreamer-%%VERSION%%/gst/app -@dirrmtry include/gstreamer-%%VERSION%%/gst -@dirrmtry include/gstreamer-%%VERSION%% -@dirrm lib/gstreamer-%%VERSION%% +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky diff --git a/multimedia/gstreamer-plugins-bz2/Makefile b/multimedia/gstreamer-plugins-bz2/Makefile index 1f04b3c4c4b5..10f12f9782ce 100644 --- a/multimedia/gstreamer-plugins-bz2/Makefile +++ b/multimedia/gstreamer-plugins-bz2/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-bz2/Makefile,v 1.2 2006/07/06 19:32:35 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-bz2/Makefile,v 1.6 2008/03/19 14:05:35 ahze Exp $ +# -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer bz2 plugin diff --git a/multimedia/gstreamer-plugins-dts/Makefile b/multimedia/gstreamer-plugins-dts/Makefile index 75012a6e880c..57c2abda7f9a 100644 --- a/multimedia/gstreamer-plugins-dts/Makefile +++ b/multimedia/gstreamer-plugins-dts/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-dts/Makefile,v 1.5 2008/03/19 14:05:36 ahze Exp $ # -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer dts plugin diff --git a/multimedia/gstreamer-plugins-dv/Makefile b/multimedia/gstreamer-plugins-dv/Makefile index e55f4a6cc5bd..4d436592279b 100644 --- a/multimedia/gstreamer-plugins-dv/Makefile +++ b/multimedia/gstreamer-plugins-dv/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-dv/Makefile,v 1.5 2008/03/19 14:05:36 ahze Exp $ # PORTREVISION= 2 diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile index adff7a3134ee..ff6e2fd8094b 100644 --- a/multimedia/gstreamer-plugins-dvd/Makefile +++ b/multimedia/gstreamer-plugins-dvd/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-dvd/Makefile,v 1.7 2008/03/19 14:05:36 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer dvd plugin set diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile index 5947d34bf29d..7b1bf5a45e91 100644 --- a/multimedia/gstreamer-plugins-good/Makefile +++ b/multimedia/gstreamer-plugins-good/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.10 2006/09/14 22:41:06 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-good/Makefile,v 1.14 2008/03/19 14:05:36 ahze Exp $ # -PORTREVISION= 0 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Good gstreamer-plugins diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist index a1b519d512b0..a08ab8bb882e 100644 --- a/multimedia/gstreamer-plugins-good/pkg-plist +++ b/multimedia/gstreamer-plugins-good/pkg-plist @@ -31,6 +31,9 @@ lib/gstreamer-%%VERSION%%/libgstdebug.so lib/gstreamer-%%VERSION%%/libgsteffectv.a lib/gstreamer-%%VERSION%%/libgsteffectv.la lib/gstreamer-%%VERSION%%/libgsteffectv.so +lib/gstreamer-%%VERSION%%/libgstequalizer.a +lib/gstreamer-%%VERSION%%/libgstequalizer.la +lib/gstreamer-%%VERSION%%/libgstequalizer.so lib/gstreamer-%%VERSION%%/libgstflxdec.a lib/gstreamer-%%VERSION%%/libgstflxdec.la lib/gstreamer-%%VERSION%%/libgstflxdec.so @@ -55,6 +58,9 @@ lib/gstreamer-%%VERSION%%/libgstmatroska.so lib/gstreamer-%%VERSION%%/libgstmulaw.a lib/gstreamer-%%VERSION%%/libgstmulaw.la lib/gstreamer-%%VERSION%%/libgstmulaw.so +lib/gstreamer-%%VERSION%%/libgstmultifile.a +lib/gstreamer-%%VERSION%%/libgstmultifile.la +lib/gstreamer-%%VERSION%%/libgstmultifile.so lib/gstreamer-%%VERSION%%/libgstmultipart.a lib/gstreamer-%%VERSION%%/libgstmultipart.la lib/gstreamer-%%VERSION%%/libgstmultipart.so @@ -76,6 +82,9 @@ lib/gstreamer-%%VERSION%%/libgstrtsp.so lib/gstreamer-%%VERSION%%/libgstsmpte.a lib/gstreamer-%%VERSION%%/libgstsmpte.la lib/gstreamer-%%VERSION%%/libgstsmpte.so +lib/gstreamer-%%VERSION%%/libgstspectrum.a +lib/gstreamer-%%VERSION%%/libgstspectrum.la +lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstudp.a lib/gstreamer-%%VERSION%%/libgstudp.la lib/gstreamer-%%VERSION%%/libgstudp.so @@ -105,16 +114,28 @@ lib/gstreamer-%%VERSION%%/libgstximagesrc.la lib/gstreamer-%%VERSION%%/libgstximagesrc.so share/locale/af/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/da/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/eu/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/or/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/zh_HK/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/zh_TW/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK diff --git a/multimedia/gstreamer-plugins-mpeg2dec/Makefile b/multimedia/gstreamer-plugins-mpeg2dec/Makefile index 14f61a5b88d4..a053b34637af 100644 --- a/multimedia/gstreamer-plugins-mpeg2dec/Makefile +++ b/multimedia/gstreamer-plugins-mpeg2dec/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-mpeg2dec/Makefile,v 1.5 2008/03/19 14:05:36 ahze Exp $ # PORTREVISION= 2 diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile index 6a328baccede..3333a6d274ba 100644 --- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile +++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile @@ -3,6 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-mpeg2enc/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $ # PORTREVISION= 2 @@ -12,8 +13,6 @@ COMMENT= Gstreamer mpeg encoder plugin GST_PLUGIN= mpeg2enc -BROKEN= Does not build - MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins .include "${MASTERDIR}/Makefile" diff --git a/multimedia/gstreamer-plugins-theora/Makefile b/multimedia/gstreamer-plugins-theora/Makefile index 86917cce6a64..49999ebc7791 100644 --- a/multimedia/gstreamer-plugins-theora/Makefile +++ b/multimedia/gstreamer-plugins-theora/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-theora/Makefile,v 1.4 2008/03/21 04:01:32 ahze Exp $ # -PORTREVISION= 4 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Gstreamer theora plugin diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile index 06025445ed23..5e3f327029ac 100644 --- a/multimedia/gstreamer-plugins-ugly/Makefile +++ b/multimedia/gstreamer-plugins-ugly/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.8 2006/09/14 21:20:43 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.13 2008/03/19 14:05:37 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= multimedia COMMENT= Ugly gstreamer-plugins diff --git a/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.c b/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.c deleted file mode 100644 index 6c1d5b594cd0..000000000000 --- a/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.c +++ /dev/null @@ -1,733 +0,0 @@ ---- gst/mpegaudioparse/gstmpegaudioparse.c.orig 2007-12-17 00:16:51.000000000 -0500 -+++ gst/mpegaudioparse/gstmpegaudioparse.c 2007-12-17 00:17:13.000000000 -0500 -@@ -29,6 +29,7 @@ - GST_DEBUG_CATEGORY_STATIC (mp3parse_debug); - #define GST_CAT_DEFAULT mp3parse_debug - -+ - /* elementfactory information */ - static GstElementDetails mp3parse_details = { - "MPEG1 Audio Parser", -@@ -71,8 +72,9 @@ enum - - - static void gst_mp3parse_class_init (GstMPEGAudioParseClass * klass); --static void gst_mp3parse_base_init (GstMPEGAudioParseClass * klass); --static void gst_mp3parse_init (GstMPEGAudioParse * mp3parse); -+static void gst_mp3parse_base_init (gpointer klass); -+static void gst_mp3parse_init (GstMPEGAudioParse * mp3parse, -+ GstMPEGAudioParseClass * klass); - - static gboolean gst_mp3parse_sink_event (GstPad * pad, GstEvent * event); - static GstFlowReturn gst_mp3parse_chain (GstPad * pad, GstBuffer * buffer); -@@ -95,35 +97,11 @@ static gboolean mp3parse_bytepos_to_time - static gboolean - mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total); - --static GstElementClass *parent_class = NULL; -- - /*static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; */ - --GType --gst_mp3parse_get_type (void) --{ -- static GType mp3parse_type = 0; -- -- if (!mp3parse_type) { -- static const GTypeInfo mp3parse_info = { -- sizeof (GstMPEGAudioParseClass), -- (GBaseInitFunc) gst_mp3parse_base_init, -- NULL, -- (GClassInitFunc) gst_mp3parse_class_init, -- NULL, -- NULL, -- sizeof (GstMPEGAudioParse), -- 0, -- (GInstanceInitFunc) gst_mp3parse_init, -- }; -+GST_BOILERPLATE (GstMPEGAudioParse, gst_mp3parse, GstElement, GST_TYPE_ELEMENT); - -- mp3parse_type = g_type_register_static (GST_TYPE_ELEMENT, -- "GstMPEGAudioParse", &mp3parse_info, 0); -- } -- return mp3parse_type; --} -- --static guint mp3types_bitrates[2][3][16] = { -+static const guint mp3types_bitrates[2][3][16] = { - { - {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448,}, - {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384,}, -@@ -136,7 +114,7 @@ static guint mp3types_bitrates[2][3][16] - }, - }; - --static guint mp3types_freqs[3][3] = { {44100, 48000, 32000}, -+static const guint mp3types_freqs[3][3] = { {44100, 48000, 32000}, - {22050, 24000, 16000}, - {11025, 12000, 8000} - }; -@@ -218,13 +196,14 @@ mp3_caps_create (guint layer, guint chan - new = gst_caps_new_simple ("audio/mpeg", - "mpegversion", G_TYPE_INT, 1, - "layer", G_TYPE_INT, layer, -- "rate", G_TYPE_INT, samplerate, "channels", G_TYPE_INT, channels, NULL); -+ "rate", G_TYPE_INT, samplerate, -+ "channels", G_TYPE_INT, channels, "parsed", G_TYPE_BOOLEAN, TRUE, NULL); - - return new; - } - - static void --gst_mp3parse_base_init (GstMPEGAudioParseClass * klass) -+gst_mp3parse_base_init (gpointer klass) - { - GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - -@@ -265,8 +244,8 @@ gst_mp3parse_reset (GstMPEGAudioParse * - { - mp3parse->skip = 0; - mp3parse->resyncing = TRUE; -- mp3parse->cur_offset = -1; - mp3parse->next_ts = GST_CLOCK_TIME_NONE; -+ mp3parse->cur_offset = -1; - - mp3parse->tracked_offset = 0; - mp3parse->pending_ts = GST_CLOCK_TIME_NONE; -@@ -276,6 +255,7 @@ gst_mp3parse_reset (GstMPEGAudioParse * - - mp3parse->rate = mp3parse->channels = mp3parse->layer = -1; - mp3parse->version = 1; -+ mp3parse->max_bitreservoir = GST_CLOCK_TIME_NONE; - - mp3parse->avg_bitrate = 0; - mp3parse->bitrate_sum = 0; -@@ -285,21 +265,42 @@ gst_mp3parse_reset (GstMPEGAudioParse * - - mp3parse->xing_flags = 0; - mp3parse->xing_bitrate = 0; -+ -+ if (mp3parse->seek_table) { -+ g_list_foreach (mp3parse->seek_table, (GFunc) g_free, NULL); -+ g_list_free (mp3parse->seek_table); -+ mp3parse->seek_table = NULL; -+ } -+ -+ g_mutex_lock (mp3parse->pending_accurate_seeks_lock); -+ if (mp3parse->pending_accurate_seeks) { -+ g_slist_foreach (mp3parse->pending_accurate_seeks, (GFunc) g_free, NULL); -+ g_slist_free (mp3parse->pending_accurate_seeks); -+ mp3parse->pending_accurate_seeks = NULL; -+ } -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ -+ if (mp3parse->pending_segment) { -+ GstEvent **eventp = &mp3parse->pending_segment; -+ -+ gst_event_replace (eventp, NULL); -+ } -+ -+ mp3parse->exact_position = FALSE; -+ gst_segment_init (&mp3parse->segment, GST_FORMAT_TIME); - } - - static void --gst_mp3parse_init (GstMPEGAudioParse * mp3parse) -+gst_mp3parse_init (GstMPEGAudioParse * mp3parse, GstMPEGAudioParseClass * klass) - { - mp3parse->sinkpad = -- gst_pad_new_from_template (gst_static_pad_template_get -- (&mp3_sink_template), "sink"); -+ gst_pad_new_from_static_template (&mp3_sink_template, "sink"); - gst_pad_set_event_function (mp3parse->sinkpad, gst_mp3parse_sink_event); - gst_pad_set_chain_function (mp3parse->sinkpad, gst_mp3parse_chain); - gst_element_add_pad (GST_ELEMENT (mp3parse), mp3parse->sinkpad); - - mp3parse->srcpad = -- gst_pad_new_from_template (gst_static_pad_template_get -- (&mp3_src_template), "src"); -+ gst_pad_new_from_static_template (&mp3_src_template, "src"); - gst_pad_use_fixed_caps (mp3parse->srcpad); - gst_pad_set_event_function (mp3parse->srcpad, mp3parse_src_event); - gst_pad_set_query_function (mp3parse->srcpad, mp3parse_src_query); -@@ -307,6 +308,7 @@ gst_mp3parse_init (GstMPEGAudioParse * m - gst_element_add_pad (GST_ELEMENT (mp3parse), mp3parse->srcpad); - - mp3parse->adapter = gst_adapter_new (); -+ mp3parse->pending_accurate_seeks_lock = g_mutex_new (); - - gst_mp3parse_reset (mp3parse); - } -@@ -316,10 +318,14 @@ gst_mp3parse_dispose (GObject * object) - { - GstMPEGAudioParse *mp3parse = GST_MP3PARSE (object); - -+ gst_mp3parse_reset (mp3parse); -+ - if (mp3parse->adapter) { - g_object_unref (mp3parse->adapter); - mp3parse->adapter = NULL; - } -+ g_mutex_free (mp3parse->pending_accurate_seeks_lock); -+ mp3parse->pending_accurate_seeks_lock = NULL; - - G_OBJECT_CLASS (parent_class)->dispose (object); - } -@@ -329,6 +335,7 @@ gst_mp3parse_sink_event (GstPad * pad, G - { - gboolean res; - GstMPEGAudioParse *mp3parse; -+ GstEvent **eventp; - - mp3parse = GST_MP3PARSE (gst_pad_get_parent (pad)); - -@@ -343,6 +350,59 @@ gst_mp3parse_sink_event (GstPad * pad, G - gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate, - &format, &start, &stop, &pos); - -+ g_mutex_lock (mp3parse->pending_accurate_seeks_lock); -+ if (format == GST_FORMAT_BYTES && mp3parse->pending_accurate_seeks) { -+ MPEGAudioPendingAccurateSeek *seek = NULL; -+ GSList *node; -+ -+ for (node = mp3parse->pending_accurate_seeks; node; node = node->next) { -+ MPEGAudioPendingAccurateSeek *tmp = node->data; -+ -+ if (tmp->upstream_start == pos) { -+ seek = tmp; -+ break; -+ } -+ } -+ if (seek) { -+ GstSegment *s = &seek->segment; -+ -+ event = -+ gst_event_new_new_segment_full (FALSE, s->rate, s->applied_rate, -+ GST_FORMAT_TIME, s->start, s->stop, s->last_stop); -+ -+ mp3parse->segment = seek->segment; -+ -+ mp3parse->resyncing = FALSE; -+ mp3parse->cur_offset = pos; -+ mp3parse->next_ts = seek->timestamp_start; -+ mp3parse->pending_ts = GST_CLOCK_TIME_NONE; -+ mp3parse->tracked_offset = 0; -+ -+ gst_event_parse_new_segment_full (event, &update, &rate, -+ &applied_rate, &format, &start, &stop, &pos); -+ -+ GST_DEBUG_OBJECT (mp3parse, -+ "Pushing accurate newseg rate %g, applied rate %g, " -+ "format %d, start %lld, stop %lld, pos %lld\n", rate, -+ applied_rate, format, start, stop, pos); -+ -+ g_free (seek); -+ mp3parse->pending_accurate_seeks = -+ g_slist_delete_link (mp3parse->pending_accurate_seeks, node); -+ -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ res = gst_pad_push_event (mp3parse->srcpad, event); -+ -+ return res; -+ } else { -+ GST_WARNING_OBJECT (mp3parse, -+ "Accurate seek not possible, didn't get an appropiate upstream segment"); -+ } -+ } -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ -+ mp3parse->exact_position = FALSE; -+ - if (format == GST_FORMAT_BYTES) { - GstClockTime seg_start, seg_stop, seg_pos; - -@@ -356,8 +416,9 @@ gst_mp3parse_sink_event (GstPad * pad, G - GST_FORMAT_TIME, seg_start, seg_stop, seg_pos); - format = GST_FORMAT_TIME; - GST_DEBUG_OBJECT (mp3parse, "Converted incoming segment to TIME. " -- "start = %" G_GINT64_FORMAT ", stop = %" G_GINT64_FORMAT -- "pos = %" G_GINT64_FORMAT, seg_start, seg_stop, seg_pos); -+ "start = %" GST_TIME_FORMAT ", stop = %" GST_TIME_FORMAT -+ ", pos = %" GST_TIME_FORMAT, GST_TIME_ARGS (seg_start), -+ GST_TIME_ARGS (seg_stop), GST_TIME_ARGS (seg_pos)); - } - } - -@@ -368,6 +429,7 @@ gst_mp3parse_sink_event (GstPad * pad, G - event = gst_event_new_new_segment_full (update, rate, applied_rate, - GST_FORMAT_TIME, 0, GST_CLOCK_TIME_NONE, 0); - } -+ - mp3parse->resyncing = TRUE; - mp3parse->cur_offset = -1; - mp3parse->next_ts = GST_CLOCK_TIME_NONE; -@@ -379,12 +441,23 @@ gst_mp3parse_sink_event (GstPad * pad, G - GST_DEBUG_OBJECT (mp3parse, "Pushing newseg rate %g, applied rate %g, " - "format %d, start %lld, stop %lld, pos %lld\n", - rate, applied_rate, format, start, stop, pos); -- res = gst_pad_push_event (mp3parse->srcpad, event); -+ -+ gst_segment_set_newsegment_full (&mp3parse->segment, update, rate, -+ applied_rate, format, start, stop, pos); -+ -+ /* save the segment for later, right before we push a new buffer so that -+ * the caps are fixed and the next linked element can receive the segment. */ -+ eventp = &mp3parse->pending_segment; -+ gst_event_replace (eventp, event); -+ gst_event_unref (event); -+ res = TRUE; - break; - } - case GST_EVENT_FLUSH_STOP: - /* Clear our adapter and set up for a new position */ - gst_adapter_clear (mp3parse->adapter); -+ eventp = &mp3parse->pending_segment; -+ gst_event_replace (eventp, NULL); - res = gst_pad_push_event (mp3parse->srcpad, event); - break; - default: -@@ -397,14 +470,26 @@ gst_mp3parse_sink_event (GstPad * pad, G - return res; - } - -+static MPEGAudioSeekEntry * -+mp3parse_seek_table_last_entry (GstMPEGAudioParse * mp3parse) -+{ -+ MPEGAudioSeekEntry *ret = NULL; -+ -+ if (mp3parse->seek_table) { -+ ret = mp3parse->seek_table->data; -+ } -+ -+ return ret; -+} -+ - /* Prepare a buffer of the indicated size, timestamp it and output */ - static GstFlowReturn - gst_mp3parse_emit_frame (GstMPEGAudioParse * mp3parse, guint size) - { - GstBuffer *outbuf; - guint bitrate; -- -- GST_DEBUG_OBJECT (mp3parse, "pushing buffer of %d bytes", size); -+ GstFlowReturn ret = GST_FLOW_OK; -+ GstClockTime push_start; - - outbuf = gst_adapter_take_buffer (mp3parse->adapter, size); - -@@ -456,6 +541,22 @@ gst_mp3parse_emit_frame (GstMPEGAudioPar - } - } - -+ if (GST_BUFFER_TIMESTAMP (outbuf) == 0) -+ mp3parse->exact_position = TRUE; -+ -+ if (mp3parse->exact_position && (!mp3parse->seek_table || -+ (mp3parse_seek_table_last_entry (mp3parse))->byte < -+ GST_BUFFER_OFFSET (outbuf))) { -+ MPEGAudioSeekEntry *entry = g_new0 (MPEGAudioSeekEntry, 1); -+ -+ entry->byte = mp3parse->cur_offset; -+ entry->timestamp = GST_BUFFER_TIMESTAMP (outbuf); -+ mp3parse->seek_table = g_list_prepend (mp3parse->seek_table, entry); -+ GST_DEBUG_OBJECT (mp3parse, "Adding index entry %" GST_TIME_FORMAT -+ " @ offset 0x%08" G_GINT64_MODIFIER "x", -+ GST_TIME_ARGS (entry->timestamp), entry->byte); -+ } -+ - /* Update our byte offset tracking */ - if (mp3parse->cur_offset != -1) { - mp3parse->cur_offset += size; -@@ -483,7 +584,53 @@ gst_mp3parse_emit_frame (GstMPEGAudioPar - mp3parse->srcpad, taglist); - } - -- return gst_pad_push (mp3parse->srcpad, outbuf); -+ /* We start pushing 9 frames earlier (29 frames for MPEG2) than -+ * segment start to be able to decode the first frame we want. -+ * 9 (29) frames are the theoretical maximum of frames that contain -+ * data for the current frame (bit reservoir). -+ */ -+ -+ if (mp3parse->segment.start == 0) { -+ push_start = 0; -+ } else if (GST_CLOCK_TIME_IS_VALID (mp3parse->max_bitreservoir)) { -+ if (mp3parse->segment.start > mp3parse->max_bitreservoir) -+ push_start = mp3parse->segment.start - mp3parse->max_bitreservoir; -+ else -+ push_start = 0; -+ } else { -+ push_start = mp3parse->segment.start; -+ } -+ -+ if (G_UNLIKELY ((GST_CLOCK_TIME_IS_VALID (push_start) && -+ GST_BUFFER_TIMESTAMP (outbuf) + GST_BUFFER_DURATION (outbuf) -+ < push_start) -+ || (GST_CLOCK_TIME_IS_VALID (mp3parse->segment.stop) -+ && GST_BUFFER_TIMESTAMP (outbuf) >= mp3parse->segment.stop))) { -+ GST_DEBUG_OBJECT (mp3parse, -+ "Buffer outside of configured segment range %" GST_TIME_FORMAT -+ " to %" GST_TIME_FORMAT ", dropping, timestamp %" -+ GST_TIME_FORMAT ", offset 0x%08" G_GINT64_MODIFIER "x", -+ GST_TIME_ARGS (push_start), GST_TIME_ARGS (mp3parse->segment.stop), -+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), -+ GST_BUFFER_OFFSET (outbuf)); -+ gst_buffer_unref (outbuf); -+ ret = GST_FLOW_OK; -+ } else { -+ GST_DEBUG_OBJECT (mp3parse, -+ "pushing buffer of %d bytes, timestamp %" GST_TIME_FORMAT -+ ", offset 0x%08" G_GINT64_MODIFIER "x", size, -+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), -+ GST_BUFFER_OFFSET (outbuf)); -+ mp3parse->segment.last_stop = GST_BUFFER_TIMESTAMP (outbuf); -+ /* push any pending segment now */ -+ if (mp3parse->pending_segment) { -+ gst_pad_push_event (mp3parse->srcpad, mp3parse->pending_segment); -+ mp3parse->pending_segment = NULL; -+ } -+ ret = gst_pad_push (mp3parse->srcpad, outbuf); -+ } -+ -+ return ret; - } - - #define XING_FRAMES_FLAG 0x0001 -@@ -610,14 +757,41 @@ gst_mp3parse_handle_first_frame (GstMPEG - mp3parse->xing_bytes = 0; - - if (xing_flags & XING_TOC_FLAG) { -- gint i; -+ int i, percent = 0; -+ guchar *table = mp3parse->xing_seek_table; -+ -+ /* xing seek table: percent time -> 1/256 bytepos */ -+ memcpy (mp3parse->xing_seek_table, data, 100); - -- for (i = 0; i < 100; i++) { -- mp3parse->xing_seek_table[i] = data[0]; -- data++; -+ /* build inverse table: 1/256 bytepos -> 1/100 percent time */ -+ for (i = 0; i < 256; i++) { -+ while (percent < 99 && table[percent + 1] <= i) -+ percent++; -+ -+ if (table[percent] == i) { -+ mp3parse->xing_seek_table_inverse[i] = percent * 100; -+ } else if (table[percent] < i && percent < 99) { -+ gdouble fa, fb, fx; -+ gint a = percent, b = percent + 1; -+ -+ fa = table[a]; -+ fb = table[b]; -+ fx = (b - a) / (fb - fa) * (i - fa) + a; -+ mp3parse->xing_seek_table_inverse[i] = (guint16) (fx * 100); -+ } else if (percent == 98 && table[percent + 1] <= i) { -+ gdouble fa, fb, fx; -+ gint a = percent + 1, b = 100; -+ -+ fa = table[a]; -+ fb = 256.0; -+ fx = (b - a) / (fb - fa) * (i - fa) + a; -+ mp3parse->xing_seek_table_inverse[i] = (guint16) (fx * 100); -+ } - } -+ data += 100; - } else { - memset (mp3parse->xing_seek_table, 0, 100); -+ memset (mp3parse->xing_seek_table_inverse, 0, 256); - } - - if (xing_flags & XING_VBR_SCALE_FLAG) { -@@ -777,6 +951,9 @@ gst_mp3parse_chain (GstPad * pad, GstBuf - mp3parse->spf = 1152; - } - -+ mp3parse->max_bitreservoir = gst_util_uint64_scale (GST_SECOND, -+ ((version == 1) ? 10 : 30) * mp3parse->spf, mp3parse->rate); -+ - /* Check the first frame for a Xing header to get our total length */ - if (mp3parse->frame_count == 0) { - /* For the first frame in the file, look for a Xing frame after -@@ -930,6 +1107,45 @@ gst_mp3parse_change_state (GstElement * - return result; - } - -+static gboolean -+mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total) -+{ -+ GstFormat fmt = GST_FORMAT_BYTES; -+ -+ if (gst_pad_query_peer_duration (mp3parse->sinkpad, &fmt, total)) -+ return TRUE; -+ -+ if (mp3parse->xing_flags & XING_BYTES_FLAG) { -+ *total = mp3parse->xing_bytes; -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total) -+{ -+ gint64 total_bytes; -+ -+ *total = GST_CLOCK_TIME_NONE; -+ -+ if (mp3parse->xing_flags & XING_FRAMES_FLAG) { -+ *total = mp3parse->xing_total_time; -+ return TRUE; -+ } -+ -+ /* Calculate time from the measured bitrate */ -+ if (!mp3parse_total_bytes (mp3parse, &total_bytes)) -+ return FALSE; -+ -+ if (total_bytes != -1 -+ && !mp3parse_bytepos_to_time (mp3parse, total_bytes, total)) -+ return FALSE; -+ -+ return TRUE; -+} -+ - /* Convert a timestamp to the file position required to start decoding that - * timestamp. For now, this just uses the avg bitrate. Later, use an - * incrementally accumulated seek table */ -@@ -937,12 +1153,38 @@ static gboolean - mp3parse_time_to_bytepos (GstMPEGAudioParse * mp3parse, GstClockTime ts, - gint64 * bytepos) - { -+ gint64 total_bytes; -+ GstClockTime total_time; -+ - /* -1 always maps to -1 */ - if (ts == -1) { - *bytepos = -1; - return TRUE; - } - -+ /* If XING seek table exists use this for time->byte conversion */ -+ if ((mp3parse->xing_flags & XING_TOC_FLAG) && -+ mp3parse_total_bytes (mp3parse, &total_bytes) && -+ mp3parse_total_time (mp3parse, &total_time)) { -+ gdouble fa, fb, fx; -+ gdouble percent = -+ CLAMP ((100.0 * gst_util_guint64_to_gdouble (ts)) / -+ gst_util_guint64_to_gdouble (total_time), 0.0, 100.0); -+ gint index = CLAMP (percent, 0, 99); -+ -+ fa = mp3parse->xing_seek_table[index]; -+ if (index < 99) -+ fb = mp3parse->xing_seek_table[index + 1]; -+ else -+ fb = 256.0; -+ -+ fx = fa + (fb - fa) * (percent - index); -+ -+ *bytepos = (1.0 / 256.0) * fx * total_bytes; -+ -+ return TRUE; -+ } -+ - if (mp3parse->avg_bitrate == 0) - goto no_bitrate; - -@@ -958,6 +1200,9 @@ static gboolean - mp3parse_bytepos_to_time (GstMPEGAudioParse * mp3parse, - gint64 bytepos, GstClockTime * ts) - { -+ gint64 total_bytes; -+ GstClockTime total_time; -+ - if (bytepos == -1) { - *ts = GST_CLOCK_TIME_NONE; - return TRUE; -@@ -968,61 +1213,33 @@ mp3parse_bytepos_to_time (GstMPEGAudioPa - return TRUE; - } - -- /* Cannot convert anything except 0 if we don't have a bitrate yet */ -- if (mp3parse->avg_bitrate == 0) -- return FALSE; -- -- *ts = (GstClockTime) gst_util_uint64_scale (GST_SECOND, bytepos * 8, -- mp3parse->avg_bitrate); -- return TRUE; --} -- --static gboolean --mp3parse_total_bytes (GstMPEGAudioParse * mp3parse, gint64 * total) --{ -- GstQuery *query; -- GstPad *peer; -- -- if ((peer = gst_pad_get_peer (mp3parse->sinkpad)) != NULL) { -- query = gst_query_new_duration (GST_FORMAT_BYTES); -- gst_query_set_duration (query, GST_FORMAT_BYTES, -1); -- -- if (gst_pad_query (peer, query)) { -- gst_object_unref (peer); -- gst_query_parse_duration (query, NULL, total); -- return TRUE; -- } -- gst_object_unref (peer); -- } -- -- if (mp3parse->xing_flags & XING_BYTES_FLAG) { -- *total = mp3parse->xing_bytes; -- return TRUE; -- } -- -- return FALSE; --} -+ /* If XING seek table exists use this for byte->time conversion */ -+ if ((mp3parse->xing_flags & XING_TOC_FLAG) && -+ mp3parse_total_bytes (mp3parse, &total_bytes) && -+ mp3parse_total_time (mp3parse, &total_time)) { -+ gdouble fa, fb, fx; -+ gdouble pos = CLAMP ((bytepos * 256.0) / total_bytes, 0.0, 256.0); -+ gint index = CLAMP (pos, 0, 255); -+ -+ fa = mp3parse->xing_seek_table_inverse[index]; -+ if (index < 255) -+ fb = mp3parse->xing_seek_table_inverse[index + 1]; -+ else -+ fb = 10000.0; - --static gboolean --mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total) --{ -- gint64 total_bytes; -+ fx = fa + (fb - fa) * (pos - index); - -- *total = GST_CLOCK_TIME_NONE; -+ *ts = (1.0 / 10000.0) * fx * gst_util_guint64_to_gdouble (total_time); - -- if (mp3parse->xing_flags & XING_FRAMES_FLAG) { -- *total = mp3parse->xing_total_time; - return TRUE; - } - -- /* Calculate time from the measured bitrate */ -- if (!mp3parse_total_bytes (mp3parse, &total_bytes)) -- return FALSE; -- -- if (total_bytes != -1 -- && !mp3parse_bytepos_to_time (mp3parse, total_bytes, total)) -+ /* Cannot convert anything except 0 if we don't have a bitrate yet */ -+ if (mp3parse->avg_bitrate == 0) - return FALSE; - -+ *ts = (GstClockTime) gst_util_uint64_scale (GST_SECOND, bytepos * 8, -+ mp3parse->avg_bitrate); - return TRUE; - } - -@@ -1036,11 +1253,12 @@ mp3parse_handle_seek (GstMPEGAudioParse - gint64 cur, stop; - gint64 byte_cur, byte_stop; - -- /* FIXME: Use GstSegment for tracking our position */ -- - gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur, - &stop_type, &stop); - -+ GST_DEBUG_OBJECT (mp3parse, "Performing seek to %" GST_TIME_FORMAT, -+ GST_TIME_ARGS (cur)); -+ - /* For any format other than TIME, see if upstream handles - * it directly or fail. For TIME, try upstream, but do it ourselves if - * it fails upstream */ -@@ -1055,6 +1273,90 @@ mp3parse_handle_seek (GstMPEGAudioParse - - /* Handle TIME based seeks by converting to a BYTE position */ - -+ /* For accurate seeking get the frame 9 (MPEG1) or 29 (MPEG2) frames -+ * before the one we want to seek to and push them all to the decoder. -+ * -+ * This is necessary because of the bit reservoir. See -+ * http://www.mars.org/mailman/public/mad-dev/2002-May/000634.html -+ * -+ */ -+ -+ if (flags & GST_SEEK_FLAG_ACCURATE) { -+ MPEGAudioPendingAccurateSeek *seek = -+ g_new0 (MPEGAudioPendingAccurateSeek, 1); -+ GstClockTime start; -+ -+ seek->segment = mp3parse->segment; -+ -+ gst_segment_set_seek (&seek->segment, rate, GST_FORMAT_TIME, -+ flags, cur_type, cur, stop_type, stop, NULL); -+ -+ if (!mp3parse->seek_table) { -+ byte_cur = 0; -+ byte_stop = -1; -+ start = 0; -+ } else { -+ MPEGAudioSeekEntry *entry = NULL, *start_entry = NULL, *stop_entry = NULL; -+ GList *start_node, *stop_node; -+ -+ for (start_node = mp3parse->seek_table; start_node; -+ start_node = start_node->next) { -+ entry = start_node->data; -+ -+ if (cur - mp3parse->max_bitreservoir >= entry->timestamp) { -+ start_entry = entry; -+ break; -+ } -+ } -+ -+ if (!start_entry) { -+ start_entry = mp3parse->seek_table->data; -+ start = start_entry->timestamp; -+ byte_cur = start_entry->byte; -+ } else { -+ start = start_entry->timestamp; -+ byte_cur = start_entry->byte; -+ } -+ -+ for (stop_node = mp3parse->seek_table; stop_node; -+ stop_node = stop_node->next) { -+ entry = stop_node->data; -+ -+ if (stop >= entry->timestamp) { -+ stop_node = stop_node->prev; -+ stop_entry = (stop_node) ? stop_node->data : NULL; -+ break; -+ } -+ } -+ -+ if (!stop_entry) { -+ byte_stop = -1; -+ } else { -+ byte_stop = stop_entry->byte; -+ } -+ -+ } -+ g_mutex_lock (mp3parse->pending_accurate_seeks_lock); -+ event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, cur_type, -+ byte_cur, stop_type, byte_stop); -+ if (gst_pad_push_event (mp3parse->sinkpad, event)) { -+ mp3parse->exact_position = TRUE; -+ seek->upstream_start = byte_cur; -+ seek->timestamp_start = start; -+ mp3parse->pending_accurate_seeks = -+ g_slist_prepend (mp3parse->pending_accurate_seeks, seek); -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ return TRUE; -+ } else { -+ g_mutex_unlock (mp3parse->pending_accurate_seeks_lock); -+ mp3parse->exact_position = TRUE; -+ g_free (seek); -+ return TRUE; -+ } -+ } -+ -+ mp3parse->exact_position = FALSE; -+ - /* Convert the TIME to the appropriate BYTE position at which to resume - * decoding. */ - if (!mp3parse_time_to_bytepos (mp3parse, (GstClockTime) cur, &byte_cur)) diff --git a/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.h b/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.h deleted file mode 100644 index 38c08d75e6c8..000000000000 --- a/multimedia/gstreamer-plugins-ugly/files/patch-gst_mpegaudioparse_gstmpegaudioparse.h +++ /dev/null @@ -1,62 +0,0 @@ ---- gst/mpegaudioparse/gstmpegaudioparse.h.orig 2007-12-17 00:16:56.000000000 -0500 -+++ gst/mpegaudioparse/gstmpegaudioparse.h 2007-12-17 00:17:15.000000000 -0500 -@@ -40,13 +40,29 @@ G_BEGIN_DECLS - - typedef struct _GstMPEGAudioParse GstMPEGAudioParse; - typedef struct _GstMPEGAudioParseClass GstMPEGAudioParseClass; -+typedef struct _MPEGAudioSeekEntry MPEGAudioSeekEntry; -+typedef struct _MPEGAudioPendingAccurateSeek MPEGAudioPendingAccurateSeek; -+ -+ -+struct _MPEGAudioSeekEntry { -+ gint64 byte; -+ GstClockTime timestamp; -+}; -+ -+struct _MPEGAudioPendingAccurateSeek { -+ GstSegment segment; -+ gint64 upstream_start; -+ GstClockTime timestamp_start; -+}; - - struct _GstMPEGAudioParse { - GstElement element; - - GstPad *sinkpad, *srcpad; - -+ GstSegment segment; - GstClockTime next_ts; -+ - /* Offset as supplied by incoming buffers */ - gint64 cur_offset; - -@@ -62,6 +78,7 @@ struct _GstMPEGAudioParse { - guint skip; /* number of frames to skip */ - guint bit_rate; /* in kbps */ - gint channels, rate, layer, version; -+ GstClockTime max_bitreservoir; - gint spf; /* Samples per frame */ - - gboolean resyncing; /* True when attempting to resync (stricter checks are -@@ -79,9 +96,21 @@ struct _GstMPEGAudioParse { - guint32 xing_frames; - GstClockTime xing_total_time; - guint32 xing_bytes; -+ /* percent -> filepos mapping */ - guchar xing_seek_table[100]; -+ /* filepos -> percent mapping */ -+ guint16 xing_seek_table_inverse[256]; - guint32 xing_vbr_scale; - guint xing_bitrate; -+ -+ /* Accurate seeking */ -+ GList *seek_table; -+ GMutex *pending_accurate_seeks_lock; -+ GSList *pending_accurate_seeks; -+ gboolean exact_position; -+ -+ /* pending segment */ -+ GstEvent *pending_segment; - }; - - struct _GstMPEGAudioParseClass { diff --git a/multimedia/gstreamer-plugins-ugly/pkg-plist b/multimedia/gstreamer-plugins-ugly/pkg-plist index e863d396c202..30cd85adf58b 100644 --- a/multimedia/gstreamer-plugins-ugly/pkg-plist +++ b/multimedia/gstreamer-plugins-ugly/pkg-plist @@ -21,16 +21,35 @@ lib/gstreamer-%%VERSION%%/libgstrmdemux.la lib/gstreamer-%%VERSION%%/libgstrmdemux.so share/locale/af/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/es/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/fi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/or/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/pl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo +@dirrmtry share/local/zh_CN/LC_MESSAGES +@dirrmtry share/local/zh_CN +@dirrmtry share/local/uk/LC_MESSAGES +@dirrmtry share/local/uk +@dirrmtry share/local/sr/LC_MESSAGES +@dirrmtry share/local/sr +@dirrmtry share/local/pl/LC_MESSAGES +@dirrmtry share/local/pl +@dirrmtry share/local/fi/LC_MESSAGES +@dirrmtry share/local/fi +@dirrmtry share/local/cs/LC_MESSAGES +@dirrmtry share/local/cs diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile index a18ea8a366ac..ed588934bd16 100644 --- a/multimedia/gstreamer-plugins-x264/Makefile +++ b/multimedia/gstreamer-plugins-x264/Makefile @@ -3,10 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $ # CATEGORIES= multimedia -PORTREVISION= 0 +PORTREVISION= 2 COMMENT= Gstreamer x264 plugin diff --git a/multimedia/gstreamer-plugins-xvid/Makefile b/multimedia/gstreamer-plugins-xvid/Makefile index c205f8625c93..ad4818a73fa1 100644 --- a/multimedia/gstreamer-plugins-xvid/Makefile +++ b/multimedia/gstreamer-plugins-xvid/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-xvid80/Makefile,v 1.1 2006/01/20 02:56:07 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-xvid/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia COMMENT= Gstreamer xvid plugin diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index b054ca3600c9..2b19734025df 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -3,7 +3,7 @@ # Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/multimedia/gstreamer-plugins/Makefile,v 1.1 2007/12/02 17:08:48 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.111 2008/03/21 04:01:30 ahze Exp $ # PORTNAME= gstreamer @@ -27,20 +27,20 @@ COMMENT?= GStreamer written collection of plugins handling several media types BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS+= gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \ popt.0:${PORTSDIR}/devel/popt \ - oil-0.3.1:${PORTSDIR}/devel/liboil + oil-0.3.0:${PORTSDIR}/devel/liboil CFLAGS:= ${CFLAGS} -O2 -BASE_PORTVERSION= 0.10.15 +BASE_PORTVERSION= 0.10.18 BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION} BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} -BAD_PORTVERSION= 0.10.5 +BAD_PORTVERSION= 0.10.6 BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION} BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX} -GOOD_PORTVERSION= 0.10.6 +GOOD_PORTVERSION= 0.10.7 GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION} GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX} -UGLY_PORTVERSION= 0.10.6 +UGLY_PORTVERSION= 0.10.7 UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION} UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX} DIST?= good @@ -51,7 +51,7 @@ VERSION= ${GST_VERSION} WANT_GSTREAMER= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack +USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack ltasneededhack USE_AUTOTOOLS= libtool:15 GST_PLUGIN?= base diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index 2a6dcb0c9fc7..14937ec39de9 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -1,9 +1,10 @@ # $FreeBSD$ -# $MCom: ports-stable/multimedia/gstreamer-plugins/Makefile.common,v 1.1 2007/12/02 17:08:48 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins/Makefile.common,v 1.68 2008/03/21 04:14:19 ahze Exp $ # base BASE_GST_ALL_PLUGINS= \ alsa \ cdparanoia \ + gio \ gnomevfs \ libvisual \ ogg \ @@ -12,19 +13,21 @@ BASE_GST_ALL_PLUGINS= \ vorbis # bad BAD_GST_ALL_PLUGINS+= \ - alsaspdif \ + alsa \ amrwb \ bz2 \ cdaudio \ directfb \ divx \ dts \ + dvb \ faac \ faad \ gsm \ ivorbis \ jack \ libmms \ + metadata \ mpeg2enc \ musepack \ musicbrainz \ @@ -34,9 +37,11 @@ BAD_GST_ALL_PLUGINS+= \ sdl \ sndfile \ soundtouch \ + soup \ spc \ swfdec \ timidity \ + wildmidi \ x264 \ xvid # ladspa \ @@ -58,6 +63,7 @@ GOOD_GST_ALL_PLUGINS+= \ ladspa \ libcaca \ libpng \ + taglib \ raw1394 \ shout2 \ speex \ @@ -93,6 +99,7 @@ CONFIGURE_ARGS+= --enable-${GST_PLUGIN} CONFIGURE_ARGS+=--disable-tests \ --disable-examples \ + --disable-1394 \ --disable-amrnb \ --disable-alsa \ --disable-http \ @@ -103,6 +110,9 @@ CONFIGURE_ARGS+=--disable-tests \ --enable-oss \ --disable-osx_audio \ --disable-osx_video \ + --disable-directdrawsink \ + --disable-directsoundsink \ + --disable-v4l2src \ --disable-tarkin \ --enable-static \ --disable-sunaudio \ @@ -134,6 +144,7 @@ gst_aalib_PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so \ ${GST_LIB_DIR}/libgstaasink.la # annodex +gst_annodex_LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 # bz2 gst_bz2_DIST= bad @@ -150,6 +161,9 @@ gst_cdparanoia_LIB_DEPENDS+= cdda_interface.0:${PORTSDIR}/audio/cdparanoia gst_cdparanoia_EXTRA_LIBS+= -lgstcdda-${VERSION} gst_cdparanoia_DIST= base +# cdio +gst_cdio_LIB_DEPENDS+= cdio.7:${PORTSDIR}/sysutils/libcdio + # dts gst_dts_LIB_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca gst_dts_PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.a \ @@ -206,6 +220,16 @@ gst_gconf_PLIST_FILES= ${GST_LIB_DIR}/libgstgconfelements.so \ ${GST_LIB_DIR}/libgstgconfelements.a \ ${GST_LIB_DIR}/libgstgconfelements.la +# gdk_pixbuf +gst_gdk_pixbuf_USE_GNOME+= gtk20 +gst_gdk_pixbuf_GST_PLUGIN_DIR= ext/gdk_pixbuf +gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.a \ + ${GST_LIB_DIR}/libgstgdkpixbuf.la \ + ${GST_LIB_DIR}/libgstgdkpixbuf.so +# gio +gst_gio_USE_GNOME+= glib20 +gst_gio_DIST= base + # gnomevfs gst_gnomevfs_USE_GNOME+= gnomevfs2 gst_gnomevfs_CONFIGURE_ARGS+=--enable-gnome_vfs @@ -224,6 +248,7 @@ gst_hal_LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal gst_hal_PLIST_FILES= ${GST_LIB_DIR}/libgsthalelements.a \ ${GST_LIB_DIR}/libgsthalelements.la \ ${GST_LIB_DIR}/libgsthalelements.so + # jack gst_jack_LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack gst_jack_DIST= bad @@ -328,6 +353,18 @@ gst_sidplay_DIST= ugly gst_sndfile_LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile gst_sndfile_DIST= bad +# soundtouch +gst_soundtouch_LIB_DEPENDS+= SoundTouch.0:${PORTSDIR}/audio/soundtouch +gst_soundtouch_DIST= bad + +# souphttpsrc +gst_soup_LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup +gst_soup_GST_PLUGIN_DIR=ext/soup +gst_soup_PLIST_FILES= ${GST_LIB_DIR}/libgstsouphttpsrc.a \ + ${GST_LIB_DIR}/libgstsouphttpsrc.la \ + ${GST_LIB_DIR}/libgstsouphttpsrc.so +gst_soup_DIST= bad + # spc gst_spc_LIB_DEPENDS+= OpenSPC.3:${PORTSDIR}/audio/openspc gst_spc_DIST= bad @@ -338,6 +375,10 @@ gst_speex_LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex # swfdec gst_swfdec_LIB_DEPENDS+=swfdec-0.4.1:${PORTSDIR}/graphics/swfdec gst_swfdec_DIST= bad + +# taglib +gst_taglib_LIB_DEPENDS+= tag.5:${PORTSDIR}audio/taglib + # theora gst_theora_LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora gst_theora_DIST= base diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index f2349f2eb0ea..b2538abda856 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1,12 +1,12 @@ -MD5 (gst-plugins-base-0.10.15.tar.bz2) = 8449359b465074433fec626778bcf36f -SHA256 (gst-plugins-base-0.10.15.tar.bz2) = 143a0fa2c0afffdca6b4707af8cf4cac15b405656272fd1e37db19fdc408fd16 -SIZE (gst-plugins-base-0.10.15.tar.bz2) = 1783866 -MD5 (gst-plugins-bad-0.10.5.tar.bz2) = 395f3ed705928e77e5620cccf11a8cff -SHA256 (gst-plugins-bad-0.10.5.tar.bz2) = 9ac7eb27c9975d4cd24cd3da9b457e69790e4a8cbec75077f0f42fc8b0060eed -SIZE (gst-plugins-bad-0.10.5.tar.bz2) = 1402345 -MD5 (gst-plugins-ugly-0.10.6.tar.bz2) = f1016148ecbfba968c0ef1773066988b -SHA256 (gst-plugins-ugly-0.10.6.tar.bz2) = 9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62 -SIZE (gst-plugins-ugly-0.10.6.tar.bz2) = 773777 -MD5 (gst-plugins-good-0.10.6.tar.bz2) = 25f111360c2930705b91b4fcf93ae5c5 -SHA256 (gst-plugins-good-0.10.6.tar.bz2) = 9e9cd6a5e134c29400b9dc302e523684dca55d0f7f11eb4b06535b24e5032d66 -SIZE (gst-plugins-good-0.10.6.tar.bz2) = 1576121 +MD5 (gst-plugins-base-0.10.18.tar.bz2) = 422e654b049dedef6fdbf4456f2259d1 +SHA256 (gst-plugins-base-0.10.18.tar.bz2) = 72298b2d2ecd989c273f3952d534139b018beb1a4d2ce15c74cbdfe48ed15757 +SIZE (gst-plugins-base-0.10.18.tar.bz2) = 1911898 +MD5 (gst-plugins-bad-0.10.6.tar.bz2) = fb47838aa0ccef52683cea5d89364053 +SHA256 (gst-plugins-bad-0.10.6.tar.bz2) = c702dab34d3b330ec06d915a91a937dadb0a93ace25bbe8e337223ddb834efe6 +SIZE (gst-plugins-bad-0.10.6.tar.bz2) = 1776962 +MD5 (gst-plugins-ugly-0.10.7.tar.bz2) = cff4f55138d12152cf580a3ee71c2519 +SHA256 (gst-plugins-ugly-0.10.7.tar.bz2) = 556ba24072bdb32ee568adc682d69add1241d77936bc9563e50cdb953097be35 +SIZE (gst-plugins-ugly-0.10.7.tar.bz2) = 868172 +MD5 (gst-plugins-good-0.10.7.tar.bz2) = e02d729b22451f75414a27456ae5c16a +SHA256 (gst-plugins-good-0.10.7.tar.bz2) = 9e12c58a794e61c0124b7d239eae731d4ac4863a4fc28147202d3811c3bce39d +SIZE (gst-plugins-good-0.10.7.tar.bz2) = 1746120 diff --git a/multimedia/gstreamer-plugins/files/patch-sys_v4l_gstv4lelement.h b/multimedia/gstreamer-plugins/files/patch-sys_v4l_gstv4lelement.h new file mode 100644 index 000000000000..d2f6ac436908 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_v4l_gstv4lelement.h @@ -0,0 +1,11 @@ +--- sys/v4l/gstv4lelement.h.orig 2008-02-23 15:31:39.000000000 -0500 ++++ sys/v4l/gstv4lelement.h 2008-02-23 15:32:00.000000000 -0500 +@@ -91,6 +91,8 @@ struct _GstV4lElement { + /* X-overlay */ + GstV4lXv *xv; + gulong xwindow_id; ++ ++ gboolean use_read; + }; + + struct _GstV4lElementClass { diff --git a/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c b/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c new file mode 100644 index 000000000000..24088dc9fee4 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c @@ -0,0 +1,261 @@ +--- sys/v4l/v4lsrc_calls.c.orig 2008-03-03 17:29:52.000000000 -0500 ++++ sys/v4l/v4lsrc_calls.c 2008-03-20 23:50:39.000000000 -0400 +@@ -26,12 +26,14 @@ + + #include <stdlib.h> + #include <sys/types.h> ++#include <sys/uio.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <sys/ioctl.h> + #include <sys/mman.h> + #include <string.h> + #include <errno.h> ++#include <unistd.h> + #include "v4lsrc_calls.h" + #include <sys/time.h> + +@@ -87,6 +89,51 @@ + return FALSE; + } + ++ if (GST_V4LELEMENT (v4lsrc)->use_read) { ++ struct video_picture vp; ++ struct video_window vw; ++ ++ ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error getting current picture info for frame (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ ++ vp.palette = v4lsrc->mmap.format; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSPICT, &vp) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error setting picture info for frame (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGWIN, &vw) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error getting current window properties for frame (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ ++ vw.width = v4lsrc->mmap.width; ++ vw.height = v4lsrc->mmap.height; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { ++ vw.flags &= (0x3F00 - 1); ++ vw.flags |= 15 << 16; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error setting window properties for frame (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ } ++ ++ ++ if (read(GST_V4LELEMENT (v4lsrc)->video_fd, GST_V4LELEMENT (v4lsrc)->buffer + (1024 * 768 * 3 * num), v4lsrc->mmap.width * v4lsrc->mmap.height * 3/2) < 0) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, WRITE, (NULL), ++ ("Error queueing a buffer (%d): %s", num, g_strerror (errno))); ++ return FALSE; ++ } ++ goto done; ++ } ++ + /* instruct the driver to prepare capture using buffer frame num */ + v4lsrc->mmap.frame = num; + if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, +@@ -95,6 +142,7 @@ + ("Error queueing a buffer (%d): %s", num, g_strerror (errno))); + return FALSE; + } ++done: + + v4lsrc->frame_queue_state[num] = QUEUE_STATE_QUEUED; + v4lsrc->num_queued++; +@@ -117,6 +165,10 @@ + return FALSE; + } + ++ if (GST_V4LELEMENT (v4lsrc)->use_read) { ++ goto done; ++ } ++ + while (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSYNC, &num) < 0) { + /* if the sync() got interrupted, we can retry */ + if (errno != EINTR) { +@@ -126,6 +178,7 @@ + } + GST_DEBUG_OBJECT (v4lsrc, "Sync got interrupted"); + } ++done: + GST_LOG_OBJECT (v4lsrc, "VIOIOCSYNC on frame %d done", num); + + v4lsrc->frame_queue_state[num] = QUEUE_STATE_SYNCED; +@@ -168,13 +221,28 @@ + GST_V4L_CHECK_OPEN (GST_V4LELEMENT (v4lsrc)); + GST_V4L_CHECK_NOT_ACTIVE (GST_V4LELEMENT (v4lsrc)); + ++ GST_V4LELEMENT (v4lsrc)->use_read = FALSE; ++ + /* request the mmap buffer info: + * total size of mmap buffer, number of frames, offsets of frames */ + if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGMBUF, + &(v4lsrc->mbuf)) < 0) { +- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, (NULL), +- ("Error getting buffer information: %s", g_strerror (errno))); +- return FALSE; ++ int i; ++ ++ GST_V4LELEMENT (v4lsrc)->buffer = (guint8 *) g_malloc0 (sizeof (guint8) * 1024 * 768 * 3 * MIN_BUFFERS_QUEUED); ++ GST_V4LELEMENT (v4lsrc)->use_read = TRUE; ++ ++ v4lsrc->frame_queue_state = (gint8 *) g_malloc (sizeof (gint8) * MIN_BUFFERS_QUEUED); ++ ++ v4lsrc->mbuf.frames = MIN_BUFFERS_QUEUED; ++ for (i = 0; i < MIN_BUFFERS_QUEUED; i++) { ++ v4lsrc->mbuf.offsets[i] = (1024 * 768 * 3 * i); ++ } ++ ++ /* lock for the frame_state */ ++ v4lsrc->mutex_queue_state = g_mutex_new (); ++ v4lsrc->cond_queue_state = g_cond_new (); ++ goto done; + } + + if (v4lsrc->mbuf.frames < MIN_BUFFERS_QUEUED) { +@@ -205,6 +273,7 @@ + GST_V4LELEMENT (v4lsrc)->buffer = NULL; + return FALSE; + } ++done: + + return TRUE; + } +@@ -413,10 +482,14 @@ + v4lsrc->frame_queue_state = NULL; + + /* unmap the buffer */ +- if (munmap (GST_V4LELEMENT (v4lsrc)->buffer, v4lsrc->mbuf.size) == -1) { +- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, CLOSE, (NULL), +- ("error munmap'ing capture buffer: %s", g_strerror (errno))); +- return FALSE; ++ if (GST_V4LELEMENT (v4lsrc)->use_read) { ++ g_free (GST_V4LELEMENT (v4lsrc)->buffer); ++ } else { ++ if (munmap (GST_V4LELEMENT (v4lsrc)->buffer, v4lsrc->mbuf.size) == -1) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, CLOSE, (NULL), ++ ("error munmap'ing capture buffer: %s", g_strerror (errno))); ++ return FALSE; ++ } + } + GST_V4LELEMENT (v4lsrc)->buffer = NULL; + +@@ -446,6 +519,7 @@ + /* so, we need a buffer and some more stuff */ + int frame = 0; + guint8 *buffer; ++ gboolean use_read = FALSE; + struct video_mbuf vmbuf; + struct video_mmap vmmap; + +@@ -456,24 +530,72 @@ + + /* let's start by requesting a buffer and mmap()'ing it */ + if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGMBUF, &vmbuf) < 0) { +- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, READ, (NULL), +- ("Error getting buffer information: %s", g_strerror (errno))); +- return FALSE; +- } +- /* Map the buffers */ +- buffer = mmap (NULL, vmbuf.size, PROT_READ | PROT_WRITE, +- MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); +- if (buffer == MAP_FAILED) { +- GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), +- ("Error mapping our try-out buffer: %s", g_strerror (errno))); +- return FALSE; +- } ++ buffer = (gint8 *) g_malloc0 (sizeof (gint8) * 1024 * 768 * 3); ++ use_read = TRUE; ++ } else { ++ /* Map the buffers */ ++ buffer = mmap (0, vmbuf.size, PROT_READ | PROT_WRITE, ++ MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); ++ if (buffer == MAP_FAILED) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), ++ ("Error mapping our try-out buffer: %s", g_strerror (errno))); ++ return FALSE; ++ } ++ } + + /* now that we have a buffer, let's try out our format */ + vmmap.width = width; + vmmap.height = height; + vmmap.format = palette; + vmmap.frame = frame; ++ if (use_read) { ++ struct video_picture vp; ++ struct video_window vw; ++ ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGWIN, &vw) == -1) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error getting current window properties: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ ++ vw.width = width; ++ vw.height = height; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { ++ vw.flags &= (0x3F00 - 1); ++ vw.flags |= 15 << 16; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSWIN, &vw) == -1) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error setting window properties: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ } ++ ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGPICT, &vp) == -1) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error getting current picture info: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ ++ vp.palette = palette; ++ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSPICT, &vp) == -1) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error setting picture info: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ ++ ++ if (read (GST_V4LELEMENT (v4lsrc)->video_fd, buffer, width * height * 3/2) < 0) { ++ GST_ERROR_OBJECT (v4lsrc, ++ "Error reading into our try-out buffer: %s", g_strerror (errno)); ++ g_free (buffer); ++ return FALSE; ++ } ++ goto done; ++ } + if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCMCAPTURE, &vmmap) < 0) { + if (errno != EINVAL) /* our format failed! */ + GST_ERROR_OBJECT (v4lsrc, +@@ -488,7 +610,11 @@ + return FALSE; + } + +- munmap (buffer, vmbuf.size); ++done: ++ if (use_read) ++ g_free (buffer); ++ else ++ munmap (buffer, vmbuf.size); + + /* if we got here, it worked! woohoo, the format is supported! */ + return TRUE; diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index 9604abee98fb..4d856ec048cc 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -34,6 +34,7 @@ include/gstreamer-%%VERSION%%/gst/netbuffer/gstnetbuffer.h include/gstreamer-%%VERSION%%/gst/pbutils/descriptions.h include/gstreamer-%%VERSION%%/gst/pbutils/install-plugins.h include/gstreamer-%%VERSION%%/gst/pbutils/missing-plugins.h +include/gstreamer-%%VERSION%%/gst/pbutils/pbutils-enumtypes.h include/gstreamer-%%VERSION%%/gst/pbutils/pbutils.h include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h include/gstreamer-%%VERSION%%/gst/riff/riff-media.h @@ -102,9 +103,6 @@ lib/gstreamer-%%VERSION%%/libgsttcp.so lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.a lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.la lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so -lib/gstreamer-%%VERSION%%/libgsturidecodebin.a -lib/gstreamer-%%VERSION%%/libgsturidecodebin.la -lib/gstreamer-%%VERSION%%/libgsturidecodebin.so lib/gstreamer-%%VERSION%%/libgstvideo4linux.a lib/gstreamer-%%VERSION%%/libgstvideo4linux.la lib/gstreamer-%%VERSION%%/libgstvideo4linux.so @@ -174,10 +172,24 @@ lib/libgstvideo-%%VERSION%%.a lib/libgstvideo-%%VERSION%%.la lib/libgstvideo-%%VERSION%%.so lib/libgstvideo-%%VERSION%%.so.0 +libdata/pkgconfig/gstreamer-audio-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-cdda-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-fft-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-floatcast-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-interfaces-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-netbuffer-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-pbutils-%%VERSION%%.pc libdata/pkgconfig/gstreamer-plugins-base-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-riff-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-rtp-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-rtsp-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc +libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc share/locale/af/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/az/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/ca/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/de/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo @@ -186,10 +198,12 @@ share/locale/es/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/or/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/pl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/sk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sq/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 64969c21a115..f4152e378d9b 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -3,11 +3,11 @@ # Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/multimedia/gstreamer/Makefile,v 1.1 2007/12/02 16:39:58 ahze Exp $ +# $MCom: ports/multimedia/gstreamer/Makefile,v 1.59 2008/03/21 03:53:00 ahze Exp $ # PORTNAME= gstreamer -PORTVERSION= 0.10.15 +PORTVERSION= 0.10.18 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ \ ${MASTER_SITE_LOCAL} @@ -19,12 +19,12 @@ COMMENT= Development framework for creating media applications LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt CFLAGS:= ${CFLAGS} -O2 -USE_XLIB= yes USE_BISON= build +USE_XORG= x11 xv xext videoproto xextproto USE_BZIP2= yes USE_GMAKE= yes WANT_GNOME= yes -USE_GNOME= gnomehack glib20 libxml2 ltverhack +USE_GNOME= gnomehack glib20 libxml2 ltverhack ltasneededhack USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --disable-tests \ @@ -44,4 +44,14 @@ MAN1= gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \ gst-typefind-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1 \ gst-xmllaunch-${GST_VERSION}.1 -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if (exists(${LOCALBASE}/lib/libcheck.a) || defined(WITH_CHECK)) +LIB_DEPENDS+= check.0:${PORTSDIR}/devel/libcheck +PLIST_SUB+= CHECK="" +.else +CONFIGURE_ARGS+=--without-check +PLIST_SUB+= CHECK="@comment " +.endif + +.include <bsd.port.post.mk> diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo index bc1ab4a6dc29..2fc189436e8e 100644 --- a/multimedia/gstreamer/distinfo +++ b/multimedia/gstreamer/distinfo @@ -1,3 +1,3 @@ -MD5 (gstreamer-0.10.15.tar.bz2) = 09f1c4ea025faef88b566fa26ec24ae0 -SHA256 (gstreamer-0.10.15.tar.bz2) = 581bc480fadeace5be05291dae634065e56986d13037fbcee0ba126cb9435abb -SIZE (gstreamer-0.10.15.tar.bz2) = 2158226 +MD5 (gstreamer-0.10.18.tar.bz2) = 3b2f9b2b50f7265bbaac8ea10a8279b8 +SHA256 (gstreamer-0.10.18.tar.bz2) = c07249bb07cf3be4c6c83c0f2cc65f8d9d163777d873d142e84e57645435fb5d +SIZE (gstreamer-0.10.18.tar.bz2) = 2221787 diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist index 95f5d7ef3653..915cc9b2c609 100644 --- a/multimedia/gstreamer/pkg-plist +++ b/multimedia/gstreamer/pkg-plist @@ -16,8 +16,11 @@ include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h include/gstreamer-%%VERSION%%/gst/base/gstbasetransform.h include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h +include/gstreamer-%%VERSION%%/gst/gstpoll.h include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h +%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h +%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h include/gstreamer-%%VERSION%%/gst/controller/gstcontroller.h include/gstreamer-%%VERSION%%/gst/controller/gstcontrolsource.h include/gstreamer-%%VERSION%%/gst/controller/gstinterpolationcontrolsource.h @@ -89,6 +92,10 @@ lib/libgstbase-%%VERSION%%.a lib/libgstbase-%%VERSION%%.la lib/libgstbase-%%VERSION%%.so lib/libgstbase-%%VERSION%%.so.0 +%%CHECK%%lib/libgstcheck-%%VERSION%%.a +%%CHECK%%lib/libgstcheck-%%VERSION%%.la +%%CHECK%%lib/libgstcheck-%%VERSION%%.so +%%CHECK%%lib/libgstcheck-%%VERSION%%.so.0 lib/libgstcontroller-%%VERSION%%.a lib/libgstcontroller-%%VERSION%%.la lib/libgstcontroller-%%VERSION%%.so @@ -107,6 +114,7 @@ lib/libgstreamer-%%VERSION%%.so lib/libgstreamer-%%VERSION%%.so.0 libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc +%%CHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc libdata/pkgconfig/gstreamer-dataprotocol-%%VERSION%%.pc libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc @@ -139,12 +147,13 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw @dirrm lib/gstreamer-%%VERSION%% @dirrm include/gstreamer-%%VERSION%%/gst/net @dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol @dirrm include/gstreamer-%%VERSION%%/gst/controller +%%CHECK%%@dirrm include/gstreamer-%%VERSION%%/gst/check @dirrm include/gstreamer-%%VERSION%%/gst/base @dirrm include/gstreamer-%%VERSION%%/gst @dirrm include/gstreamer-%%VERSION%% +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile new file mode 100644 index 000000000000..2cafd84e220c --- /dev/null +++ b/multimedia/gstreamermm/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: gstreamermm +# Date created: 2008-02-23 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/multimedia/gstreamermm/Makefile,v 1.2 2008/03/15 21:09:37 ahze Exp $ + +PORTNAME= gstreamermm +PORTVERSION= 0.9.4 +PORTREVISION= 1 +CATEGORIES= multimedia +MASTER_SITES= GNOME + +MAINTAINER= multimedia@FreeBSD.org +COMMENT= C++ wrapper library for the multimedia library GStreamer + +LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 + +USE_BZIP2= yes +USE_GSTREAMER= yes +USE_GNOME= pkgconfig gnomeprefix gnomehack +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs +CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags gtkmm-2.4 glibmm-2.4 gstreamer-${GST_VERSION}` -I${WRKSRC}/gstreamer" +USE_LDCONFIG= yes +PLIST_SUB= GST_VERSION="${GST_VERSION}" + +.include <bsd.port.mk> diff --git a/multimedia/gstreamermm/distinfo b/multimedia/gstreamermm/distinfo new file mode 100644 index 000000000000..ee90b6a96d55 --- /dev/null +++ b/multimedia/gstreamermm/distinfo @@ -0,0 +1,3 @@ +MD5 (gstreamermm-0.9.4.tar.bz2) = f0a72d27b1307e4f5aea295d74c8c4a1 +SHA256 (gstreamermm-0.9.4.tar.bz2) = 3320fd1260756a272b870efb1866d3bea7454457826346555f5344a0f0e440df +SIZE (gstreamermm-0.9.4.tar.bz2) = 672971 diff --git a/multimedia/gstreamermm/pkg-descr b/multimedia/gstreamermm/pkg-descr new file mode 100644 index 000000000000..ea4fe6cbe884 --- /dev/null +++ b/multimedia/gstreamermm/pkg-descr @@ -0,0 +1 @@ +C++ wrapper library for the multimedia library GStreamer diff --git a/multimedia/gstreamermm/pkg-plist b/multimedia/gstreamermm/pkg-plist new file mode 100644 index 000000000000..d24d44d61aa9 --- /dev/null +++ b/multimedia/gstreamermm/pkg-plist @@ -0,0 +1,97 @@ +include/gstreamermm-%%GST_VERSION%%/gstreamermm.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/bin.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/buffer.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/bus.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/caps.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/childproxy.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/clock.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/element.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/elementfactory.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/enums.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/error.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/event.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/filter.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/format.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/gst_wrap_init.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/index.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/indexfactory.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/init.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/iterator.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/message.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/miniobject.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/object.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/pad.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/padtemplate.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/parse.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/pipeline.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/plugin.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/pluginfeature.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/bin_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/buffer_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/bus_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/caps_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/childproxy_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/clock_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/element_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/elementfactory_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/enums_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/error_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/event_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/filter_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/format_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/index_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/indexfactory_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/iterator_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/message_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/miniobject_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/object_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pad_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/padtemplate_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/parse_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pipeline_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/plugin_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/pluginfeature_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/query_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/structure_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/systemclock_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/task_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/urihandler_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/value_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/private/xml_p.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/query.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/structure.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/systemclock.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/task.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/urihandler.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/value.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/version.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/wrap.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/wrap_init.h +include/gstreamermm-%%GST_VERSION%%/gstreamermm/xml.h +lib/gstreamermm-%%GST_VERSION%%/include/gstreamermmconfig.h +lib/gstreamermm-%%GST_VERSION%%/proc/m4/convert_gst.m4 +lib/libgstreamermm-%%GST_VERSION%%.la +lib/libgstreamermm-%%GST_VERSION%%.so +lib/libgstreamermm-%%GST_VERSION%%.so.2 +libdata/pkgconfig/gstreamermm-%%GST_VERSION%%.pc +share/doc/gstreamermm-%%GST_VERSION%%/examples/element_link/element_link.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/init/init.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player/main.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player_gtkmm/PlayerWindow.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player_gtkmm/PlayerWindow.h +share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player_gtkmm/main.cc +share/doc/gstreamermm-%%GST_VERSION%%/examples/optiongroup/optiongroup.cc +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/optiongroup +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player_gtkmm +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/ogg_player +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/init +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples/element_link +@dirrm share/doc/gstreamermm-%%GST_VERSION%%/examples +@dirrm share/doc/gstreamermm-%%GST_VERSION%% +@dirrm lib/gstreamermm-%%GST_VERSION%%/proc/m4 +@dirrm lib/gstreamermm-%%GST_VERSION%%/proc +@dirrm lib/gstreamermm-%%GST_VERSION%%/include +@dirrm lib/gstreamermm-%%GST_VERSION%% +@dirrm include/gstreamermm-%%GST_VERSION%%/gstreamermm/private +@dirrm include/gstreamermm-%%GST_VERSION%%/gstreamermm +@dirrm include/gstreamermm-%%GST_VERSION%% diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index f7df28e0b339..926ce3855ab4 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -7,7 +7,7 @@ PORTNAME= lives DISTVERSION= 0.9.8.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://www.xs4all.nl/%7Esalsaman/lives/current/ CENKES DISTNAME= LiVES-${DISTVERSION} @@ -24,7 +24,7 @@ LIB_DEPENDS= Magick.10:${PORTSDIR}/graphics/ImageMagick \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ dv.4:${PORTSDIR}/multimedia/libdv \ matroska.0:${PORTSDIR}/multimedia/libmatroska \ - oil-0.3.1:${PORTSDIR}/devel/liboil \ + oil-0.3.0:${PORTSDIR}/devel/liboil \ mjpegutils-1.9.1:${PORTSDIR}/multimedia/mjpegtools \ x264.50:${PORTSDIR}/multimedia/x264 BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile index 0ac76f6ecf1c..58843ab18ec2 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.13 2006/10/05 19:34:49 mezz Exp $ +# $MCom: ports/multimedia/py-gstreamer/Makefile,v 1.17 2008/03/21 04:06:13 ahze Exp $ # PORTNAME= gstreamer -PORTVERSION= 0.10.8 +PORTVERSION= 0.10.11 +PORTREVISION= 0 CATEGORIES= multimedia python gnome MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -25,11 +26,16 @@ USE_GMAKE= yes USE_GNOME= pygtk2 gnomehack pkgconfig USE_GSTREAMER= yes GNU_CONFIGURE= yes +PLIST_SUB= VERSION="${GST_VERSION}" CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}" post-patch: @${REINPLACE_CMD} -e 's|DLFCN|dl|g' ${WRKSRC}/gst/__init__.py +.for d in audio-controller.py decodebin.py pipeline-tester mixer.py vumeter.py + @${REINPLACE_CMD} -e 's|alsasink|osssink|g' -e 's|alsasrc|osssink|g' \ + ${WRKSRC}/examples/${d} +.endfor post-install: @cd ${PYTHONPREFIX_SITELIBDIR} && ${PYTHON_CMD} -OOOO -c 'import pygst' && \ diff --git a/multimedia/py-gstreamer/distinfo b/multimedia/py-gstreamer/distinfo index 4938257d418b..dc45c066e69c 100644 --- a/multimedia/py-gstreamer/distinfo +++ b/multimedia/py-gstreamer/distinfo @@ -1,3 +1,3 @@ -MD5 (gst-python-0.10.8.tar.bz2) = c9a7a6324104dc84502fc066c4fc4220 -SHA256 (gst-python-0.10.8.tar.bz2) = f1aeb28d27ea4078467125e7eb5ee2b16b08443c9f5f3aa1010d262c37aacc0b -SIZE (gst-python-0.10.8.tar.bz2) = 444134 +MD5 (gst-python-0.10.11.tar.bz2) = 357105974cc0fcdc6eabba446452168a +SHA256 (gst-python-0.10.11.tar.bz2) = 946d12f5daa2268bcf5ea2bcc1d14cca0c58a870405393175274c9bf4f2eb9e7 +SIZE (gst-python-0.10.11.tar.bz2) = 469359 diff --git a/multimedia/py-gstreamer/pkg-plist b/multimedia/py-gstreamer/pkg-plist index e744e5c551a8..617a43e82cad 100644 --- a/multimedia/py-gstreamer/pkg-plist +++ b/multimedia/py-gstreamer/pkg-plist @@ -1,61 +1,64 @@ -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/__init__.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/_gst.la -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/_gst.so -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/__init__.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/discoverer.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/jukebox.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/jukebox.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/jukebox.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/leveller.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/leveller.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/leveller.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/pygobject.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/sources.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/sources.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/sources.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.py -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.pyc -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend/utils.pyo -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/interfaces.la -%%PYTHON_SITELIBDIR%%/gst-0.10/gst/interfaces.so +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/__init__.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/__init__.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/__init__.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/_gst.la +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/_gst.so +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/__init__.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/__init__.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/__init__.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/discoverer.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/discoverer.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/discoverer.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/jukebox.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/jukebox.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/jukebox.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/leveller.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/leveller.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/leveller.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/pygobject.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/pygobject.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/pygobject.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/sources.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/sources.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/sources.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/utils.py +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/utils.pyc +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend/utils.pyo +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/interfaces.la +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/interfaces.so +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/pbutils.la +%%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/pbutils.so %%PYTHON_SITELIBDIR%%/pygst.pth %%PYTHON_SITELIBDIR%%/pygst.py %%PYTHON_SITELIBDIR%%/pygst.pyc %%PYTHON_SITELIBDIR%%/pygst.pyo -libdata/pkgconfig/gst-python-0.10.pc -share/gst-python/0.10/defs/base.defs -share/gst-python/0.10/defs/gst-extrafuncs.defs -share/gst-python/0.10/defs/gst-types.defs -share/gst-python/0.10/defs/libs.defs -share/gst-python/0.10/examples/audio-controller.py -share/gst-python/0.10/examples/audioconcat.py -share/gst-python/0.10/examples/bps.py -share/gst-python/0.10/examples/cp.py -share/gst-python/0.10/examples/debugslider.py -share/gst-python/0.10/examples/decodebin.py -share/gst-python/0.10/examples/f2f.py -share/gst-python/0.10/examples/filesrc.py -share/gst-python/0.10/examples/fvumeter.py -share/gst-python/0.10/examples/gst-discover -share/gst-python/0.10/examples/gstfile.py -share/gst-python/0.10/examples/mixer.py -share/gst-python/0.10/examples/pipeline-tester -share/gst-python/0.10/examples/play.py -share/gst-python/0.10/examples/remuxer.py -share/gst-python/0.10/examples/sinkelement.py -share/gst-python/0.10/examples/vumeter.py -@dirrm share/gst-python/0.10/examples -@dirrm share/gst-python/0.10/defs -@dirrm share/gst-python/0.10 +libdata/pkgconfig/gst-python-%%VERSION%%.pc +share/gst-python/%%VERSION%%/defs/base.defs +share/gst-python/%%VERSION%%/defs/gst-extrafuncs.defs +share/gst-python/%%VERSION%%/defs/pbutils.defs +share/gst-python/%%VERSION%%/defs/gst-types.defs +share/gst-python/%%VERSION%%/defs/libs.defs +share/gst-python/%%VERSION%%/examples/audio-controller.py +share/gst-python/%%VERSION%%/examples/audioconcat.py +share/gst-python/%%VERSION%%/examples/bps.py +share/gst-python/%%VERSION%%/examples/cp.py +share/gst-python/%%VERSION%%/examples/debugslider.py +share/gst-python/%%VERSION%%/examples/decodebin.py +share/gst-python/%%VERSION%%/examples/f2f.py +share/gst-python/%%VERSION%%/examples/filesrc.py +share/gst-python/%%VERSION%%/examples/fvumeter.py +share/gst-python/%%VERSION%%/examples/gst-discover +share/gst-python/%%VERSION%%/examples/gstfile.py +share/gst-python/%%VERSION%%/examples/mixer.py +share/gst-python/%%VERSION%%/examples/pipeline-tester +share/gst-python/%%VERSION%%/examples/play.py +share/gst-python/%%VERSION%%/examples/remuxer.py +share/gst-python/%%VERSION%%/examples/sinkelement.py +share/gst-python/%%VERSION%%/examples/vumeter.py +@dirrm share/gst-python/%%VERSION%%/examples +@dirrm share/gst-python/%%VERSION%%/defs +@dirrm share/gst-python/%%VERSION%% @dirrmtry share/gst-python -@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10/gst/extend -@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10/gst -@dirrm %%PYTHON_SITELIBDIR%%/gst-0.10 +@dirrm %%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst/extend +@dirrm %%PYTHON_SITELIBDIR%%/gst-%%VERSION%%/gst +@dirrm %%PYTHON_SITELIBDIR%%/gst-%%VERSION%% diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile new file mode 100644 index 000000000000..0733e5397161 --- /dev/null +++ b/multimedia/swfdec-gnome/Makefile @@ -0,0 +1,34 @@ +# Ports collection makefile for: swfdec-gnome +# Date created: 2008 01 10 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/multimedia/swfdec-gnome/Makefile,v 1.7 2008/03/10 21:53:57 mezz Exp $ +# + +PORTNAME= swfdec-gnome +PORTVERSION= 2.22.0 +CATEGORIES= multimedia +MASTER_SITES= GNOME +DIST_SUBDIR= gnome2 + +MAINTAINER= kwm@FreeBSD.org +COMMENT= Gtk flash player and thumbnailer + +LIB_DEPENDS= swfdec-0.6:${PORTSDIR}/graphics/swfdec + +USE_GNOME= gnomehack gnomeprefix gtk20 intlhack gconf2 +USE_GMAKE= yes +USE_GETTEXT= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= swfdec-thumbnailer.schemas + +MAN1= swfdec-player.1 swfdec-thumbnailer.1 + +post-install: + @-update-desktop-database + +.include <bsd.port.mk> diff --git a/multimedia/swfdec-gnome/distinfo b/multimedia/swfdec-gnome/distinfo new file mode 100644 index 000000000000..fd05b01f3c27 --- /dev/null +++ b/multimedia/swfdec-gnome/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome2/swfdec-gnome-2.22.0.tar.gz) = ce53113d79a7e17e5a9e31ef56daab19 +SHA256 (gnome2/swfdec-gnome-2.22.0.tar.gz) = 6411ebe3c892a594ce5fb895f968e828e30fcb5aa6221fd67dc6250ecfd645b8 +SIZE (gnome2/swfdec-gnome-2.22.0.tar.gz) = 204156 diff --git a/multimedia/swfdec-gnome/pkg-descr b/multimedia/swfdec-gnome/pkg-descr new file mode 100644 index 000000000000..7e094c545d9c --- /dev/null +++ b/multimedia/swfdec-gnome/pkg-descr @@ -0,0 +1,6 @@ +Swfdec is a library for rendering Flash animations and games. It was +originally designed as a basis library for creating Flash plugins for +GStreamer, but it is a fully standalone library which only use the +libart library for drawing. + +WWW: http://www.schleef.org/swfdec/ diff --git a/multimedia/swfdec-gnome/pkg-plist b/multimedia/swfdec-gnome/pkg-plist new file mode 100644 index 000000000000..961d96d21ce8 --- /dev/null +++ b/multimedia/swfdec-gnome/pkg-plist @@ -0,0 +1,56 @@ +bin/swfdec-player +bin/swfdec-thumbnailer +share/applications/swfdec-player.desktop +share/locale/ar/LC_MESSAGES/swfdec-gnome.mo +share/locale/be@latin/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 +share/locale/da/LC_MESSAGES/swfdec-gnome.mo +share/locale/de/LC_MESSAGES/swfdec-gnome.mo +share/locale/el/LC_MESSAGES/swfdec-gnome.mo +share/locale/en_GB/LC_MESSAGES/swfdec-gnome.mo +share/locale/es/LC_MESSAGES/swfdec-gnome.mo +share/locale/et/LC_MESSAGES/swfdec-gnome.mo +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/he/LC_MESSAGES/swfdec-gnome.mo +share/locale/hi/LC_MESSAGES/swfdec-gnome.mo +share/locale/hu/LC_MESSAGES/swfdec-gnome.mo +share/locale/it/LC_MESSAGES/swfdec-gnome.mo +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/mr/LC_MESSAGES/swfdec-gnome.mo +share/locale/nb/LC_MESSAGES/swfdec-gnome.mo +share/locale/nl/LC_MESSAGES/swfdec-gnome.mo +share/locale/pa/LC_MESSAGES/swfdec-gnome.mo +share/locale/pl/LC_MESSAGES/swfdec-gnome.mo +share/locale/pt/LC_MESSAGES/swfdec-gnome.mo +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/sv/LC_MESSAGES/swfdec-gnome.mo +share/locale/ta/LC_MESSAGES/swfdec-gnome.mo +share/locale/th/LC_MESSAGES/swfdec-gnome.mo +share/locale/tr/LC_MESSAGES/swfdec-gnome.mo +share/locale/uk/LC_MESSAGES/swfdec-gnome.mo +share/locale/zh_CN/LC_MESSAGES/swfdec-gnome.mo +share/locale/zh_HK/LC_MESSAGES/swfdec-gnome.mo +share/locale/zh_TW/LC_MESSAGES/swfdec-gnome.mo +%%DATADIR%%/swfdec-player.ui +@dirrm %%DATADIR%% +@dirrmtry share/applications +@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/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 diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile new file mode 100644 index 000000000000..9368540d1cf2 --- /dev/null +++ b/multimedia/totem-pl-parser/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: totem-pl-parser +# Date created: 2007-12-04 +# 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 $ +# + +PORTNAME= totem-pl-parser +PORTVERSION= 2.22.1 +CATEGORIES= multimedia gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GObject-based library to parse a host of playlist formats + +LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnomeprefix gnomevfs2 intlhack evolutiondataserver \ + ltverhack +USE_GETTEXT= yes +USE_LDCONFIG= yes +USE_AUTOTOOLS= libtool:15 +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/multimedia/totem-pl-parser/distinfo b/multimedia/totem-pl-parser/distinfo new file mode 100644 index 000000000000..cd108c84ebb3 --- /dev/null +++ b/multimedia/totem-pl-parser/distinfo @@ -0,0 +1,3 @@ +MD5 (totem-pl-parser-2.22.1.tar.bz2) = 6a43a727205ae0a379e325c50ace0a40 +SHA256 (totem-pl-parser-2.22.1.tar.bz2) = c82c130f1924828afc4a66156383e208ae8e05ef7ccad6cea4c355f2945f8f74 +SIZE (totem-pl-parser-2.22.1.tar.bz2) = 848040 diff --git a/multimedia/totem-pl-parser/files/patch-lib_memmem.c b/multimedia/totem-pl-parser/files/patch-lib_memmem.c new file mode 100644 index 000000000000..8684ae9ceec8 --- /dev/null +++ b/multimedia/totem-pl-parser/files/patch-lib_memmem.c @@ -0,0 +1,14 @@ +--- 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-descr b/multimedia/totem-pl-parser/pkg-descr new file mode 100644 index 000000000000..90b17c4f2c03 --- /dev/null +++ b/multimedia/totem-pl-parser/pkg-descr @@ -0,0 +1 @@ +A simple GObject-based library to parse a host of playlist formats diff --git a/multimedia/totem-pl-parser/pkg-plist b/multimedia/totem-pl-parser/pkg-plist new file mode 100644 index 000000000000..5b430b2837be --- /dev/null +++ b/multimedia/totem-pl-parser/pkg-plist @@ -0,0 +1,134 @@ +include/totem-pl-parser/1/plparser/totem-disc.h +include/totem-pl-parser/1/plparser/totem-pl-parser-builtins.h +include/totem-pl-parser/1/plparser/totem-pl-parser-features.h +include/totem-pl-parser/1/plparser/totem-pl-parser-mini.h +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.a +lib/libtotem-plparser.la +lib/libtotem-plparser.so +lib/libtotem-plparser.so.10 +libdata/pkgconfig/totem-plparser-mini.pc +libdata/pkgconfig/totem-plparser.pc +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/totem-pl-parser-totem-disc.html +%%DOCSDIR%%/totem-pl-parser-totem-pl-parser.html +%%DOCSDIR%%/totem-pl-parser.devhelp +%%DOCSDIR%%/totem-pl-parser.devhelp2 +%%DOCSDIR%%/up.png +share/locale/am/LC_MESSAGES/totem-pl-parser.mo +share/locale/ar/LC_MESSAGES/totem-pl-parser.mo +share/locale/az/LC_MESSAGES/totem-pl-parser.mo +share/locale/be/LC_MESSAGES/totem-pl-parser.mo +share/locale/be@latin/LC_MESSAGES/totem-pl-parser.mo +share/locale/bg/LC_MESSAGES/totem-pl-parser.mo +share/locale/bn/LC_MESSAGES/totem-pl-parser.mo +share/locale/bn_IN/LC_MESSAGES/totem-pl-parser.mo +share/locale/br/LC_MESSAGES/totem-pl-parser.mo +share/locale/ca/LC_MESSAGES/totem-pl-parser.mo +share/locale/cs/LC_MESSAGES/totem-pl-parser.mo +share/locale/cy/LC_MESSAGES/totem-pl-parser.mo +share/locale/da/LC_MESSAGES/totem-pl-parser.mo +share/locale/de/LC_MESSAGES/totem-pl-parser.mo +share/locale/dz/LC_MESSAGES/totem-pl-parser.mo +share/locale/el/LC_MESSAGES/totem-pl-parser.mo +share/locale/en_CA/LC_MESSAGES/totem-pl-parser.mo +share/locale/en_GB/LC_MESSAGES/totem-pl-parser.mo +share/locale/es/LC_MESSAGES/totem-pl-parser.mo +share/locale/et/LC_MESSAGES/totem-pl-parser.mo +share/locale/eu/LC_MESSAGES/totem-pl-parser.mo +share/locale/fa/LC_MESSAGES/totem-pl-parser.mo +share/locale/fi/LC_MESSAGES/totem-pl-parser.mo +share/locale/fr/LC_MESSAGES/totem-pl-parser.mo +share/locale/ga/LC_MESSAGES/totem-pl-parser.mo +share/locale/gl/LC_MESSAGES/totem-pl-parser.mo +share/locale/gu/LC_MESSAGES/totem-pl-parser.mo +share/locale/he/LC_MESSAGES/totem-pl-parser.mo +share/locale/hi/LC_MESSAGES/totem-pl-parser.mo +share/locale/hr/LC_MESSAGES/totem-pl-parser.mo +share/locale/hu/LC_MESSAGES/totem-pl-parser.mo +share/locale/id/LC_MESSAGES/totem-pl-parser.mo +share/locale/is/LC_MESSAGES/totem-pl-parser.mo +share/locale/it/LC_MESSAGES/totem-pl-parser.mo +share/locale/ja/LC_MESSAGES/totem-pl-parser.mo +share/locale/ka/LC_MESSAGES/totem-pl-parser.mo +share/locale/ko/LC_MESSAGES/totem-pl-parser.mo +share/locale/ku/LC_MESSAGES/totem-pl-parser.mo +share/locale/lt/LC_MESSAGES/totem-pl-parser.mo +share/locale/lv/LC_MESSAGES/totem-pl-parser.mo +share/locale/mg/LC_MESSAGES/totem-pl-parser.mo +share/locale/mk/LC_MESSAGES/totem-pl-parser.mo +share/locale/ml/LC_MESSAGES/totem-pl-parser.mo +share/locale/mr/LC_MESSAGES/totem-pl-parser.mo +share/locale/ms/LC_MESSAGES/totem-pl-parser.mo +share/locale/nb/LC_MESSAGES/totem-pl-parser.mo +share/locale/ne/LC_MESSAGES/totem-pl-parser.mo +share/locale/nl/LC_MESSAGES/totem-pl-parser.mo +share/locale/nn/LC_MESSAGES/totem-pl-parser.mo +share/locale/oc/LC_MESSAGES/totem-pl-parser.mo +share/locale/or/LC_MESSAGES/totem-pl-parser.mo +share/locale/pa/LC_MESSAGES/totem-pl-parser.mo +share/locale/pl/LC_MESSAGES/totem-pl-parser.mo +share/locale/pt/LC_MESSAGES/totem-pl-parser.mo +share/locale/pt_BR/LC_MESSAGES/totem-pl-parser.mo +share/locale/ro/LC_MESSAGES/totem-pl-parser.mo +share/locale/ru/LC_MESSAGES/totem-pl-parser.mo +share/locale/rw/LC_MESSAGES/totem-pl-parser.mo +share/locale/si/LC_MESSAGES/totem-pl-parser.mo +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/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 +share/locale/th/LC_MESSAGES/totem-pl-parser.mo +share/locale/tr/LC_MESSAGES/totem-pl-parser.mo +share/locale/ug/LC_MESSAGES/totem-pl-parser.mo +share/locale/uk/LC_MESSAGES/totem-pl-parser.mo +share/locale/vi/LC_MESSAGES/totem-pl-parser.mo +share/locale/wa/LC_MESSAGES/totem-pl-parser.mo +share/locale/xh/LC_MESSAGES/totem-pl-parser.mo +share/locale/zh_CN/LC_MESSAGES/totem-pl-parser.mo +share/locale/zh_HK/LC_MESSAGES/totem-pl-parser.mo +share/locale/zh_TW/LC_MESSAGES/totem-pl-parser.mo +@dirrm %%DOCSDIR%% +@dirrm include/totem-pl-parser/1/plparser +@dirrm include/totem-pl-parser/1 +@dirrm include/totem-pl-parser +@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/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@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/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 diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index b9e298cac084..8cecbf0f9cb7 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -3,12 +3,12 @@ # Whom: Hendrik Scholz <hendrik@scholz.net> # # $FreeBSD$ -# $MCom: ports/multimedia/totem/Makefile,v 1.89 2007/10/17 17:22:32 mezz Exp $ +# $MCom: ports/multimedia/totem/Makefile,v 1.102 2008/03/16 06:11:13 mezz Exp $ # PORTNAME= totem -PORTVERSION= 2.20.3 -PORTREVISION?= 0 +PORTVERSION= 2.22.0 +PORTREVISION?= 1 CATEGORIES= multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,14 +18,15 @@ 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 \ - hal.1:${PORTSDIR}/sysutils/hal -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes + totem-plparser.10:${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 USE_BZIP2= yes USE_GETTEXT= yes USE_XLIB= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \ - nautiluscdburner ltverhack gnomecontrolcenter2 +USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils \ + nautiluscdburner ltverhack pygtk2 GNOME_DESKTOP_VERSION=2 WANT_GSTREAMER= yes INSTALLS_ICONS= yes @@ -44,7 +45,8 @@ GCONF_SCHEMAS= totem-handlers.schemas totem-video-thumbnail.schemas \ CONFLICTS?= totem-gstreamer-[0-9]* totem-xine-[0-9]* OPTIONS= LIRC "Enable lirc support" off \ - GALAGO "Enable Galago support" off + GALAGO "Enable Galago support" off \ + GECKO_PLUGINS "Enable install plugins for gecko browser" on TOTEM_PLUGINS= screensaver ontop gromit media-player-keys properties sidebar-test skipto @@ -66,15 +68,15 @@ TOTEM_PLUGINS:= ${TOTEM_PLUGINS} galago PLIST_SUB+= GALAGO="@comment " .endif -.if defined(WITH_MOZILLA_PLUGIN) && ${SLAVE_PORT:L}=="yes" +.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 \ --enable-gmp-plugin \ --enable-complex-plugin \ --enable-narrowspace-plugin -BUILD_WRKSRC= ${WRKSRC}/browser-plugin -INSTALL_WRKSRC= ${WRKSRC}/browser-plugin +PLIST_SUB+= GECKO_PLUGINS="" .else CONFIGURE_ARGS+=--without-mozilla \ --disable-browser-plugins \ @@ -83,6 +85,7 @@ CONFIGURE_ARGS+=--without-mozilla \ --disable-gmp-plugin \ --disable-complex-plugin \ --disable-narrowspace-plugin +PLIST_SUB+= GECKO_PLUGINS="@comment " .endif .if !defined(WITH_TOTEM_XINE) || ${SLAVE_PORT}=="no" @@ -125,7 +128,7 @@ post-patch: post-install: @-update-desktop-database ${MKDIR} ${PREFIX}/share/vala/vapi - ${INSTALL_DATA} ${WRKSRC}/bindings/vala/totem.vala ${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 .include <bsd.port.post.mk> diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo index dd21349ccd2b..8be34337d3d9 100644 --- a/multimedia/totem/distinfo +++ b/multimedia/totem/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/totem-2.20.3.tar.bz2) = 7360e0856042615c7c1c3baf03d50bbf -SHA256 (gnome2/totem-2.20.3.tar.bz2) = 9d51de9549c9913f91c34986f31edf55f7604e2f784e9ceea783f6102b140897 -SIZE (gnome2/totem-2.20.3.tar.bz2) = 2194842 +MD5 (gnome2/totem-2.22.0.tar.bz2) = 21a3f983e762b34db035edbaaba9dd63 +SHA256 (gnome2/totem-2.22.0.tar.bz2) = b0f9dd826089fc976ed4e57723613fb518f84e79c3f7cc7a0814b7254911f351 +SIZE (gnome2/totem-2.22.0.tar.bz2) = 2321288 diff --git a/multimedia/totem/files/patch-browser-plugin_Makefile.in b/multimedia/totem/files/patch-browser-plugin_Makefile.in deleted file mode 100644 index df0d82b25039..000000000000 --- a/multimedia/totem/files/patch-browser-plugin_Makefile.in +++ /dev/null @@ -1,124 +0,0 @@ ---- browser-plugin/Makefile.in.orig 2007-09-16 18:59:35.000000000 -0400 -+++ browser-plugin/Makefile.in 2007-09-16 19:00:59.000000000 -0400 -@@ -69,7 +69,7 @@ - pluginLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES) - am__DEPENDENCIES_1 = --@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = \ - @ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -89,7 +89,7 @@ - $(libtotem_basic_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ - @ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_rpath = -rpath \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(plugindir) --@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -109,7 +109,7 @@ - $(libtotem_complex_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ - @ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_rpath = \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ -rpath $(plugindir) --@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = \ - @ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_GMP_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -133,7 +133,7 @@ - $(libtotem_gmp_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ - @ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_rpath = -rpath \ - @ENABLE_GMP_PLUGIN_TRUE@ $(plugindir) --@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = \ - @ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -153,7 +153,7 @@ - $(libtotem_mully_plugin_la_LDFLAGS) $(LDFLAGS) -o $@ - @ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_rpath = -rpath \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(plugindir) --@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(am__DEPENDENCIES_1) -@@ -198,10 +198,6 @@ - totem_plugin_viewer-totem-plugin-viewer.$(OBJEXT) - totem_plugin_viewer_OBJECTS = $(am_totem_plugin_viewer_OBJECTS) - totem_plugin_viewer_DEPENDENCIES = \ -- $(top_builddir)/src/backend/libbaconvideowidget.la \ -- $(top_builddir)/src/libtotem_player.la \ -- $(top_builddir)/src/plparse/libtotem-plparser.la \ -- $(top_builddir)/lib/libtotemscrsaver.la \ - libtotempluginviewer_helper.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -@@ -381,7 +377,7 @@ - MOZILLA_LIBDIR = @MOZILLA_LIBDIR@ - MOZILLA_NOT_LINKED_CFLAGS = @MOZILLA_NOT_LINKED_CFLAGS@ - MOZILLA_NOT_LINKED_LIBS = @MOZILLA_NOT_LINKED_LIBS@ --MOZILLA_PLUGINDIR = @MOZILLA_PLUGINDIR@ -+MOZILLA_PLUGINDIR = $(libdir)/browser_plugins - MOZILLA_PREFIX = @MOZILLA_PREFIX@ - MOZILLA_XPCOM_CFLAGS = @MOZILLA_XPCOM_CFLAGS@ - MOZILLA_XPIDL = @MOZILLA_XPIDL@ -@@ -599,10 +595,7 @@ - $(AM_CFLAGS) - - totem_plugin_viewer_LDADD = \ -- $(top_builddir)/src/backend/libbaconvideowidget.la \ -- $(top_builddir)/src/libtotem_player.la \ -- $(top_builddir)/src/plparse/libtotem-plparser.la \ -- $(top_builddir)/lib/libtotemscrsaver.la \ -+ -ltotem-plparser \ - libtotempluginviewer_helper.la \ - $(EXTRA_GNOME_LIBS) \ - $(XVIDMODE_LIBS) \ -@@ -654,7 +647,7 @@ - @ENABLE_BASIC_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \ --@ENABLE_BASIC_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_BASIC_PLUGIN_TRUE@ -ltotem-plparser \ - @ENABLE_BASIC_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -715,7 +708,7 @@ - @ENABLE_GMP_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \ --@ENABLE_GMP_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_GMP_PLUGIN_TRUE@ -ltotem-plparser \ - @ENABLE_GMP_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_GMP_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -770,7 +763,7 @@ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \ --@ENABLE_COMPLEX_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_COMPLEX_PLUGIN_TRUE@ -ltotem-plparser - @ENABLE_COMPLEX_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -825,7 +818,7 @@ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \ --@ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_NARROWSPACE_PLUGIN_TRUE@ -ltotem-plparser \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ -@@ -880,7 +873,7 @@ - @ENABLE_MULLY_PLUGIN_TRUE@ $(AM_CXXFLAGS) - - @ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_LIBADD = \ --@ENABLE_MULLY_PLUGIN_TRUE@ $(top_builddir)/src/plparse/libtotem-plparser-mini.la \ -+@ENABLE_MULLY_PLUGIN_TRUE@ -ltotem-plparser \ - @ENABLE_MULLY_PLUGIN_TRUE@ libtotempluginviewer_helper.la \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(DBUS_LIBS) \ - @ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_LIBS) \ diff --git a/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in b/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in new file mode 100644 index 000000000000..238b32c3263a --- /dev/null +++ b/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in @@ -0,0 +1,11 @@ +--- 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_totemPlugin.cpp b/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp deleted file mode 100644 index 9a16349f4b0a..000000000000 --- a/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- browser-plugin/totemPlugin.cpp.orig Mon Aug 14 17:01:14 2006 -+++ browser-plugin/totemPlugin.cpp Mon Aug 14 17:01:24 2006 -@@ -27,6 +27,7 @@ - #include <stdint.h> - #include <unistd.h> - #include <fcntl.h> -+#include <signal.h> - #include <sys/wait.h> - #include <sys/poll.h> - #include <string.h> diff --git a/multimedia/totem/files/patch-browser-plugin_totemPluginGlue.cpp b/multimedia/totem/files/patch-browser-plugin_totemPluginGlue.cpp new file mode 100644 index 000000000000..6e697364da2d --- /dev/null +++ b/multimedia/totem/files/patch-browser-plugin_totemPluginGlue.cpp @@ -0,0 +1,20 @@ +--- browser-plugin/totemPluginGlue.cpp.orig 2008-03-15 18:00:23.000000000 -0500 ++++ browser-plugin/totemPluginGlue.cpp 2008-03-15 18:01:54.000000000 -0500 +@@ -356,7 +356,7 @@ + user_ini_file = g_build_filename (g_get_user_config_dir (), + "totem", + "browser-plugins.ini", +- NULL); ++ (char *)NULL); + if (g_key_file_load_from_file (user, + user_ini_file, + G_KEY_FILE_NONE, +@@ -439,7 +439,7 @@ + /* we want to open libdbus-glib-1.so.2 in such a way + * in such a way that it becomes permanentely resident */ + void *handle; +- handle = dlopen ("libdbus-glib-1.so.2", RTLD_NOW | RTLD_NODELETE); ++ handle = dlopen ("libdbus-glib-1.so.2", RTLD_NOW); + if (!handle) { + fprintf (stderr, "%s\n", dlerror()); + return NPERR_MODULE_LOAD_FAILED_ERROR; diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure deleted file mode 100644 index 1fab81f6ed98..000000000000 --- a/multimedia/totem/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig Fri May 25 00:24:10 2007 -+++ configure Fri May 25 00:24:23 2007 -@@ -22960,7 +22960,7 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS" - - plugin_error_or_ignore() - { -- if test "${error_on_bad_plugin}" == "1" ; then -+ if test "${error_on_bad_plugin}" = "1" ; then - { { echo "$as_me:$LINENO: error: $1" >&5 - echo "$as_me: error: $1" >&2;} - { (exit 1); exit 1; }; } -@@ -22982,7 +22982,7 @@ fi - used_plugins="" - used_plugins2="" - --if test "x${with_plugins}" == "xautodetect" ; then -+if test "x${with_plugins}" = "xautodetect" ; then - # Default to all plugins and just ignore them if they won't compile - with_plugins="all" - error_on_bad_plugin="0" -@@ -23384,7 +23384,7 @@ fi - esac - - # Add the specified plugin -- if test "${add_plugin}" == "1" ; then -+ if test "${add_plugin}" = "1" ; then - used_plugins2="${used_plugins2} ${plugin}" - fi - done diff --git a/multimedia/totem/files/patch-src_totem.c b/multimedia/totem/files/patch-src_totem.c deleted file mode 100644 index da8b5dc31a1e..000000000000 --- a/multimedia/totem/files/patch-src_totem.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/totem.c.orig Sat Oct 21 22:10:07 2006 -+++ src/totem.c Sat Oct 21 22:11:56 2006 -@@ -339,7 +339,11 @@ - - g_object_get (G_OBJECT (totem->bvw), - "mediadev", &device, NULL); -+#if defined (__FreeBSD__) -+ cmd = g_strdup_printf ("cdcontrol -f %s eject", device); -+#else - cmd = g_strdup_printf ("eject %s", device); -+#endif - g_free (device); - - if (g_spawn_command_line_sync (cmd, NULL, NULL, NULL, &err) == FALSE) diff --git a/multimedia/totem/pkg-descr b/multimedia/totem/pkg-descr index 404246e58ab1..3f33f1f5f682 100644 --- a/multimedia/totem/pkg-descr +++ b/multimedia/totem/pkg-descr @@ -2,6 +2,6 @@ Totem is simple movie player for the Gnome 2 desktop based on xine. It features a simple playlist, a full-screen mode, seek and volume controls, as well as a pretty complete keyboard navigation. -WWW: http://www.hadess.net/totem.php3 +WWW: http://www.gnome.org/projects/totem/ -- Hendrik Scholz <hendrik@scholz.net> diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index 4124fd04a080..1d3ca28dc8f0 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -1,17 +1,34 @@ bin/totem +bin/totem-audio-preview bin/totem-video-indexer bin/totem-video-thumbnailer -include/totem/1/plparser/totem-disc.h -include/totem/1/plparser/totem-pl-parser-builtins.h -include/totem/1/plparser/totem-pl-parser-features.h -include/totem/1/plparser/totem-pl-parser.h -lib/libtotem-plparser.a -lib/libtotem-plparser.la -lib/libtotem-plparser.so -lib/libtotem-plparser.so.7 -lib/nautilus/extensions-1.0/libtotem-properties-page.a -lib/nautilus/extensions-1.0/libtotem-properties-page.la -lib/nautilus/extensions-1.0/libtotem-properties-page.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.xpt +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.a +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.la +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.so +%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt +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 %%GALAGO%%lib/totem/plugins/galago/galago.totem-plugin %%GALAGO%%lib/totem/plugins/galago/libtgp.a %%GALAGO%%lib/totem/plugins/galago/libtgp.la @@ -45,7 +62,11 @@ lib/totem/plugins/skipto/libskipto.la lib/totem/plugins/skipto/libskipto.so lib/totem/plugins/skipto/skipto.totem-plugin lib/totem/plugins/skipto/skipto.ui -libdata/pkgconfig/totem-plparser.pc +lib/totem/plugins/totem/__init__.py +lib/totem/plugins/totem/__init__.pyc +lib/totem/plugins/totem/__init__.pyo +%%GECKO_PLUGINS%%libexec/totem-plugin-viewer +libexec/totem/totem-bugreport.py share/applications/totem.desktop share/gnome/help/totem/C/figures/totem_next_button.png share/gnome/help/totem/C/figures/totem_pause_button.png @@ -105,6 +126,15 @@ share/gnome/help/totem/fr/figures/totem_start_window.png share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png share/gnome/help/totem/fr/figures/totem_volume_mute_button.png share/gnome/help/totem/fr/totem.xml +share/gnome/help/totem/it/figures/totem_next_button.png +share/gnome/help/totem/it/figures/totem_pause_button.png +share/gnome/help/totem/it/figures/totem_play_button.png +share/gnome/help/totem/it/figures/totem_previous_button.png +share/gnome/help/totem/it/figures/totem_show_playlist_button.png +share/gnome/help/totem/it/figures/totem_start_window.png +share/gnome/help/totem/it/figures/totem_volume_maximum_button.png +share/gnome/help/totem/it/figures/totem_volume_mute_button.png +share/gnome/help/totem/it/totem.xml share/gnome/help/totem/oc/figures/totem_next_button.png share/gnome/help/totem/oc/figures/totem_pause_button.png share/gnome/help/totem/oc/figures/totem_play_button.png @@ -163,9 +193,11 @@ share/icons/hicolor/16x16/apps/totem.png share/icons/hicolor/22x22/apps/totem.png share/icons/hicolor/24x24/apps/totem.png share/icons/hicolor/32x32/apps/totem.png +share/icons/hicolor/48x48/apps/totem.png share/icons/hicolor/scalable/apps/totem.svg share/locale/am/LC_MESSAGES/totem.mo share/locale/ar/LC_MESSAGES/totem.mo +share/locale/as/LC_MESSAGES/totem.mo share/locale/az/LC_MESSAGES/totem.mo share/locale/be/LC_MESSAGES/totem.mo share/locale/be@latin/LC_MESSAGES/totem.mo @@ -200,6 +232,7 @@ share/locale/is/LC_MESSAGES/totem.mo share/locale/it/LC_MESSAGES/totem.mo share/locale/ja/LC_MESSAGES/totem.mo share/locale/ka/LC_MESSAGES/totem.mo +share/locale/kn/LC_MESSAGES/totem.mo share/locale/ko/LC_MESSAGES/totem.mo share/locale/ku/LC_MESSAGES/totem.mo share/locale/lt/LC_MESSAGES/totem.mo @@ -222,6 +255,7 @@ share/locale/pt_BR/LC_MESSAGES/totem.mo share/locale/ro/LC_MESSAGES/totem.mo share/locale/ru/LC_MESSAGES/totem.mo share/locale/rw/LC_MESSAGES/totem.mo +share/locale/si/LC_MESSAGES/totem.mo share/locale/sk/LC_MESSAGES/totem.mo share/locale/sl/LC_MESSAGES/totem.mo share/locale/sq/LC_MESSAGES/totem.mo @@ -247,6 +281,7 @@ share/omf/totem/totem-de.omf share/omf/totem/totem-en_GB.omf share/omf/totem/totem-es.omf 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-pt_BR.omf @@ -258,16 +293,15 @@ share/omf/totem/totem-uk.omf %%DATADIR%%/filmholes.png %%DATADIR%%/fullscreen.ui %%DATADIR%%/mozilla-viewer.ui -%%DATADIR%%/playlist-ui.xml %%DATADIR%%/playlist.ui %%DATADIR%%/plugins.ui %%DATADIR%%/properties.ui -%%DATADIR%%/totem-ui.xml %%DATADIR%%/totem.ui %%DATADIR%%/totem_logo.png %%DATADIR%%/uri.ui +%%DATADIR%%/video-list.ui share/vala/vapi/totem.deps -share/vala/vapi/totem.vala +share/vala/vapi/totem.vapi @dirrm %%DATADIR%% @dirrm share/omf/totem @dirrm share/gnome/help/totem/uk/figures @@ -282,6 +316,8 @@ share/vala/vapi/totem.vala @dirrm share/gnome/help/totem/pa @dirrm share/gnome/help/totem/oc/figures @dirrm share/gnome/help/totem/oc +@dirrm share/gnome/help/totem/it/figures +@dirrm share/gnome/help/totem/it @dirrm share/gnome/help/totem/fr/figures @dirrm share/gnome/help/totem/fr @dirrm share/gnome/help/totem/es/figures @@ -297,6 +333,8 @@ share/vala/vapi/totem.vala @dirrm share/gnome/help/totem/C/figures @dirrm share/gnome/help/totem/C @dirrm share/gnome/help/totem +@dirrm libexec/totem +@dirrm lib/totem/plugins/totem @dirrm lib/totem/plugins/skipto @dirrm lib/totem/plugins/screensaver @dirrm lib/totem/plugins/properties @@ -307,12 +345,10 @@ share/vala/vapi/totem.vala %%GALAGO%%@dirrm lib/totem/plugins/galago @dirrm lib/totem/plugins @dirrm lib/totem -@dirrmtry lib/browser_plugins -@dirrm include/totem/1/plparser -@dirrm include/totem/1 -@dirrm include/totem +%%GECKO_PLUGINS%%@dirrmtry lib/browser_plugins @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 @@ -321,6 +357,8 @@ share/vala/vapi/totem.vala @dirrmtry share/locale/ug @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 @@ -337,4 +375,5 @@ share/vala/vapi/totem.vala @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/net/Makefile b/net/Makefile index 5680ad3cb650..593cb9069721 100644 --- a/net/Makefile +++ b/net/Makefile @@ -279,6 +279,7 @@ SUBDIR += libevnet SUBDIR += libexosip2 SUBDIR += libgnetwork + SUBDIR += libgweather SUBDIR += libmms SUBDIR += libmxp SUBDIR += libnet diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile index 1df4dffccaf8..3bd79b734dd2 100644 --- a/net/avahi-app/Makefile +++ b/net/avahi-app/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/avahi-app/Makefile,v 1.6 2007/08/26 06:10:14 marcus Exp $ +# $MCom: ports/net/avahi-app/Makefile,v 1.9 2008/03/20 16:07:21 mezz Exp $ # PORTNAME= avahi PORTVERSION= 0.6.22 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net dns MASTER_SITES= http://www.avahi.org/download/ PKGNAMESUFFIX?= -app @@ -113,6 +113,9 @@ avahi-post-patch: s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \ ${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \ ${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in + @${REINPLACE_CMD} -e 's|dbus_connection_disconnect|dbus_connection_close|g' \ + ${WRKSRC}/avahi-client/client.c \ + ${WRKSRC}/avahi-daemon/dbus-protocol.c post-build: avahi-post-build diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index 5463ef66074c..fc2ffbd0db89 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -3,22 +3,19 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/gnome-nettool/Makefile,v 1.40 2007/09/18 14:09:24 ahze Exp $ +# $MCom: ports/net/gnome-nettool/Makefile,v 1.42 2008/03/10 21:33:09 mezz Exp $ # PORTNAME= gnome-nettool -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 PORTEPOCH= 1 CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= gnome-nettool-${PORTVERSION} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME utility that provides network information statistics -USE_XLIB= yes USE_BZIP2= yes USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils USE_GMAKE= yes diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index 60572e77e0f0..6bf5e40c6e7e 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8f16e4207655ccf1e7af679fc0f58bbd -SHA256 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8668dfa5b7d97245ffe5d53630b891d17f22e86c237ca9b8345774b20d745c15 -SIZE (gnome2/gnome-nettool-2.20.0.tar.bz2) = 572137 +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 diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist index 50ceb8333f26..3dceffc9e15f 100644 --- a/net/gnome-nettool/pkg-plist +++ b/net/gnome-nettool/pkg-plist @@ -21,9 +21,11 @@ share/gnome/help/gnome-nettool/uk/gnome-nettool.xml share/gnome/help/gnome-nettool/vi/gnome-nettool.xml share/icons/hicolor/16x16/apps/gnome-nettool.png share/icons/hicolor/22x22/apps/gnome-nettool.png +share/icons/hicolor/24x24/apps/gnome-nettool.png share/icons/hicolor/32x32/apps/gnome-nettool.png share/icons/hicolor/scalable/apps/gnome-nettool.svg share/locale/ar/LC_MESSAGES/gnome-nettool.mo +share/locale/as/LC_MESSAGES/gnome-nettool.mo share/locale/az/LC_MESSAGES/gnome-nettool.mo share/locale/bg/LC_MESSAGES/gnome-nettool.mo share/locale/bn/LC_MESSAGES/gnome-nettool.mo @@ -55,6 +57,7 @@ share/locale/id/LC_MESSAGES/gnome-nettool.mo share/locale/it/LC_MESSAGES/gnome-nettool.mo share/locale/ja/LC_MESSAGES/gnome-nettool.mo share/locale/ka/LC_MESSAGES/gnome-nettool.mo +share/locale/kn/LC_MESSAGES/gnome-nettool.mo share/locale/ko/LC_MESSAGES/gnome-nettool.mo share/locale/ku/LC_MESSAGES/gnome-nettool.mo share/locale/lt/LC_MESSAGES/gnome-nettool.mo @@ -63,10 +66,12 @@ share/locale/mg/LC_MESSAGES/gnome-nettool.mo share/locale/mk/LC_MESSAGES/gnome-nettool.mo share/locale/ml/LC_MESSAGES/gnome-nettool.mo share/locale/mn/LC_MESSAGES/gnome-nettool.mo +share/locale/mr/LC_MESSAGES/gnome-nettool.mo share/locale/ms/LC_MESSAGES/gnome-nettool.mo share/locale/nb/LC_MESSAGES/gnome-nettool.mo share/locale/ne/LC_MESSAGES/gnome-nettool.mo share/locale/nl/LC_MESSAGES/gnome-nettool.mo +share/locale/nn/LC_MESSAGES/gnome-nettool.mo share/locale/oc/LC_MESSAGES/gnome-nettool.mo share/locale/or/LC_MESSAGES/gnome-nettool.mo share/locale/pa/LC_MESSAGES/gnome-nettool.mo @@ -88,6 +93,8 @@ share/locale/te/LC_MESSAGES/gnome-nettool.mo share/locale/th/LC_MESSAGES/gnome-nettool.mo share/locale/tr/LC_MESSAGES/gnome-nettool.mo share/locale/uk/LC_MESSAGES/gnome-nettool.mo +share/locale/uz/LC_MESSAGES/gnome-nettool.mo +share/locale/uz@cyrillic/LC_MESSAGES/gnome-nettool.mo share/locale/vi/LC_MESSAGES/gnome-nettool.mo share/locale/wa/LC_MESSAGES/gnome-nettool.mo share/locale/xh/LC_MESSAGES/gnome-nettool.mo @@ -118,10 +125,13 @@ share/pixmaps/gnome-nettool.png @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/dialogs @dirrm %%DATADIR%% +@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/uz@cyrillic/LC_MESSAGES +@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/si/LC_MESSAGES @@ -130,6 +140,8 @@ share/pixmaps/gnome-nettool.png @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/ku/LC_MESSAGES @@ -138,4 +150,5 @@ share/pixmaps/gnome-nettool.png @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/net/gstreamer-plugins-libmms/Makefile b/net/gstreamer-plugins-libmms/Makefile index 9f3d61ce6b87..432d04d5c0f9 100644 --- a/net/gstreamer-plugins-libmms/Makefile +++ b/net/gstreamer-plugins-libmms/Makefile @@ -3,6 +3,7 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/gstreamer-plugins-libmms/Makefile,v 1.3 2008/03/19 14:05:38 ahze Exp $ # PORTREVISION= 2 diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile new file mode 100644 index 000000000000..15fc44ccff56 --- /dev/null +++ b/net/libgweather/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: libgweather +# Date created: 14th Jan 2008 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/net/libgweather/Makefile,v 1.7 2008/03/11 11:45:48 ahze Exp $ +# + +PORTNAME= libgweather +PORTVERSION= 2.22.0 +CATEGORIES= net gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Library to accessing online weather informations + +USE_GETTEXT= yes +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gnomevfs2 +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +GCONF_SCHEMAS= gweather.schemas + +.include <bsd.port.mk> diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo new file mode 100644 index 000000000000..62580528c851 --- /dev/null +++ b/net/libgweather/distinfo @@ -0,0 +1,3 @@ +MD5 (libgweather-2.22.0.tar.bz2) = f25d3dada7416bf2d5edb5c7fd7ffce0 +SHA256 (libgweather-2.22.0.tar.bz2) = 4532c8f6938b8f878e20a5fd4069ac7ee9153da28561e74162fc112abfd0f411 +SIZE (libgweather-2.22.0.tar.bz2) = 2785765 diff --git a/net/libgweather/pkg-descr b/net/libgweather/pkg-descr new file mode 100644 index 000000000000..99ea830ef287 --- /dev/null +++ b/net/libgweather/pkg-descr @@ -0,0 +1,9 @@ +libgweather is a library to access weather information from online +services for numerous locations. + +libgweather isn't supported in the devel platform, which means OS vendors +won't guarantee the API/ABI long-term, but authors of open source apps +should feel free to use libgweather as users can always recompile against +a new version. + +WWW: http://www.gnome.org/ diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist new file mode 100644 index 000000000000..5ffe9ae7e731 --- /dev/null +++ b/net/libgweather/pkg-plist @@ -0,0 +1,170 @@ +include/libgweather/gweather-gconf.h +include/libgweather/gweather-prefs.h +include/libgweather/weather.h +lib/libgweather.a +lib/libgweather.la +lib/libgweather.so +lib/libgweather.so.0 +libdata/pkgconfig/gweather.pc +%%DATADIR%%/Locations.xml +%%DATADIR%%/locations.dtd +share/locale/am/LC_MESSAGES/libgweather.mo +share/locale/ar/LC_MESSAGES/libgweather.mo +share/locale/as/LC_MESSAGES/libgweather.mo +share/locale/az/LC_MESSAGES/libgweather.mo +share/locale/be/LC_MESSAGES/libgweather.mo +share/locale/be@latin/LC_MESSAGES/libgweather.mo +share/locale/bg/LC_MESSAGES/libgweather.mo +share/locale/bn/LC_MESSAGES/libgweather.mo +share/locale/bn_IN/LC_MESSAGES/libgweather.mo +share/locale/bs/LC_MESSAGES/libgweather.mo +share/locale/ca/LC_MESSAGES/libgweather.mo +share/locale/cs/LC_MESSAGES/libgweather.mo +share/locale/cy/LC_MESSAGES/libgweather.mo +share/locale/da/LC_MESSAGES/libgweather.mo +share/locale/de/LC_MESSAGES/libgweather.mo +share/locale/dz/LC_MESSAGES/libgweather.mo +share/locale/el/LC_MESSAGES/libgweather.mo +share/locale/en_CA/LC_MESSAGES/libgweather.mo +share/locale/en_GB/LC_MESSAGES/libgweather.mo +share/locale/es/LC_MESSAGES/libgweather.mo +share/locale/es_AR/LC_MESSAGES/libgweather.mo +share/locale/es_CL/LC_MESSAGES/libgweather.mo +share/locale/es_CO/LC_MESSAGES/libgweather.mo +share/locale/es_CR/LC_MESSAGES/libgweather.mo +share/locale/es_DO/LC_MESSAGES/libgweather.mo +share/locale/es_EC/LC_MESSAGES/libgweather.mo +share/locale/es_ES/LC_MESSAGES/libgweather.mo +share/locale/es_GT/LC_MESSAGES/libgweather.mo +share/locale/es_HN/LC_MESSAGES/libgweather.mo +share/locale/es_MX/LC_MESSAGES/libgweather.mo +share/locale/es_NI/LC_MESSAGES/libgweather.mo +share/locale/es_PA/LC_MESSAGES/libgweather.mo +share/locale/es_PE/LC_MESSAGES/libgweather.mo +share/locale/es_PR/LC_MESSAGES/libgweather.mo +share/locale/es_SV/LC_MESSAGES/libgweather.mo +share/locale/es_UY/LC_MESSAGES/libgweather.mo +share/locale/es_VE/LC_MESSAGES/libgweather.mo +share/locale/et/LC_MESSAGES/libgweather.mo +share/locale/eu/LC_MESSAGES/libgweather.mo +share/locale/fa/LC_MESSAGES/libgweather.mo +share/locale/fi/LC_MESSAGES/libgweather.mo +share/locale/fr/LC_MESSAGES/libgweather.mo +share/locale/ga/LC_MESSAGES/libgweather.mo +share/locale/gl/LC_MESSAGES/libgweather.mo +share/locale/gu/LC_MESSAGES/libgweather.mo +share/locale/he/LC_MESSAGES/libgweather.mo +share/locale/hi/LC_MESSAGES/libgweather.mo +share/locale/hr/LC_MESSAGES/libgweather.mo +share/locale/hu/LC_MESSAGES/libgweather.mo +share/locale/hy/LC_MESSAGES/libgweather.mo +share/locale/id/LC_MESSAGES/libgweather.mo +share/locale/is/LC_MESSAGES/libgweather.mo +share/locale/it/LC_MESSAGES/libgweather.mo +share/locale/ja/LC_MESSAGES/libgweather.mo +share/locale/ka/LC_MESSAGES/libgweather.mo +share/locale/kn/LC_MESSAGES/libgweather.mo +share/locale/ko/LC_MESSAGES/libgweather.mo +share/locale/ku/LC_MESSAGES/libgweather.mo +share/locale/ky/LC_MESSAGES/libgweather.mo +share/locale/lt/LC_MESSAGES/libgweather.mo +share/locale/lv/LC_MESSAGES/libgweather.mo +share/locale/mg/LC_MESSAGES/libgweather.mo +share/locale/mk/LC_MESSAGES/libgweather.mo +share/locale/ml/LC_MESSAGES/libgweather.mo +share/locale/mn/LC_MESSAGES/libgweather.mo +share/locale/mr/LC_MESSAGES/libgweather.mo +share/locale/ms/LC_MESSAGES/libgweather.mo +share/locale/nb/LC_MESSAGES/libgweather.mo +share/locale/ne/LC_MESSAGES/libgweather.mo +share/locale/nl/LC_MESSAGES/libgweather.mo +share/locale/nn/LC_MESSAGES/libgweather.mo +share/locale/oc/LC_MESSAGES/libgweather.mo +share/locale/or/LC_MESSAGES/libgweather.mo +share/locale/pa/LC_MESSAGES/libgweather.mo +share/locale/pl/LC_MESSAGES/libgweather.mo +share/locale/pt/LC_MESSAGES/libgweather.mo +share/locale/pt_BR/LC_MESSAGES/libgweather.mo +share/locale/ro/LC_MESSAGES/libgweather.mo +share/locale/ru/LC_MESSAGES/libgweather.mo +share/locale/rw/LC_MESSAGES/libgweather.mo +share/locale/si/LC_MESSAGES/libgweather.mo +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/sv/LC_MESSAGES/libgweather.mo +share/locale/ta/LC_MESSAGES/libgweather.mo +share/locale/te/LC_MESSAGES/libgweather.mo +share/locale/th/LC_MESSAGES/libgweather.mo +share/locale/tr/LC_MESSAGES/libgweather.mo +share/locale/uk/LC_MESSAGES/libgweather.mo +share/locale/vi/LC_MESSAGES/libgweather.mo +share/locale/wa/LC_MESSAGES/libgweather.mo +share/locale/xh/LC_MESSAGES/libgweather.mo +share/locale/zh_CN/LC_MESSAGES/libgweather.mo +share/locale/zh_HK/LC_MESSAGES/libgweather.mo +share/locale/zh_TW/LC_MESSAGES/libgweather.mo +@dirrm %%DATADIR%% +@dirrm include/libgweather +@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/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/es_VE/LC_MESSAGES +@dirrmtry share/locale/es_VE +@dirrmtry share/locale/es_UY/LC_MESSAGES +@dirrmtry share/locale/es_UY +@dirrmtry share/locale/es_SV/LC_MESSAGES +@dirrmtry share/locale/es_SV +@dirrmtry share/locale/es_PR/LC_MESSAGES +@dirrmtry share/locale/es_PR +@dirrmtry share/locale/es_PE/LC_MESSAGES +@dirrmtry share/locale/es_PE +@dirrmtry share/locale/es_PA/LC_MESSAGES +@dirrmtry share/locale/es_PA +@dirrmtry share/locale/es_NI/LC_MESSAGES +@dirrmtry share/locale/es_NI +@dirrmtry share/locale/es_HN/LC_MESSAGES +@dirrmtry share/locale/es_HN +@dirrmtry share/locale/es_GT/LC_MESSAGES +@dirrmtry share/locale/es_GT +@dirrmtry share/locale/es_EC/LC_MESSAGES +@dirrmtry share/locale/es_EC +@dirrmtry share/locale/es_DO/LC_MESSAGES +@dirrmtry share/locale/es_DO +@dirrmtry share/locale/es_CR/LC_MESSAGES +@dirrmtry share/locale/es_CR +@dirrmtry share/locale/es_CO/LC_MESSAGES +@dirrmtry share/locale/es_CO +@dirrmtry share/locale/es_CL/LC_MESSAGES +@dirrmtry share/locale/es_CL +@dirrmtry share/locale/es_AR/LC_MESSAGES +@dirrmtry share/locale/es_AR +@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/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile index 5143efce23c4..72d180430026 100644 --- a/net/vinagre/Makefile +++ b/net/vinagre/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/net/vinagre/Makefile,v 1.5 2008/03/10 15:15:00 ahze Exp $ # PORTNAME= vinagre -PORTVERSION= 0.4 -PORTREVISION= 3 +PORTVERSION= 0.5.0 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 @@ -23,20 +24,25 @@ LIB_DEPENDS= gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \ USE_BZIP2= yes USE_GETTEXT= yes USE_XLIB= yes -USE_GNOME= gnomeprefix intlhack gnomehack libglade2 gconf2 gnomevfs2 +USE_GNOME= gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils 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 INSTALL MAINTAINERS NEWS README +.for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo index 5d984c827b08..a1327a702e0e 100644 --- a/net/vinagre/distinfo +++ b/net/vinagre/distinfo @@ -1,3 +1,3 @@ -MD5 (vinagre-0.4.tar.bz2) = 97dee0faa1b78e2497b9d231053b2f6d -SHA256 (vinagre-0.4.tar.bz2) = 547663727bc6e14688a6d9f9cf0fd5a724ed678a6279ab457afb40a61e89a2e3 -SIZE (vinagre-0.4.tar.bz2) = 363407 +MD5 (gnome2/vinagre-0.5.0.tar.bz2) = 3d5febbf26565e2095355848064a796a +SHA256 (gnome2/vinagre-0.5.0.tar.bz2) = 9e0552bb68b8514e0a6d6f62ccda60edbcf0a4f5dc3c524017321916e902d151 +SIZE (gnome2/vinagre-0.5.0.tar.bz2) = 1026066 diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist index 11d6f2b45350..59d5b0b091f2 100644 --- a/net/vinagre/pkg-plist +++ b/net/vinagre/pkg-plist @@ -4,10 +4,24 @@ share/applications/vinagre.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +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/es/figures/vinagre-screenshot.png +share/gnome/help/vinagre/es/vinagre.xml +share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png +share/gnome/help/vinagre/fr/vinagre.xml +share/gnome/help/vinagre/it/figures/vinagre-screenshot.png +share/gnome/help/vinagre/it/vinagre.xml +share/gnome/help/vinagre/oc/figures/vinagre-screenshot.png +share/gnome/help/vinagre/oc/vinagre.xml +share/gnome/help/vinagre/pt/figures/vinagre-screenshot.png +share/gnome/help/vinagre/pt/vinagre.xml +share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png +share/gnome/help/vinagre/sv/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 @@ -27,33 +41,92 @@ share/icons/hicolor/scalable/apps/vinagre.svg share/icons/hicolor/scalable/mimetypes/application-x-remote-connection.svg share/icons/hicolor/scalable/mimetypes/application-x-vnc.svg share/locale/ar/LC_MESSAGES/vinagre.mo +share/locale/be@latin/LC_MESSAGES/vinagre.mo share/locale/bg/LC_MESSAGES/vinagre.mo +share/locale/bn_IN/LC_MESSAGES/vinagre.mo share/locale/ca/LC_MESSAGES/vinagre.mo +share/locale/cs/LC_MESSAGES/vinagre.mo +share/locale/da/LC_MESSAGES/vinagre.mo share/locale/de/LC_MESSAGES/vinagre.mo +share/locale/el/LC_MESSAGES/vinagre.mo +share/locale/en_GB/LC_MESSAGES/vinagre.mo share/locale/es/LC_MESSAGES/vinagre.mo +share/locale/et/LC_MESSAGES/vinagre.mo +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/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/ko/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 +share/locale/mr/LC_MESSAGES/vinagre.mo share/locale/nb/LC_MESSAGES/vinagre.mo share/locale/nl/LC_MESSAGES/vinagre.mo share/locale/oc/LC_MESSAGES/vinagre.mo +share/locale/pl/LC_MESSAGES/vinagre.mo +share/locale/pt/LC_MESSAGES/vinagre.mo share/locale/pt_BR/LC_MESSAGES/vinagre.mo +share/locale/ru/LC_MESSAGES/vinagre.mo share/locale/si/LC_MESSAGES/vinagre.mo share/locale/sl/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/zh_CN/LC_MESSAGES/vinagre.mo +share/locale/zh_HK/LC_MESSAGES/vinagre.mo +share/locale/zh_TW/LC_MESSAGES/vinagre.mo +share/mime/application/x-remote-connection.xml +share/mime/application/x-vnc.xml share/mime/packages/vinagre-mime.xml -share/vinagre/vinagre-ui.xml -share/vinagre/vinagre.glade -@dirrm share/vinagre -@dirrmtry share/locale/si/LC_MESSAGES -@dirrmtry share/locale/si -@dirrmtry share/locale/oc/LC_MESSAGES -@dirrmtry share/locale/oc -%%PORTDOCS%%@dirrm %%DOCSDIR%% +share/omf/vinagre/vinagre-C.omf +share/omf/vinagre/vinagre-es.omf +share/omf/vinagre/vinagre-fr.omf +share/omf/vinagre/vinagre-it.omf +share/omf/vinagre/vinagre-oc.omf +share/omf/vinagre/vinagre-pt.omf +share/omf/vinagre/vinagre-sv.omf +%%DATADIR%%/vinagre-ui.xml +%%DATADIR%%/vinagre.glade +@dirrm %%DATADIR%% +@dirrm share/omf/vinagre +@dirrm share/gnome/help/vinagre/sv/figures +@dirrm share/gnome/help/vinagre/sv +@dirrm share/gnome/help/vinagre/pt/figures +@dirrm share/gnome/help/vinagre/pt +@dirrm share/gnome/help/vinagre/oc/figures +@dirrm share/gnome/help/vinagre/oc +@dirrm share/gnome/help/vinagre/it/figures +@dirrm share/gnome/help/vinagre/it +@dirrm share/gnome/help/vinagre/fr/figures +@dirrm share/gnome/help/vinagre/fr +@dirrm share/gnome/help/vinagre/es/figures +@dirrm share/gnome/help/vinagre/es +@dirrm share/gnome/help/vinagre/C/figures +@dirrm share/gnome/help/vinagre/C +@dirrm share/gnome/help/vinagre +@dirrm %%PORTDOCS%%%%DOCSDIR%% +@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/applications +@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 diff --git a/net/vino/Makefile b/net/vino/Makefile index a374c02561d2..3b87c8712fee 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.48 2007/10/15 17:13:51 mezz Exp $ +# $MCom: ports/net/vino/Makefile,v 1.56 2008/03/10 15:23:55 ahze Exp $ # PORTNAME= vino -PORTVERSION= 2.20.1 -PORTREVISION= 1 +PORTVERSION= 2.22.0 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/net/vino/distinfo b/net/vino/distinfo index eb4977814af6..374426be8c54 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,3 +1,3 @@ -MD5 (vino-2.20.1.tar.bz2) = c45379bd177e0bc9a937a3388fc81650 -SHA256 (vino-2.20.1.tar.bz2) = 372ec01ebf8bffdd4b2f318eae7a49873a79634bb715e6355de19809c9fa1221 -SIZE (vino-2.20.1.tar.bz2) = 625243 +MD5 (vino-2.22.0.tar.bz2) = c4bb4a18f264ad8dc21e7200911a0412 +SHA256 (vino-2.22.0.tar.bz2) = 1b81a3a1f0fe717ccf8256a325492a8aa76d348afbf301c22f172f1bbbae06e4 +SIZE (vino-2.22.0.tar.bz2) = 661662 diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index 067a1a1cc76b..5f0b20bdfbd0 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -3,9 +3,10 @@ bin/vino-session libdata/bonobo/servers/GNOME_RemoteDesktop.server libexec/vino-server share/applications/vino-preferences.desktop -share/icons/hicolor/48x48/apps/gnome-remote-desktop.png share/locale/ar/LC_MESSAGES/vino.mo +share/locale/as/LC_MESSAGES/vino.mo share/locale/az/LC_MESSAGES/vino.mo +share/locale/be@latin/LC_MESSAGES/vino.mo share/locale/bg/LC_MESSAGES/vino.mo share/locale/bn/LC_MESSAGES/vino.mo share/locale/bn_IN/LC_MESSAGES/vino.mo @@ -34,6 +35,7 @@ share/locale/id/LC_MESSAGES/vino.mo share/locale/it/LC_MESSAGES/vino.mo share/locale/ja/LC_MESSAGES/vino.mo share/locale/ka/LC_MESSAGES/vino.mo +share/locale/kn/LC_MESSAGES/vino.mo share/locale/ko/LC_MESSAGES/vino.mo share/locale/ku/LC_MESSAGES/vino.mo share/locale/lt/LC_MESSAGES/vino.mo @@ -41,6 +43,7 @@ share/locale/lv/LC_MESSAGES/vino.mo share/locale/mk/LC_MESSAGES/vino.mo share/locale/ml/LC_MESSAGES/vino.mo share/locale/mn/LC_MESSAGES/vino.mo +share/locale/mr/LC_MESSAGES/vino.mo share/locale/ms/LC_MESSAGES/vino.mo share/locale/nb/LC_MESSAGES/vino.mo share/locale/ne/LC_MESSAGES/vino.mo @@ -63,6 +66,7 @@ share/locale/sr/LC_MESSAGES/vino.mo share/locale/sr@Latn/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 share/locale/th/LC_MESSAGES/vino.mo share/locale/tr/LC_MESSAGES/vino.mo share/locale/ug/LC_MESSAGES/vino.mo @@ -76,22 +80,30 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo %%DATADIR%%/vino-preferences.glade %%DATADIR%%/vino-prompt.glade @dirrm %%DATADIR%% +@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/ug/LC_MESSAGES @dirrmtry share/locale/ug +@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/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/news/pan/Makefile b/news/pan/Makefile index 77b4f9778c34..52d681041c29 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/news/pan/Makefile,v 1.1 2006/10/19 16:50:55 mezz Exp $ +# $MCom: ports/news/pan/Makefile,v 1.7 2008/01/19 22:45:42 mezz Exp $ # PORTNAME= pan @@ -41,5 +41,7 @@ CONFIGURE_ARGS+= --with-gtkspell post-patch: @${FIND} ${WRKSRC} -name "Makefile.in"| ${XARGS} ${REINPLACE_CMD} -e \ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' + @${REINPLACE_CMD} -e 's|glib/gmessages.h|glib/gtestutils.h|g' \ + ${WRKSRC}/pan/data-impl/my-tree.cc .include <bsd.port.post.mk> diff --git a/news/pan/pkg-plist b/news/pan/pkg-plist index 7f7ce2259a4f..660ca5d8a7e5 100644 --- a/news/pan/pkg-plist +++ b/news/pan/pkg-plist @@ -45,6 +45,6 @@ share/locale/vi/LC_MESSAGES/pan.mo share/locale/zh_CN/LC_MESSAGES/pan.mo share/locale/zh_TW/LC_MESSAGES/pan.mo share/pixmaps/pan.png +@dirrmtry share/applications @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/applications diff --git a/print/Makefile b/print/Makefile index a3ae813d2cc7..5f13d336623d 100644 --- a/print/Makefile +++ b/print/Makefile @@ -169,6 +169,7 @@ SUBDIR += libotf SUBDIR += libpaper SUBDIR += libppd + SUBDIR += libspectre SUBDIR += lilypond SUBDIR += lout SUBDIR += lpr-wrapper diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile index 6ffb98dbf0bc..6314f9811acc 100644 --- a/print/ghostscript-gpl/Makefile +++ b/print/ghostscript-gpl/Makefile @@ -35,7 +35,8 @@ USE_GMAKE= yes WANT_GNOME= yes MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ - EXTRALIBS="${EXTRALIBS}" + EXTRALIBS="${EXTRALIBS}" \ + SOC_LOADER="dxmainc.c" PLIST_SUB= GS_VERSION="${GS_VERSION}" \ CIDFONTDIR="${CIDFONTDIR}" @@ -44,7 +45,6 @@ OPTIONS= A4SIZE "Set A4 (not Letter) as a default paper size" off \ FT_BRIDGE "FreeType bridge" off \ ICONV "libiconv support (required by opvp/oprp drivers)" on \ JPNFONTS "Japanese font support" on \ - SHLIB "With shared libraries" off \ SVGALIB "svgalib support" off .if defined(WITHOUT_X11) OPTIONS+= X11 "X11 support" off @@ -107,22 +107,10 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libfreetype.a:${PORTSDIR}/print/freetype2 MAKE_ENV+= FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".a" .endif -.if defined(WITH_SHLIB) -.if defined(WITHOUT_X11) -MAKE_ENV+= SOC_LOADER="dxmainc.c" -.else -USE_GNOME+= gtk20 -MAKE_ENV+= SOC_LOADER="dxmain.c" \ - SOC_CFLAGS="`pkg-config --cflags gtk+-2.0`" \ - SOC_LIBS="`pkg-config --libs gtk+-2.0`" -.endif ALL_TARGET= so INSTALL_TARGET= soinstall USE_LDCONFIG= yes -PLIST_SUB+= SHLIB="" SHLIB_VER="${GS_VERSION:R}" -.else -PLIST_SUB+= SHLIB="@comment " -.endif +PLIST_SUB+= SHLIB_VER="${GS_VERSION:R}" GS_SRCS= ${DISTNAME}${EXTRACT_SUFX} IJS_SRCS= ijs-0.35${EXTRACT_SUFX} @@ -240,12 +228,8 @@ post-install: ${ECHO_MSG} ">>> in post-install ..." ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont ${ECHO_MSG} ">>> stripping gs ..." -.if defined(WITH_SHLIB) ${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx ${LN} -sf gsc ${PREFIX}/bin/gs -.else - ${STRIP_CMD} ${PREFIX}/bin/gs -.endif # for PCL3 driver ${ECHO_MSG} ">>> installing PCL3 utility in bindir ..." ${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc index 25f98344187a..396004706b39 100644 --- a/print/ghostscript-gpl/Makefile.inc +++ b/print/ghostscript-gpl/Makefile.inc @@ -1,5 +1,5 @@ # $FreeBSD$ GS_VERSION= 8.61 -GS_REVISION= 3 +GS_REVISION= 4 GS_EPOCH= 0 diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist index 5391b6e65302..a50daa5553d3 100644 --- a/print/ghostscript-gpl/pkg-plist +++ b/print/ghostscript-gpl/pkg-plist @@ -8,13 +8,13 @@ bin/fixmswrd.pl bin/font2c bin/gs bin/gsbj -%%SHLIB%%bin/gsc +bin/gsc bin/gsdj bin/gsdj500 bin/gslj bin/gslp bin/gsnd -%%SHLIB%%bin/gsx +bin/gsx bin/lprsetup.sh bin/pcl3opts bin/pdf2dsc @@ -35,11 +35,11 @@ bin/ps2ps2 bin/pv.sh bin/unix-lpr.sh bin/wftopfa -%%SHLIB%%include/ghostscript/iapi.h -%%SHLIB%%include/ghostscript/ierrors.h -%%SHLIB%%lib/libgs.so -%%SHLIB%%lib/libgs.so.%%SHLIB_VER%% -%%SHLIB%%lib/libgs.so.%%GS_VERSION%% +include/ghostscript/iapi.h +include/ghostscript/ierrors.h +lib/libgs.so +lib/libgs.so.%%SHLIB_VER%% +lib/libgs.so.%%GS_VERSION%% %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/chp2200/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/chp2200/INSTALL %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ChangeLog @@ -829,7 +829,7 @@ bin/wftopfa %%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps @exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont @unexec rm -f %%CIDFONTDIR%%/CIDFont -%%SHLIB%%@dirrm include/ghostscript +@dirrm include/ghostscript @dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib @dirrm %%DATADIR%%/%%GS_VERSION%%/examples diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index 6ffb98dbf0bc..6314f9811acc 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -35,7 +35,8 @@ USE_GMAKE= yes WANT_GNOME= yes MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ - EXTRALIBS="${EXTRALIBS}" + EXTRALIBS="${EXTRALIBS}" \ + SOC_LOADER="dxmainc.c" PLIST_SUB= GS_VERSION="${GS_VERSION}" \ CIDFONTDIR="${CIDFONTDIR}" @@ -44,7 +45,6 @@ OPTIONS= A4SIZE "Set A4 (not Letter) as a default paper size" off \ FT_BRIDGE "FreeType bridge" off \ ICONV "libiconv support (required by opvp/oprp drivers)" on \ JPNFONTS "Japanese font support" on \ - SHLIB "With shared libraries" off \ SVGALIB "svgalib support" off .if defined(WITHOUT_X11) OPTIONS+= X11 "X11 support" off @@ -107,22 +107,10 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libfreetype.a:${PORTSDIR}/print/freetype2 MAKE_ENV+= FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".a" .endif -.if defined(WITH_SHLIB) -.if defined(WITHOUT_X11) -MAKE_ENV+= SOC_LOADER="dxmainc.c" -.else -USE_GNOME+= gtk20 -MAKE_ENV+= SOC_LOADER="dxmain.c" \ - SOC_CFLAGS="`pkg-config --cflags gtk+-2.0`" \ - SOC_LIBS="`pkg-config --libs gtk+-2.0`" -.endif ALL_TARGET= so INSTALL_TARGET= soinstall USE_LDCONFIG= yes -PLIST_SUB+= SHLIB="" SHLIB_VER="${GS_VERSION:R}" -.else -PLIST_SUB+= SHLIB="@comment " -.endif +PLIST_SUB+= SHLIB_VER="${GS_VERSION:R}" GS_SRCS= ${DISTNAME}${EXTRACT_SUFX} IJS_SRCS= ijs-0.35${EXTRACT_SUFX} @@ -240,12 +228,8 @@ post-install: ${ECHO_MSG} ">>> in post-install ..." ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont ${ECHO_MSG} ">>> stripping gs ..." -.if defined(WITH_SHLIB) ${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx ${LN} -sf gsc ${PREFIX}/bin/gs -.else - ${STRIP_CMD} ${PREFIX}/bin/gs -.endif # for PCL3 driver ${ECHO_MSG} ">>> installing PCL3 utility in bindir ..." ${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin diff --git a/print/ghostscript8/Makefile.inc b/print/ghostscript8/Makefile.inc index 25f98344187a..396004706b39 100644 --- a/print/ghostscript8/Makefile.inc +++ b/print/ghostscript8/Makefile.inc @@ -1,5 +1,5 @@ # $FreeBSD$ GS_VERSION= 8.61 -GS_REVISION= 3 +GS_REVISION= 4 GS_EPOCH= 0 diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist index 5391b6e65302..a50daa5553d3 100644 --- a/print/ghostscript8/pkg-plist +++ b/print/ghostscript8/pkg-plist @@ -8,13 +8,13 @@ bin/fixmswrd.pl bin/font2c bin/gs bin/gsbj -%%SHLIB%%bin/gsc +bin/gsc bin/gsdj bin/gsdj500 bin/gslj bin/gslp bin/gsnd -%%SHLIB%%bin/gsx +bin/gsx bin/lprsetup.sh bin/pcl3opts bin/pdf2dsc @@ -35,11 +35,11 @@ bin/ps2ps2 bin/pv.sh bin/unix-lpr.sh bin/wftopfa -%%SHLIB%%include/ghostscript/iapi.h -%%SHLIB%%include/ghostscript/ierrors.h -%%SHLIB%%lib/libgs.so -%%SHLIB%%lib/libgs.so.%%SHLIB_VER%% -%%SHLIB%%lib/libgs.so.%%GS_VERSION%% +include/ghostscript/iapi.h +include/ghostscript/ierrors.h +lib/libgs.so +lib/libgs.so.%%SHLIB_VER%% +lib/libgs.so.%%GS_VERSION%% %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/chp2200/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/chp2200/INSTALL %%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ChangeLog @@ -829,7 +829,7 @@ bin/wftopfa %%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps @exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont @unexec rm -f %%CIDFONTDIR%%/CIDFont -%%SHLIB%%@dirrm include/ghostscript +@dirrm include/ghostscript @dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib @dirrm %%DATADIR%%/%%GS_VERSION%%/examples diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile new file mode 100644 index 000000000000..088dbfddf853 --- /dev/null +++ b/print/libspectre/Makefile @@ -0,0 +1,24 @@ +# New ports collection makefile for: libspectre +# Date created: 2008-03-12 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/print/libspectre/Makefile,v 1.2 2008/03/13 16:30:50 ahze Exp $ + +PORTNAME= libspectre +PORTVERSION= 0.2.0 +CATEGORIES= print +MASTER_SITES= http://libspectre.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A small library for rendering Postscript documents + +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo + +USE_AUTOTOOLS= libtool:15 +USE_LDCONFIG= yes +USE_GNOME= gnomehack gnomeprefix ltverhack +USE_GHOSTSCRIPT=yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/print/libspectre/distinfo b/print/libspectre/distinfo new file mode 100644 index 000000000000..e5586f79db68 --- /dev/null +++ b/print/libspectre/distinfo @@ -0,0 +1,3 @@ +MD5 (libspectre-0.2.0.tar.gz) = 6dc4382d8c9cd355a76c4516f6e6f6e3 +SHA256 (libspectre-0.2.0.tar.gz) = 200285d12e4139cb263cb13b3a9240daf6ac2b89b9f9081734d955fc0862e548 +SIZE (libspectre-0.2.0.tar.gz) = 383362 diff --git a/print/libspectre/pkg-descr b/print/libspectre/pkg-descr new file mode 100644 index 000000000000..63383bb8bafb --- /dev/null +++ b/print/libspectre/pkg-descr @@ -0,0 +1,3 @@ +A small library for rendering Postscript documents + +WWW: http://libspectre.freedesktop.org/wiki/ diff --git a/print/libspectre/pkg-plist b/print/libspectre/pkg-plist new file mode 100644 index 000000000000..ad5024a0b24f --- /dev/null +++ b/print/libspectre/pkg-plist @@ -0,0 +1,14 @@ +include/libspectre/spectre-document.h +include/libspectre/spectre-exporter.h +include/libspectre/spectre-macros.h +include/libspectre/spectre-page.h +include/libspectre/spectre-render-context.h +include/libspectre/spectre-status.h +include/libspectre/spectre-version.h +include/libspectre/spectre.h +lib/libspectre.a +lib/libspectre.la +lib/libspectre.so +lib/libspectre.so.1 +libdata/pkgconfig/libspectre.pc +@dirrm include/libspectre diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile deleted file mode 100644 index f7fdd7d1485b..000000000000 --- a/security/gnome-keyring-manager/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# New ports collection makefile for: gnomekeyringmanager -# Date created: 2004 12 July -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/security/gnome-keyring-manager/Makefile,v 1.32 2007/09/18 01:27:58 ahze Exp $ -# - -PORTNAME= gnome-keyring-manager -PORTVERSION= 2.20.0 -CATEGORIES= security gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME keyring manager - -LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnome-keyring - -USE_XLIB= yes -USE_BZIP2= yes -GNU_CONFIGURE= yes -USE_GETTEXT= yes -USE_GMAKE= yes -INSTALLS_OMF= yes -USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui gnomedocutils -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -MAN1= gnome-keyring-manager.1 -GCONF_SCHEMAS= gnome-keyring-manager.schemas - -.include <bsd.port.mk> diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo deleted file mode 100644 index 99541a9d89fd..000000000000 --- a/security/gnome-keyring-manager/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = 61d701888f00c02490c0cd551bf3fcb1 -SHA256 (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = a4c9560f79067d528501198dd103b3df060b24f64cd878f22436031eeb113140 -SIZE (gnome2/gnome-keyring-manager-2.20.0.tar.bz2) = 455466 diff --git a/security/gnome-keyring-manager/pkg-descr b/security/gnome-keyring-manager/pkg-descr deleted file mode 100644 index c6881629b867..000000000000 --- a/security/gnome-keyring-manager/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -This a keyring management program for the GNOME Desktop. diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist deleted file mode 100644 index 5d1b24c0fb98..000000000000 --- a/security/gnome-keyring-manager/pkg-plist +++ /dev/null @@ -1,129 +0,0 @@ -bin/gnome-keyring-manager -share/applications/gnome-keyring-manager.desktop -%%DATADIR%%/gnome-keyring-manager-ui.xml -%%DATADIR%%/gnome-keyring-manager.glade -%%DATADIR%%/stock_delete-key.png -%%DATADIR%%/stock_delete-keyring.png -%%DATADIR%%/stock_new-key.png -%%DATADIR%%/stock_new-keyring.png -share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/C/legal.xml -share/gnome/help/gnome-keyring-manager/ca/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/da/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/en_GB/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/fr/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/oc/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/sv/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml -share/gnome/help/gnome-keyring-manager/vi/gnome-keyring-manager.xml -share/locale/ar/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/be/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/be@latin/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/bn_IN/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/cs/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/cy/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/da/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/de/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/dz/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/en_CA/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/en_GB/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/es/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/et/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/eu/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/fa/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/fi/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/fr/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/gl/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/gu/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/hi/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/hu/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/id/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/it/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ja/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ka/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ko/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/lt/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/lv/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/mg/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/mk/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ml/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/mn/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/mr/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/nn/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/oc/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/or/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/pt/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/pt_BR/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ro/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/si/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/sl/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/ta/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/te/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/vi/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo -share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo -share/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-ca.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-da.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-en_GB.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-oc.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf -share/omf/gnome-keyring-manager/gnome-keyring-manager-vi.omf -@dirrm share/omf/gnome-keyring-manager -@dirrm share/gnome/help/gnome-keyring-manager/vi -@dirrm share/gnome/help/gnome-keyring-manager/uk -@dirrm share/gnome/help/gnome-keyring-manager/sv -@dirrm share/gnome/help/gnome-keyring-manager/oc -@dirrm share/gnome/help/gnome-keyring-manager/fr -@dirrm share/gnome/help/gnome-keyring-manager/es -@dirrm share/gnome/help/gnome-keyring-manager/en_GB -@dirrm share/gnome/help/gnome-keyring-manager/da -@dirrm share/gnome/help/gnome-keyring-manager/ca -@dirrm share/gnome/help/gnome-keyring-manager/C -@dirrm share/gnome/help/gnome-keyring-manager -@dirrm %%DATADIR%% -@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/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/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/applications diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index f286bda257f9..7a93115cf71b 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,31 +3,30 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/security/gnome-keyring/Makefile,v 1.1 2007/11/30 19:09:39 marcus Exp $ +# $MCom: ports/security/gnome-keyring/Makefile,v 1.59 2008/03/09 18:30:40 mezz Exp $ # PORTNAME= gnome-keyring -PORTVERSION= 2.20.3 -PORTREVISION= 1 +PORTVERSION= 2.22.0 CATEGORIES= security gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= gnome-keyring-${PORTVERSION} +MASTER_SITES= GNOME 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 \ gcrypt.15:${PORTSDIR}/security/libgcrypt USE_BZIP2= yes -USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack +USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2 USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +GCONF_SCHEMAS= gnome-keyring.schemas .include <bsd.port.mk> diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 53d4eb46d43a..43065d85acc2 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-keyring-2.20.3.tar.bz2) = 2205177a168e745fa803c96a4fb62102 -SHA256 (gnome2/gnome-keyring-2.20.3.tar.bz2) = 5bfb69897c9042968637c33beca098a4bbabcb4b9863f3f49504bc82089fa970 -SIZE (gnome2/gnome-keyring-2.20.3.tar.bz2) = 541431 +MD5 (gnome2/gnome-keyring-2.22.0.tar.bz2) = d27c5bf11579069eb694f93b71364bb4 +SHA256 (gnome2/gnome-keyring-2.22.0.tar.bz2) = d5aa2c467fcb842b035a4fc424031dcc5a67ece01bc8f1c38fe10cbc3adbbd42 +SIZE (gnome2/gnome-keyring-2.22.0.tar.bz2) = 882416 diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure new file mode 100644 index 000000000000..235656df1b7e --- /dev/null +++ b/security/gnome-keyring/files/patch-configure @@ -0,0 +1,20 @@ +--- 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" + fi + +- if test "$enable_tests" == "yes"; then ++ if test "$enable_tests" = "yes"; then + WITH_TESTS_TRUE= + WITH_TESTS_FALSE='#' + else +@@ -25228,7 +25228,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 diff --git a/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c new file mode 100644 index 000000000000..185e929dd298 --- /dev/null +++ b/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..625a65cc72c0 --- /dev/null +++ b/security/gnome-keyring/files/patch-library_gnome-keyring.c @@ -0,0 +1,11 @@ +--- 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-pkcs11_gkr-pkcs11-daemon.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c new file mode 100644 index 000000000000..4bd5a923f4f4 --- /dev/null +++ b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c @@ -0,0 +1,10 @@ +--- 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/files/patch-pkcs11_gkr-pkcs11-module.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c new file mode 100644 index 000000000000..57d2f1888016 --- /dev/null +++ b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c @@ -0,0 +1,10 @@ +--- pkcs11/gkr-pkcs11-module.c.orig 2008-02-11 21:26:56.000000000 -0500 ++++ pkcs11/gkr-pkcs11-module.c 2008-02-11 21:27:08.000000000 -0500 +@@ -36,6 +36,7 @@ + #include <sys/socket.h> + #include <sys/un.h> + ++#include <string.h> + #include <stdlib.h> + #include <stdint.h> + #include <pthread.h> diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist index bde5f3d2a70e..1607e5fcbb6a 100644 --- a/security/gnome-keyring/pkg-plist +++ b/security/gnome-keyring/pkg-plist @@ -2,6 +2,9 @@ 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 +lib/gnome-keyring/gnome-keyring-pkcs11.a +lib/gnome-keyring/gnome-keyring-pkcs11.la +lib/gnome-keyring/gnome-keyring-pkcs11.so lib/libgnome-keyring.a lib/libgnome-keyring.la lib/libgnome-keyring.so @@ -11,9 +14,11 @@ lib/security/pam_gnome_keyring.la lib/security/pam_gnome_keyring.so libdata/pkgconfig/gnome-keyring-1.pc libexec/gnome-keyring-ask +share/dbus-1/services/org.gnome.keyring.service %%DOCSDIR%%/ch01.html %%DOCSDIR%%/gnome-keyring-gnome-keyring-acl.html %%DOCSDIR%%/gnome-keyring-gnome-keyring-attributes.html +%%DOCSDIR%%/gnome-keyring-gnome-keyring-daemon.html %%DOCSDIR%%/gnome-keyring-gnome-keyring-find.html %%DOCSDIR%%/gnome-keyring-gnome-keyring-generic-callbacks.html %%DOCSDIR%%/gnome-keyring-gnome-keyring-item-info.html @@ -23,6 +28,7 @@ libexec/gnome-keyring-ask %%DOCSDIR%%/gnome-keyring-gnome-keyring-memory.html %%DOCSDIR%%/gnome-keyring-gnome-keyring-misc.html %%DOCSDIR%%/gnome-keyring-gnome-keyring-network.html +%%DOCSDIR%%/gnome-keyring-gnome-keyring-password.html %%DOCSDIR%%/gnome-keyring-gnome-keyring-result.html %%DOCSDIR%%/gnome-keyring.devhelp %%DOCSDIR%%/gnome-keyring.devhelp2 @@ -58,6 +64,7 @@ share/locale/fi/LC_MESSAGES/gnome-keyring.mo share/locale/fr/LC_MESSAGES/gnome-keyring.mo share/locale/gl/LC_MESSAGES/gnome-keyring.mo share/locale/gu/LC_MESSAGES/gnome-keyring.mo +share/locale/he/LC_MESSAGES/gnome-keyring.mo share/locale/hi/LC_MESSAGES/gnome-keyring.mo share/locale/hr/LC_MESSAGES/gnome-keyring.mo share/locale/hu/LC_MESSAGES/gnome-keyring.mo @@ -78,6 +85,7 @@ share/locale/ms/LC_MESSAGES/gnome-keyring.mo share/locale/nb/LC_MESSAGES/gnome-keyring.mo share/locale/ne/LC_MESSAGES/gnome-keyring.mo share/locale/nl/LC_MESSAGES/gnome-keyring.mo +share/locale/nn/LC_MESSAGES/gnome-keyring.mo share/locale/oc/LC_MESSAGES/gnome-keyring.mo share/locale/or/LC_MESSAGES/gnome-keyring.mo share/locale/pa/LC_MESSAGES/gnome-keyring.mo @@ -106,6 +114,7 @@ share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo @dirrm %%DOCSDIR%% @dirrmtry lib/security +@dirrm lib/gnome-keyring @dirrm include/gnome-keyring-1 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 2f7e873bc884..7427f32a851a 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -3,14 +3,14 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse/Makefile,v 1.47 2007/10/15 17:59:07 mezz Exp $ +# $MCom: ports/security/seahorse/Makefile,v 1.61 2008/03/14 14:13:03 mezz Exp $ # PORTNAME= seahorse -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= security 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 @@ -38,15 +38,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= seahorse.schemas MAN1= seahorse-agent.1 seahorse-daemon.1 seahorse-tool.1 -OPTIONS= NAUTILUS "Enable the Nautilus component" on \ - LDAP "Enable LDAP support" on \ +OPTIONS= LDAP "Enable LDAP support" on \ HKP "Enable HKP keyserver interface" on \ - EPIPHANY "Enable Epiphany plug-in support" on \ NOTIFY "Enable libnotify support" on \ APPLET "Enable clipboard encryption applet" on \ KEYRING "Enable GNOME Keyring support" on \ MDNS "Enable mDNS key sharing" on \ - GEDIT "Enable GEdit plug-in support" on + GEDIT "Enable GEdit plug-in support" on \ + NAUTILUS "Enable the Nautilus component" on \ + EPIPHANY "Enable Epiphany plug-in support" on .include <bsd.port.pre.mk> @@ -78,7 +78,7 @@ CONFIGURE_ARGS+=--disable-ldap .endif .if !defined(WITHOUT_HKP) -LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup +LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup .else CONFIGURE_ARGS+=--disable-hkp .endif @@ -92,7 +92,7 @@ CONFIGURE_ARGS+=--disable-libnotify .if !defined(WITHOUT_EPIPHANY) BUILD_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany -PLIST_SUB+= EPHY="" EPHY_VERSION="2.20" +PLIST_SUB+= EPHY="" EPHY_VERSION="2.22" .else CONFIGURE_ARGS+=--disable-epiphany PLIST_SUB+= EPHY="@comment " diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo index df8b50d5389a..044eca969bb7 100644 --- a/security/seahorse/distinfo +++ b/security/seahorse/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/seahorse-2.20.3.tar.bz2) = 6f03b38cb0a52e682c73be49f244f83b -SHA256 (gnome2/seahorse-2.20.3.tar.bz2) = 26aadb8fbd03c2971fdbcbf686dffd93a1f7fe82495510a64f38e53a49ce8442 -SIZE (gnome2/seahorse-2.20.3.tar.bz2) = 2273106 +MD5 (gnome2/seahorse-2.22.0.tar.bz2) = 5dd87139d872c51c17de55ab4779a52a +SHA256 (gnome2/seahorse-2.22.0.tar.bz2) = 31284f8d5a22d4af263fceb7bef4fc3d1df91ad8821d3dbef507111ef84a5275 +SIZE (gnome2/seahorse-2.22.0.tar.bz2) = 2126861 diff --git a/security/seahorse/files/patch-agent_Makefile.in b/security/seahorse/files/patch-agent_Makefile.in new file mode 100644 index 000000000000..0ea3f6cf5c84 --- /dev/null +++ b/security/seahorse/files/patch-agent_Makefile.in @@ -0,0 +1,11 @@ +--- agent/Makefile.in.orig 2008-03-07 00:35:27.000000000 -0500 ++++ agent/Makefile.in 2008-03-07 00:35:44.000000000 -0500 +@@ -686,7 +686,7 @@ uninstall-man: uninstall-man1 + # Don't make the agent setuid + # Make the agent setuid + @HAVE_USER_MLOCK_FALSE@install-exec-hook: +-@HAVE_USER_MLOCK_FALSE@ chmod u+s $(DESTDIR)$(bindir)/seahorse-agent ++#@HAVE_USER_MLOCK_FALSE@ chmod u+s $(DESTDIR)$(bindir)/seahorse-agent + # 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/security/seahorse/pkg-plist b/security/seahorse/pkg-plist index cd02f7a7af86..4f564b5604cb 100644 --- a/security/seahorse/pkg-plist +++ b/security/seahorse/pkg-plist @@ -21,9 +21,9 @@ lib/libcryptui.a lib/libcryptui.la lib/libcryptui.so lib/libcryptui.so.0 -%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.a -%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.la -%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.so +%%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 @@ -176,6 +176,7 @@ share/locale/et/LC_MESSAGES/seahorse.mo share/locale/eu/LC_MESSAGES/seahorse.mo share/locale/fi/LC_MESSAGES/seahorse.mo share/locale/fr/LC_MESSAGES/seahorse.mo +share/locale/ga/LC_MESSAGES/seahorse.mo share/locale/gl/LC_MESSAGES/seahorse.mo share/locale/gu/LC_MESSAGES/seahorse.mo share/locale/he/LC_MESSAGES/seahorse.mo @@ -184,11 +185,13 @@ share/locale/hr/LC_MESSAGES/seahorse.mo share/locale/hu/LC_MESSAGES/seahorse.mo share/locale/it/LC_MESSAGES/seahorse.mo share/locale/ja/LC_MESSAGES/seahorse.mo +share/locale/kn/LC_MESSAGES/seahorse.mo share/locale/ko/LC_MESSAGES/seahorse.mo share/locale/lt/LC_MESSAGES/seahorse.mo share/locale/lv/LC_MESSAGES/seahorse.mo share/locale/mk/LC_MESSAGES/seahorse.mo share/locale/ml/LC_MESSAGES/seahorse.mo +share/locale/mr/LC_MESSAGES/seahorse.mo share/locale/ms/LC_MESSAGES/seahorse.mo share/locale/nb/LC_MESSAGES/seahorse.mo share/locale/ne/LC_MESSAGES/seahorse.mo @@ -285,6 +288,7 @@ 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 @@ -355,6 +359,7 @@ share/pixmaps/seahorse/scalable/seahorse.svg @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 @@ -365,10 +370,11 @@ share/pixmaps/seahorse/scalable/seahorse.svg @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 -@dirrmtry share/applications diff --git a/sysutils/Makefile b/sysutils/Makefile index d6f8e61c7411..b1eaeb5feb99 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -264,10 +264,12 @@ SUBDIR += glload SUBDIR += gnome-control-center SUBDIR += gnome-control-center1 + SUBDIR += gnome-device-manager SUBDIR += gnome-mount SUBDIR += gnome-pkgview SUBDIR += gnome-power-manager SUBDIR += gnome-schedule + SUBDIR += gnome-settings-daemon SUBDIR += gnome-system-monitor SUBDIR += gnome-system-tools SUBDIR += gnome-volume-manager @@ -297,7 +299,7 @@ SUBDIR += hachoir-urwid SUBDIR += hachoir-wx SUBDIR += hal - SUBDIR += hal-device-manager + SUBDIR += hal-info SUBDIR += hammerhead SUBDIR += hdup SUBDIR += healthd @@ -536,6 +538,7 @@ SUBDIR += plod SUBDIR += pmap SUBDIR += policykit + SUBDIR += policykit-gnome SUBDIR += powerman SUBDIR += prips SUBDIR += procmap diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index 6abd7c3a0e48..5b21bb054fdb 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,10 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/brasero/Makefile,v 1.18 2007/10/21 02:19:44 mezz Exp $ +# $MCom: ports/sysutils/brasero/Makefile,v 1.23 2008/02/06 07:11:46 marcus Exp $ PORTNAME= brasero PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -16,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= CD/DVD mastering tool for the GNOME desktop LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ - totem-plparser.7:${PORTSDIR}/multimedia/totem + totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser USE_GETTEXT= yes USE_BZIP2= yes diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist index 2bd391fac21b..acbe2314bd1f 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -239,7 +239,7 @@ 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/sr@Latn/LC_MESSAGES -@dirrmtry share/locale/sr@Latn @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index e5e11082ce5a..a46bd13ef669 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -3,24 +3,21 @@ # Whom: Florent Thoumie <flz@FreeBSD.org> # # $FreeBSD$ -# +# $MCom: ports/sysutils/consolekit/Makefile,v 1.12 2008/02/27 15:13:25 ahze Exp $ PORTNAME= consolekit -PORTVERSION= ${RELVERSION}.${SNAPSHOT} +PORTVERSION= 0.2.10 CATEGORIES= sysutils gnome -MASTER_SITES= http://people.freebsd.org/~flz/local/ +MASTER_SITES= http://people.freedesktop.org/~mccann/dist/ DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for defining and tracking users -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib - -RELVERSION= 0.2.2 -SNAPSHOT= 20070906 +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + polkit.2:${PORTSDIR}/sysutils/policykit -WRKSRC= ${WRKDIR}/ConsoleKit-${RELVERSION} -USE_BZIP2= yes +WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION} USE_XORG= x11 USE_GNOME= gnomehack gnometarget USE_GMAKE= yes @@ -28,9 +25,14 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-pid-file=/var/run/${PORTNAME}.pid +CONFIGURE_ARGS= --with-pid-file=/var/run/${PORTNAME}.pid \ + --localstatedir=/var -USE_RC_SUBR= consolekit -USE_GNOME_SUBR= yes +post-install: + ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-display-device \ + ${PREFIX}/libexec/ck-get-x11-display-device + ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid \ + ${PREFIX}/libexec/ck-get-x11-server-pid + ${MKDIR} /var/log/ConsoleKit .include <bsd.port.mk> diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo index 0d37700548c0..be86390034c1 100644 --- a/sysutils/consolekit/distinfo +++ b/sysutils/consolekit/distinfo @@ -1,3 +1,3 @@ -MD5 (ConsoleKit-0.2.2.20070906.tar.bz2) = 254370de2bcf0fe6dffecfe2eb33d0ec -SHA256 (ConsoleKit-0.2.2.20070906.tar.bz2) = fc8010e2068a7268ef6e414f404aa8237a21c9efc89aee9bfed8872936fa3be7 -SIZE (ConsoleKit-0.2.2.20070906.tar.bz2) = 309171 +MD5 (ConsoleKit-0.2.10.tar.gz) = b85c2333a8fe31c0d3f29caa14716634 +SHA256 (ConsoleKit-0.2.10.tar.gz) = 02b9510f65256db33a5e079736bb7234cd5599bf02dc77399d81d50cf5183bcb +SIZE (ConsoleKit-0.2.10.tar.gz) = 521473 diff --git a/sysutils/consolekit/files/ck-get-x11-display-device b/sysutils/consolekit/files/ck-get-x11-display-device new file mode 100644 index 000000000000..6fc508360b92 --- /dev/null +++ b/sysutils/consolekit/files/ck-get-x11-display-device @@ -0,0 +1,35 @@ +#!/bin/sh + +FSTAT="/usr/bin/fstat" +GREP="/usr/bin/grep" +AWK="/usr/bin/awk" +SED="/usr/bin/sed" +CAT="/bin/cat" +HEAD="/usr/bin/head" + +dispnum=0 +if [ x"$1" = x"--display" ]; then + if [ $# != 2 ]; then + echo "usage: $0 [--display DISPLAY]" + exit 1 + fi + DISPLAY=$2 +fi +if [ ! -z "${DISPLAY}" ]; then + dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|') +fi + +if [ ! -f "/tmp/.X${dispnum}-lock" ]; then + echo "ERROR: Failed to find X lock file for display ${dispnum}" + exit 1 +fi +pid=$(${CAT} "/tmp/.X${dispnum}-lock") + +device=$(${FSTAT} -p ${pid} | ${GREP} ttyv | ${HEAD} -1 | ${AWK} '{print $8}') + +if [ -z "${device}" ]; then + echo "ERROR: Failed to find TTY device for X server on display ${dispnum}" + exit 1 +fi + +echo "/dev/${device}" diff --git a/sysutils/consolekit/files/ck-get-x11-server-pid b/sysutils/consolekit/files/ck-get-x11-server-pid new file mode 100644 index 000000000000..05c433e0175e --- /dev/null +++ b/sysutils/consolekit/files/ck-get-x11-server-pid @@ -0,0 +1,17 @@ +#!/bin/sh + +SED="/usr/bin/sed" +CAT="/bin/cat" + +dispnum=0 +if [ ! -z "${DISPLAY}" ]; then + dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|') +fi + +if [ ! -f "/tmp/.X${dispnum}-lock" ]; then + echo "ERROR: Failed to find X lock file for display ${dispnum}" + exit 1 +fi +pid=$(${CAT} "/tmp/.X${dispnum}-lock") + +echo ${pid} diff --git a/sysutils/consolekit/files/consolekit.in b/sysutils/consolekit/files/consolekit.in deleted file mode 100644 index 7eada3e639c2..000000000000 --- a/sysutils/consolekit/files/consolekit.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: consolekit -# REQUIRE: DAEMON dbus -# -# Add the following line to /etc/rc.conf to enable the ConsoleKit daemon: -# -# consolekit_enable="YES" -# - -. %%RC_SUBR%% -. %%GNOME_SUBR%% - -consolekit_enable=${consolekit_enable-${gnome_enable}} - -name=consolekit -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/console-kit-daemon" -pidfile="/var/run/${name}.pid" - -start_precmd="consolekit_precmd" -stop_postcmd="consolekit_postcmd" - -local_force_depend() -{ - _depend="$1" - if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then - _depend="${_depend}.sh" - fi - - if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 && - ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then - return 1 - fi - return 0 -} - -consolekit_precmd() -{ - if ! checkyesno dbus_enable - then - local_force_depend dbus || return 1 - fi - - mkdir -p $(dirname $pidfile) -} - -consolekit_postcmd() -{ - rm -f $pidfile -} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c new file mode 100644 index 000000000000..5a0e1248b191 --- /dev/null +++ b/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c @@ -0,0 +1,142 @@ +--- src/ck-sysdeps-freebsd.c.orig 2008-01-23 09:30:44.000000000 -0500 ++++ src/ck-sysdeps-freebsd.c 2008-02-06 22:50:57.000000000 -0500 +@@ -27,6 +27,7 @@ + #include <unistd.h> + #include <string.h> + #include <errno.h> ++#include <glob.h> + #include <paths.h> + #include <ttyent.h> + #include <kvm.h> +@@ -202,7 +203,6 @@ ck_process_stat_new_for_unix_pid (pid_t + GError **error) + { + gboolean res; +- GError *local_error; + CkProcessStat *proc; + + g_return_val_if_fail (pid > 1, FALSE); +@@ -217,7 +217,6 @@ ck_process_stat_new_for_unix_pid (pid_t + if (res) { + *stat = proc; + } else { +- g_propagate_error (error, local_error); + *stat = NULL; + } + +@@ -318,38 +317,40 @@ gboolean + ck_get_max_num_consoles (guint *num) + { + int max_consoles; +- int res; +- gboolean ret; +- struct ttyent *t; ++ int i; ++ glob_t g; + +- ret = FALSE; + max_consoles = 0; + +- res = setttyent (); +- if (res == 0) { +- goto done; +- } +- +- while ((t = getttyent ()) != NULL) { +- if (t->ty_status & TTY_ON && strncmp (t->ty_name, "ttyv", 4) == 0) ++ g.gl_offs = 0; ++ glob ("/dev/ttyv*", GLOB_DOOFFS, NULL, &g); ++ for (i = 0; i < g.gl_pathc && g.gl_pathv[i] != NULL; i++) { ++ int fd; ++ char *cdev; ++ ++ cdev = g.gl_pathv[i]; ++ fd = open (cdev, O_RDONLY | O_NOCTTY); ++ if (fd > -1) { ++ close (fd); + max_consoles++; ++ } else { ++ break; ++ } + } + +- /* Increment one more so that all consoles are properly counted ++ globfree (&g); ++ ++ /* ++ * Increment one more so that all consoles are properly counted + * this is arguable a bug in vt_add_watches(). + */ + max_consoles++; + +- ret = TRUE; +- +- endttyent (); +- +-done: + if (num != NULL) { + *num = max_consoles; + } + +- return ret; ++ return TRUE; + } + + char * +@@ -360,7 +361,12 @@ ck_get_console_device_for_num (guint num + /* The device number is always one less than the VT number. */ + num--; + +- device = g_strdup_printf ("/dev/ttyv%u", num); ++ if (num < 10) ++ device = g_strdup_printf ("/dev/ttyv%i", num); ++ else if (num < 32) ++ device = g_strdup_printf ("/dev/ttyv%c", num - 10 + 'a'); ++ else ++ device = NULL; + + return device; + } +@@ -370,6 +376,7 @@ ck_get_console_num_from_device (const ch + guint *num) + { + guint n; ++ char c; + gboolean ret; + + n = 0; +@@ -379,7 +386,11 @@ ck_get_console_num_from_device (const ch + return FALSE; + } + +- if (sscanf (device, "/dev/ttyv%u", &n) == 1) { ++ if (sscanf (device, "/dev/ttyv%c", &c) == 1) { ++ if (c < 58) ++ n = c - 48; ++ else ++ n = c - 'a' + 10; + /* The VT number is always one more than the device number. */ + n++; + ret = TRUE; +@@ -399,6 +410,7 @@ ck_get_active_console_num (int consol + gboolean ret; + int res; + int active; ++ char ttyn; + + g_assert (console_fd != -1); + +@@ -411,7 +423,12 @@ ck_get_active_console_num (int consol + goto out; + } + +- g_debug ("Active VT is: %d (ttyv%d)", active, active - 1); ++ if (active - 1 < 10) ++ ttyn = active - 1 + '0'; ++ else ++ ttyn = active - 11 + 'a'; ++ ++ g_debug ("Active VT is: %d (ttyv%c)", active, ttyn); + ret = TRUE; + + out: diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c new file mode 100644 index 000000000000..e256e9f366f4 --- /dev/null +++ b/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c @@ -0,0 +1,18 @@ +--- src/ck-sysdeps-unix.c.orig 2008-02-06 22:59:55.000000000 -0500 ++++ src/ck-sysdeps-unix.c 2008-02-06 22:52:34.000000000 -0500 +@@ -172,6 +172,15 @@ ck_get_a_console_fd (void) + + fd = -1; + ++#ifdef __FreeBSD__ ++ /* On FreeBSD, try /dev/consolectl first as this will survive ++ * /etc/ttys initialization. */ ++ fd = open_a_console ("/dev/consolectl"); ++ if (fd >= 0) { ++ goto done; ++ } ++#endif ++ + #ifdef __sun + /* On Solaris, first try Sun VT device. */ + fd = open_a_console ("/dev/vt/active"); diff --git a/sysutils/consolekit/files/patch-src_main.c b/sysutils/consolekit/files/patch-src_main.c new file mode 100644 index 000000000000..a791db0f9149 --- /dev/null +++ b/sysutils/consolekit/files/patch-src_main.c @@ -0,0 +1,33 @@ +--- src/main.c.orig 2007-11-08 15:05:55.000000000 -0500 ++++ src/main.c 2007-11-08 15:07:39.000000000 -0500 +@@ -226,6 +226,21 @@ sigusr1_handler (int sig) + } + + static void ++setup_termination_signals (void) ++{ ++ struct sigaction sa; ++ ++ sa.sa_handler = SIG_DFL; ++ sigemptyset (&sa.sa_mask); ++ sa.sa_flags = 0; ++ ++ sigaction (SIGTERM, &sa, NULL); ++ sigaction (SIGQUIT, &sa, NULL); ++ sigaction (SIGINT, &sa, NULL); ++ sigaction (SIGHUP, &sa, NULL); ++} ++ ++static void + setup_debug_log_signals (void) + { + struct sigaction sa; +@@ -300,6 +315,8 @@ main (int argc, + + setup_debug_log (debug); + ++ setup_termination_signals (); ++ + connection = get_system_bus (); + if (connection == NULL) { + goto out; diff --git a/sysutils/consolekit/files/patch-src_test-vt-monitor.c b/sysutils/consolekit/files/patch-src_test-vt-monitor.c new file mode 100644 index 000000000000..6fb9740f5295 --- /dev/null +++ b/sysutils/consolekit/files/patch-src_test-vt-monitor.c @@ -0,0 +1,33 @@ +--- src/test-vt-monitor.c.orig 2007-08-17 13:08:55.000000000 -0400 ++++ src/test-vt-monitor.c 2007-11-08 15:11:37.000000000 -0500 +@@ -31,6 +31,7 @@ + #include <pwd.h> + #include <string.h> + #include <errno.h> ++#include <signal.h> + + #include <locale.h> + +@@ -55,12 +56,22 @@ main (int argc, char **argv) + GError *error; + guint num; + gboolean res; ++ struct sigaction sa; + + if (! g_thread_supported ()) { + g_thread_init (NULL); + } + g_type_init (); + ++ sa.sa_handler = SIG_DFL; ++ sigemptyset (&sa.sa_mask); ++ sa.sa_flags = 0; ++ ++ sigaction (SIGINT, &sa, NULL); ++ sigaction (SIGTERM, &sa, NULL); ++ sigaction (SIGQUIT, &sa, NULL); ++ sigaction (SIGHUP, &sa, NULL); ++ + if (! ck_is_root_user ()) { + g_warning ("Must be run as root"); + exit (1); diff --git a/sysutils/consolekit/files/patch-tools_Makefile.in b/sysutils/consolekit/files/patch-tools_Makefile.in new file mode 100644 index 000000000000..b818fd9319d0 --- /dev/null +++ b/sysutils/consolekit/files/patch-tools_Makefile.in @@ -0,0 +1,77 @@ +--- tools/Makefile.in.orig 2008-01-31 16:09:08.000000000 -0500 ++++ tools/Makefile.in 2008-01-31 16:10:21.000000000 -0500 +@@ -39,8 +39,7 @@ bin_PROGRAMS = ck-list-sessions$(EXEEXT) + $(am__EXEEXT_1) + sbin_PROGRAMS = ck-log-system-start$(EXEEXT) $(am__EXEEXT_1) + libexec_PROGRAMS = ck-collect-session-info$(EXEEXT) \ +- ck-get-x11-server-pid$(EXEEXT) \ +- ck-get-x11-display-device$(EXEEXT) $(am__EXEEXT_1) ++ $(am__EXEEXT_1) + subdir = tools + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -66,17 +65,6 @@ ck_collect_session_info_OBJECTS = \ + am__DEPENDENCIES_1 = + ck_collect_session_info_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1) +-am_ck_get_x11_display_device_OBJECTS = \ +- ck-get-x11-display-device.$(OBJEXT) $(am__objects_1) +-ck_get_x11_display_device_OBJECTS = \ +- $(am_ck_get_x11_display_device_OBJECTS) +-ck_get_x11_display_device_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1) +-am_ck_get_x11_server_pid_OBJECTS = ck-get-x11-server-pid.$(OBJEXT) \ +- $(am__objects_1) +-ck_get_x11_server_pid_OBJECTS = $(am_ck_get_x11_server_pid_OBJECTS) +-ck_get_x11_server_pid_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1) + am_ck_history_OBJECTS = ck-history.$(OBJEXT) $(am__objects_1) + ck_history_OBJECTS = $(am_ck_history_OBJECTS) + ck_history_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -335,24 +323,6 @@ ck_collect_session_info_LDADD = \ + $(top_builddir)/src/libck.la \ + $(NULL) + +-ck_get_x11_server_pid_SOURCES = \ +- ck-get-x11-server-pid.c \ +- $(NULL) +- +-ck_get_x11_server_pid_LDADD = \ +- $(TOOLS_LIBS) \ +- $(top_builddir)/src/libck.la \ +- $(NULL) +- +-ck_get_x11_display_device_SOURCES = \ +- ck-get-x11-display-device.c \ +- $(NULL) +- +-ck_get_x11_display_device_LDADD = \ +- $(TOOLS_LIBS) \ +- $(top_builddir)/src/libck.la \ +- $(NULL) +- + EXTRA_DIST = \ + $(NULL) + +@@ -480,12 +450,6 @@ clean-sbinPROGRAMS: + ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES) + @rm -f ck-collect-session-info$(EXEEXT) + $(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS) +-ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES) +- @rm -f ck-get-x11-display-device$(EXEEXT) +- $(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS) +-ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES) +- @rm -f ck-get-x11-server-pid$(EXEEXT) +- $(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS) + ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES) + @rm -f ck-history$(EXEEXT) + $(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS) +@@ -503,8 +467,6 @@ distclean-compile: + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-collect-session-info.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-display-device.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-server-pid.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-history.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-start.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-sessions.Po@am__quote@ diff --git a/sysutils/consolekit/pkg-descr b/sysutils/consolekit/pkg-descr index 31ea86e35301..db13002ab4b7 100644 --- a/sysutils/consolekit/pkg-descr +++ b/sysutils/consolekit/pkg-descr @@ -3,4 +3,4 @@ sessions, and seats. The primary motivations for this framework are to facilitate fast-user-switching and multi-seat capabilities, and to enable more sophisticated policy decisions for desktop sessions. -WWW: http://www.freedesktop.org/Software/hal +WWW: http://www.freedesktop.org/wiki/Software/ConsoleKit diff --git a/sysutils/consolekit/pkg-plist b/sysutils/consolekit/pkg-plist index eba97e96bcaf..4b75734214b4 100644 --- a/sysutils/consolekit/pkg-plist +++ b/sysutils/consolekit/pkg-plist @@ -1,7 +1,14 @@ +bin/ck-history +bin/ck-launch-session bin/ck-list-sessions +sbin/ck-log-system-restart +sbin/ck-log-system-start +sbin/ck-log-system-stop etc/ConsoleKit/seats.d/00-primary.seat etc/dbus-1/system.d/ConsoleKit.conf include/ConsoleKit/ck-connector/ck-connector.h +lib/ConsoleKit/scripts/ck-system-restart +lib/ConsoleKit/scripts/ck-system-stop lib/libck-connector.la lib/libck-connector.so lib/libck-connector.so.0 @@ -10,7 +17,20 @@ 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/dbus-1/system-services/org.freedesktop.ConsoleKit.service +@exec %D/etc/ConsoleKit/run-session.d +@exec mkdir -p %D/lib/ConsoleKit/run-session.d +@dirrm lib/ConsoleKit/scripts +@dirrmtry lib/ConsoleKit/run-session.d +@dirrmtry lib/ConsoleKit @dirrm include/ConsoleKit/ck-connector @dirrm include/ConsoleKit @dirrm etc/ConsoleKit/seats.d +@dirrmtry etc/ConsoleKit/run-session.d @dirrm etc/ConsoleKit +@exec mkdir -p /var/run/ConsoleKit +@exec mkdir -p /var/log/ConsoleKit +@exec touch -f /var/log/ConsoleKit/history +@unexec rm -rf /var/run/ConsoleKit 2>/dev/null || true +@unexec rm -rf /var/log/ConsoleKit 2>/dev/null || true diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile index f580acfc4e59..4767249e1150 100644 --- a/sysutils/eiciel/Makefile +++ b/sysutils/eiciel/Makefile @@ -15,6 +15,8 @@ COMMENT= A GNOME-based ACL editor, with integration into Nautilus LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 +BROKEN= Need to be update with new Nautilus 2.22 + USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 USE_GETTEXT= yes diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index aca189afa042..751d7117deb4 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.66 2007/09/18 01:30:46 ahze Exp $ +# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.68 2008/03/11 03:54:37 mezz Exp $ # PORTNAME= gconf-editor -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 PORTEPOCH= 1 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 diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index cbe4c5480452..45fda8d93de9 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gconf-editor-2.20.0.tar.bz2) = b686677878b5754ffa8d0a2cc1129988 -SHA256 (gnome2/gconf-editor-2.20.0.tar.bz2) = 10b5043c4152cf5d33b138c516c10708005212ee150ea8dc6c7dc396ac27a79a -SIZE (gnome2/gconf-editor-2.20.0.tar.bz2) = 892603 +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 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 6df1d36571f4..817b8e2afc39 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -17,22 +17,6 @@ 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/uk/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/uk/gconf-editor.xml -share/omf/gconf-editor/gconf-editor-C.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-sv.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 share/icons/hicolor/48x48/apps/gconf-editor.png share/locale/am/LC_MESSAGES/gconf-editor.mo share/locale/ar/LC_MESSAGES/gconf-editor.mo @@ -86,6 +70,7 @@ share/locale/ms/LC_MESSAGES/gconf-editor.mo share/locale/nb/LC_MESSAGES/gconf-editor.mo share/locale/ne/LC_MESSAGES/gconf-editor.mo share/locale/nl/LC_MESSAGES/gconf-editor.mo +share/locale/nn/LC_MESSAGES/gconf-editor.mo share/locale/oc/LC_MESSAGES/gconf-editor.mo share/locale/or/LC_MESSAGES/gconf-editor.mo share/locale/pa/LC_MESSAGES/gconf-editor.mo @@ -113,6 +98,22 @@ share/locale/xh/LC_MESSAGES/gconf-editor.mo 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-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-sv.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 @@ -132,6 +133,7 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo @dirrm share/gnome/help/gconf-editor/C/figures @dirrm share/gnome/help/gconf-editor/C @dirrm share/gnome/help/gconf-editor +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -160,4 +162,3 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 2dc0a9354a1a..7bf9d14fcc39 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,20 +3,22 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.157 2007/10/15 17:48:45 mezz Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.172 2008/03/10 21:50:24 mezz Exp $ # PORTNAME= gnome-control-center -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 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 COMMENT= Control center for GNOME 2 project -LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier +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 USE_BZIP2= yes USE_GETTEXT= yes @@ -35,11 +37,7 @@ CONFIGURE_ARGS= --enable-gstreamer=0.10 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ - apps_gnome_settings_daemon_keybindings.schemas \ - apps_gnome_settings_daemon_screensaver.schemas \ - control-center.schemas \ - desktop_gnome_font_rendering.schemas \ +GCONF_SCHEMAS= control-center.schemas \ fontilus.schemas themus.schemas .if defined(PACKAGE_BUILDING) diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index ddca27e93d27..ee7861862154 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-control-center-2.20.3.tar.bz2) = cd44c6b870d09ea5a049aa11385c97a6 -SHA256 (gnome2/gnome-control-center-2.20.3.tar.bz2) = e3abed47de5f41511af95663d1adb3d35a575dc662b8611e959f2f5d205ab07f -SIZE (gnome2/gnome-control-center-2.20.3.tar.bz2) = 2259976 +MD5 (gnome2/gnome-control-center-2.22.0.tar.bz2) = e6730ac4ee8b14a577978dee6c1cb88f +SHA256 (gnome2/gnome-control-center-2.22.0.tar.bz2) = 13e5cc7181b4c380921984a327ec2f8a48077a4f15319bbe6cf6985f44ff3af0 +SIZE (gnome2/gnome-control-center-2.22.0.tar.bz2) = 2176730 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 5f5eb4bc15a5..ac875d14d9b9 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,15 +1,15 @@ ---- capplets/common/gnome-theme-info.c.orig 2007-08-27 04:09:06.000000000 -0400 -+++ capplets/common/gnome-theme-info.c 2007-09-20 15:24:56.000000000 -0400 -@@ -1845,7 +1845,7 @@ read_cursor_fonts (void) +--- 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->name = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL); +- 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->path = g_strdup (theme_info->name); + theme_info->name = g_strdup (theme_info->path); if (!strcmp (theme_info->path, cursor_font)) -@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_ +@@ -1922,7 +1922,7 @@ gnome_vfs_uri_unref (top_theme_dir_uri); /* The weird /usr/share/icons */ @@ -17,4 +17,4 @@ + 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); - result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL); + add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL); diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c deleted file mode 100644 index 2664fcf8ee6b..000000000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c +++ /dev/null @@ -1,24 +0,0 @@ ---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig 2007-09-18 05:32:43.000000000 -0400 -+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c 2007-10-28 13:45:28.000000000 -0400 -@@ -610,8 +610,11 @@ - if ((command != NULL) && (strcmp (command, "") != 0)) - execute (acme, command, FALSE, FALSE); - else -+#if __FreeBSD__ -+ execute (acme, "cdcontrol eject", FALSE, FALSE); -+#else - execute (acme, "eject -T", FALSE, FALSE); -- -+#endif - g_free (command); - } - -@@ -708,7 +711,7 @@ - do_mail_action (acme); - break; - case SLEEP_KEY: -- do_sleep_action ("apm", "xset dpms force off"); -+ do_sleep_action ("zzz", "xset dpms force off"); - break; - case SCREENSAVER_KEY: - if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index f444122a9d09..94006da59a29 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -1,5 +1,4 @@ %%ABOUTME%%bin/gnome-about-me -bin/gnome-accessibility-keyboard-properties bin/gnome-appearance-properties bin/gnome-at-mobility bin/gnome-at-properties @@ -20,8 +19,8 @@ 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-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h 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 @@ -34,20 +33,17 @@ lib/libgnome-window-settings.a lib/libgnome-window-settings.la lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 -lib/nautilus/extensions-1.0/libnautilus-fontilus.a -lib/nautilus/extensions-1.0/libnautilus-fontilus.la -lib/nautilus/extensions-1.0/libnautilus-fontilus.so -lib/nautilus/extensions-1.0/libnautilus-themus.a -lib/nautilus/extensions-1.0/libnautilus-themus.la -lib/nautilus/extensions-1.0/libnautilus-themus.so +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-keybindings.pc -libdata/pkgconfig/gnome-settings-daemon.pc libdata/pkgconfig/gnome-window-settings-2.0.pc -libexec/gnome-settings-daemon -share/applications/accessibility-keyboard.desktop share/applications/at-properties.desktop share/applications/default-applications.desktop share/applications/display-properties.desktop @@ -63,33 +59,23 @@ share/applications/keybinding.desktop share/applications/keyboard.desktop share/applications/themus-theme-applier.desktop share/applications/window-properties.desktop -share/dbus-1/services/org.gnome.SettingsDaemon.service share/desktop-directories/font-method.directory share/desktop-directories/gnomecc.directory share/desktop-directories/theme-method.directory -%%DATADIR%%/glade/acme.glade %%DATADIR%%/glade/appearance.glade %%DATADIR%%/glade/apply-font.glade %%DATADIR%%/glade/at-enable-dialog.glade %%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade -%%DATADIR%%/glade/gnome-accessibility-keyboard-properties.glade %%DATADIR%%/glade/gnome-default-applications-properties.glade %%DATADIR%%/glade/gnome-keybinding-properties.glade %%DATADIR%%/glade/gnome-keyboard-properties.glade %%DATADIR%%/glade/gnome-mouse-properties.glade %%DATADIR%%/glade/gnome-network-preferences.glade %%DATADIR%%/glade/gnome-window-properties.glade -%%DATADIR%%/glade/modmap-dialog.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/accessibility-keyboard-bouncekey.png -%%DATADIR%%/pixmaps/accessibility-keyboard-mousekey.png -%%DATADIR%%/pixmaps/accessibility-keyboard-slowkey.png -%%DATADIR%%/pixmaps/accessibility-keyboard-stickykey.png -%%DATADIR%%/pixmaps/accessibility-keyboard-togglekey.png -%%DATADIR%%/pixmaps/acme-eject.png %%DATADIR%%/pixmaps/at-startup.png %%DATADIR%%/pixmaps/at-support.png %%DATADIR%%/pixmaps/bar-disabled.png @@ -103,16 +89,10 @@ share/desktop-directories/theme-method.directory %%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png %%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png %%DATADIR%%/pixmaps/icon-theme-thumbnailing.png -%%DATADIR%%/pixmaps/keyboard-bell.png -%%DATADIR%%/pixmaps/keyboard-cursor.png -%%DATADIR%%/pixmaps/keyboard-repeat.png -%%DATADIR%%/pixmaps/keyboard-volume.png %%DATADIR%%/pixmaps/mouse-cursor-normal-large.png %%DATADIR%%/pixmaps/mouse-cursor-normal.png %%DATADIR%%/pixmaps/mouse-cursor-white-large.png %%DATADIR%%/pixmaps/mouse-cursor-white.png -%%DATADIR%%/pixmaps/mouse-left.png -%%DATADIR%%/pixmaps/mouse-right.png %%DATADIR%%/pixmaps/ocean-stripes.png %%DATADIR%%/pixmaps/stop.png %%DATADIR%%/pixmaps/subpixel-bgr.png @@ -122,13 +102,6 @@ share/desktop-directories/theme-method.directory %%DATADIR%%/pixmaps/theme-thumbnailing.png %%DATADIR%%/pixmaps/visual-bell.png %%DATADIR%%/pixmaps/window-theme-thumbnailing.png -%%DATADIR%%/xrdb/Editres.ad -%%DATADIR%%/xrdb/Emacs.ad -%%DATADIR%%/xrdb/General.ad -%%DATADIR%%/xrdb/Motif.ad -%%DATADIR%%/xrdb/Tk.ad -%%DATADIR%%/xrdb/Xaw.ad -share/gnome/autostart/gnome-at-session.desktop share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf @@ -151,9 +124,11 @@ share/gnome/help/control-center/ca/control-center.xml share/gnome/help/control-center/en_GB/control-center.xml share/gnome/help/control-center/es/control-center.xml share/gnome/help/control-center/fr/control-center.xml +share/gnome/help/control-center/it/control-center.xml share/gnome/help/control-center/ja/control-center.xml share/gnome/help/control-center/oc/control-center.xml share/gnome/help/control-center/pa/control-center.xml +share/gnome/help/control-center/pl/control-center.xml share/gnome/help/control-center/pt/control-center.xml share/gnome/help/control-center/pt_BR/control-center.xml share/gnome/help/control-center/ru/control-center.xml @@ -173,6 +148,8 @@ 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-sound-properties.png +share/icons/hicolor/48x48/apps/gnome-network-preferences.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 share/icons/hicolor/scalable/apps/gnome-network-preferences.svg @@ -181,6 +158,7 @@ share/icons/hicolor/scalable/apps/typing-monitor.svg share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/as/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo @@ -216,6 +194,7 @@ share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo @@ -252,8 +231,6 @@ share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo -share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo -share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo @@ -268,9 +245,11 @@ share/omf/control-center/control-center-ca.omf share/omf/control-center/control-center-en_GB.omf share/omf/control-center/control-center-es.omf share/omf/control-center/control-center-fr.omf +share/omf/control-center/control-center-it.omf share/omf/control-center/control-center-ja.omf share/omf/control-center/control-center-oc.omf share/omf/control-center/control-center-pa.omf +share/omf/control-center/control-center-pl.omf share/omf/control-center/control-center-pt.omf share/omf/control-center/control-center-pt_BR.omf share/omf/control-center/control-center-ru.omf @@ -286,9 +265,11 @@ share/omf/control-center/control-center-zh_CN.omf @dirrm share/gnome/help/control-center/ru @dirrm share/gnome/help/control-center/pt_BR @dirrm share/gnome/help/control-center/pt +@dirrm share/gnome/help/control-center/pl @dirrm share/gnome/help/control-center/pa @dirrm share/gnome/help/control-center/oc @dirrm share/gnome/help/control-center/ja +@dirrm share/gnome/help/control-center/it @dirrm share/gnome/help/control-center/fr @dirrm share/gnome/help/control-center/es @dirrm share/gnome/help/control-center/en_GB @@ -296,14 +277,13 @@ share/omf/control-center/control-center-zh_CN.omf @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center @dirrm share/gnome/cursor-fonts -@dirrm %%DATADIR%%/xrdb @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/glade @dirrmtry share/desktop-directories +@dirrmtry share/applications @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 -@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon -@dirrm include/gnome-settings-daemon-2.0 +@dirrmtry etc/xdg/autostart @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 @@ -314,8 +294,6 @@ share/omf/control-center/control-center-zh_CN.omf @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/si/LC_MESSAGES @@ -338,4 +316,5 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile new file mode 100644 index 000000000000..ce19c001c76c --- /dev/null +++ b/sysutils/gnome-device-manager/Makefile @@ -0,0 +1,29 @@ +# New ports collection makefile for: gnome-device-manager +# Date Created: 08 January 2008 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/gnome-device-manager/Makefile,v 1.1 2008/01/08 06:47:29 marcus Exp $ +# + +PORTNAME= gnome-device-manager +PORTVERSION= 0.2 +CATEGORIES= sysutils +MASTER_SITES= http://hal.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= HAL device manager for the GNOME Desktop + +LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack gnometarget intlhack ltverhack libgnomeui +USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes +USE_LDCONFIG= yes +INSTALLS_OMF= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/sysutils/gnome-device-manager/distinfo b/sysutils/gnome-device-manager/distinfo new file mode 100644 index 000000000000..631e741d3631 --- /dev/null +++ b/sysutils/gnome-device-manager/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome-device-manager-0.2.tar.bz2) = b833a90c940dd6cc992c42ad05ca6831 +SHA256 (gnome-device-manager-0.2.tar.bz2) = fecb3bf79c3f10bebf0601c044344b0105738c1533f5da62f27dc84d0a3b30d3 +SIZE (gnome-device-manager-0.2.tar.bz2) = 426804 diff --git a/sysutils/gnome-device-manager/pkg-descr b/sysutils/gnome-device-manager/pkg-descr new file mode 100644 index 000000000000..f6664a36d554 --- /dev/null +++ b/sysutils/gnome-device-manager/pkg-descr @@ -0,0 +1,6 @@ +This is a GNOME program to manage devices and device drivers. It's +inspired by hal-device-manager, from the HAL project, but rewritten in +C for efficiency and an outlook to actually make it manage devices +rather than just show information. + +WWW: http://www.freedesktop.org/Software/hal diff --git a/sysutils/gnome-device-manager/pkg-plist b/sysutils/gnome-device-manager/pkg-plist new file mode 100644 index 000000000000..c06d8f88a636 --- /dev/null +++ b/sysutils/gnome-device-manager/pkg-plist @@ -0,0 +1,24 @@ +bin/gnome-device-manager +include/gnome-device-manager/gdm-device.h +include/gnome-device-manager/gdm-info-provider-iface.h +include/gnome-device-manager/gdm-info-provider.h +include/gnome-device-manager/gdm-pool.h +lib/libgnome-device-manager.a +lib/libgnome-device-manager.la +lib/libgnome-device-manager.so +lib/libgnome-device-manager.so.0 +libdata/pkgconfig/gnome-device-manager.pc +share/applications/gnome-device-manager.desktop +share/gnome/help/gnome-device-manager/C/figures/gnome-device-manager.png +share/gnome/help/gnome-device-manager/C/gnome-device-manager.xml +share/gnome/help/gnome-device-manager/C/legal.xml +share/icons/hicolor/48x48/apps/gnome-device-manager-device-pci.png +share/icons/hicolor/48x48/apps/gnome-device-manager-device-usb-interface.png +share/icons/hicolor/48x48/apps/gnome-device-manager-device-usb.png +share/icons/hicolor/48x48/apps/gnome-device-manager.png +share/omf/gnome-device-manager/gnome-device-manager-C.omf +@dirrm share/omf/gnome-device-manager +@dirrm share/gnome/help/gnome-device-manager/C/figures +@dirrm share/gnome/help/gnome-device-manager/C +@dirrm share/gnome/help/gnome-device-manager +@dirrm include/gnome-device-manager diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile index da19f96cf641..d317e5763ff1 100644 --- a/sysutils/gnome-mount/Makefile +++ b/sysutils/gnome-mount/Makefile @@ -3,35 +3,35 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.16 2007/05/19 21:36:22 marcus Exp $ +# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.24 2008/02/04 23:18:46 mezz Exp $ # PORTNAME= gnome-mount -PORTVERSION= 0.6 -PORTREVISION= 4 +PORTVERSION= 0.7 +PORTREVISION= 5 CATEGORIES= sysutils gnome -MASTER_SITES= http://people.freedesktop.org/~david/dist/ +MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= A front-end to mount, umount, and eject using HAL LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ - notify.1:${PORTSDIR}/devel/libnotify + notify.1:${PORTSDIR}/devel/libnotify \ + gnome-keyring:${PORTSDIR}/security/gnome-keyring +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils/policykit-gnome USE_XLIB= yes -USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 +USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtk20 USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-nautilus-extension +CONFIGURE_ARGS= --disable-nautilus-extension CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gnome-mount.schemas MAN1= gnome-mount.1 - -post-patch: - @${REINPLACE_CMD} -e 's|0.5.8.1|0.5.8|g' \ - ${WRKSRC}/configure +MLINKS= gnome-mount.1 gnome-eject.1 \ + gnome-mount.1 gnome-umount.1 .include <bsd.port.mk> diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo index 94f471d4a73f..648224657e9e 100644 --- a/sysutils/gnome-mount/distinfo +++ b/sysutils/gnome-mount/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-mount-0.6.tar.gz) = d2612aecfa73806e072316033d78b203 -SHA256 (gnome-mount-0.6.tar.gz) = 4169840c49135a58dff6b99445492b74bc751dbb19c9133568ecfbcbf3219cad -SIZE (gnome-mount-0.6.tar.gz) = 466656 +MD5 (gnome-mount-0.7.tar.gz) = 6a2f14925376c2c494df89cbfbdb2ca5 +SHA256 (gnome-mount-0.7.tar.gz) = 009c8a920e40f414936bf2ad3a883e1c3fdcf0af8f736c8e840167406f737608 +SIZE (gnome-mount-0.7.tar.gz) = 484021 diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist index 1586c42b826c..d35d0b048a2c 100644 --- a/sysutils/gnome-mount/pkg-plist +++ b/sysutils/gnome-mount/pkg-plist @@ -1,13 +1,11 @@ bin/gnome-eject bin/gnome-mount bin/gnome-umount -lib/nautilus/extensions-1.0/libgnome-mount.a -lib/nautilus/extensions-1.0/libgnome-mount.la -lib/nautilus/extensions-1.0/libgnome-mount.so libdata/pkgconfig/gnome-mount.pc share/gnome-mount/gnome-mount-properties.glade share/locale/ar/LC_MESSAGES/gnome-mount.mo share/locale/be/LC_MESSAGES/gnome-mount.mo +share/locale/be@latin/LC_MESSAGES/gnome-mount.mo share/locale/ca/LC_MESSAGES/gnome-mount.mo share/locale/da/LC_MESSAGES/gnome-mount.mo share/locale/dz/LC_MESSAGES/gnome-mount.mo @@ -18,12 +16,19 @@ share/locale/fr/LC_MESSAGES/gnome-mount.mo share/locale/hu/LC_MESSAGES/gnome-mount.mo share/locale/it/LC_MESSAGES/gnome-mount.mo share/locale/ja/LC_MESSAGES/gnome-mount.mo +share/locale/lv/LC_MESSAGES/gnome-mount.mo share/locale/mk/LC_MESSAGES/gnome-mount.mo share/locale/nb/LC_MESSAGES/gnome-mount.mo +share/locale/oc/LC_MESSAGES/gnome-mount.mo +share/locale/pl/LC_MESSAGES/gnome-mount.mo share/locale/pt_BR/LC_MESSAGES/gnome-mount.mo share/locale/ru/LC_MESSAGES/gnome-mount.mo share/locale/sv/LC_MESSAGES/gnome-mount.mo share/locale/vi/LC_MESSAGES/gnome-mount.mo @dirrm share/gnome-mount +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index f86c1d6f2ea5..72c5dd95e50d 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/gnome-power-manager/Makefile,v 1.1 2007/12/02 00:33:17 mezz Exp $ +# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.40 2008/03/10 22:50:08 ahze Exp $ # PORTNAME= gnome-power-manager -PORTVERSION= 2.20.2 +PORTVERSION= 2.22.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/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo index 4b51dbe27140..8a732edc97a3 100644 --- a/sysutils/gnome-power-manager/distinfo +++ b/sysutils/gnome-power-manager/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 8a38e3a169b80c44639f4383a64835d0 -SHA256 (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 60c9f8e6893123d1837f3cd1fcf834e66bc6f69b9efea5e590b1a9a97e1850c2 -SIZE (gnome2/gnome-power-manager-2.20.2.tar.bz2) = 3020529 +MD5 (gnome2/gnome-power-manager-2.22.0.tar.bz2) = 43c76a13a803a5c034f310bb20f91ff4 +SHA256 (gnome2/gnome-power-manager-2.22.0.tar.bz2) = a28500e52844286ef85f7fc773151be62c9cf6ce10ad51eceec99aa57304e70b +SIZE (gnome2/gnome-power-manager-2.22.0.tar.bz2) = 2999358 diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist index 9dba9e121c02..6e72d046a507 100644 --- a/sysutils/gnome-power-manager/pkg-plist +++ b/sysutils/gnome-power-manager/pkg-plist @@ -1,5 +1,3 @@ -bin/gnome-brightness-applet -bin/gnome-inhibit-applet bin/gnome-power-bugreport.sh bin/gnome-power-cmd.sh bin/gnome-power-manager @@ -7,6 +5,8 @@ bin/gnome-power-preferences bin/gnome-power-statistics libdata/bonobo/servers/GNOME_BrightnessApplet.server libdata/bonobo/servers/GNOME_InhibitApplet.server +libexec/gnome-brightness-applet +libexec/gnome-inhibit-applet share/applications/gnome-power-preferences.desktop share/applications/gnome-power-statistics.desktop share/dbus-1/services/gnome-power-manager.service @@ -439,6 +439,8 @@ share/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg 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/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 share/locale/bn_IN/LC_MESSAGES/gnome-power-manager.mo @@ -457,6 +459,7 @@ share/locale/eu/LC_MESSAGES/gnome-power-manager.mo share/locale/fa/LC_MESSAGES/gnome-power-manager.mo share/locale/fi/LC_MESSAGES/gnome-power-manager.mo share/locale/fr/LC_MESSAGES/gnome-power-manager.mo +share/locale/ga/LC_MESSAGES/gnome-power-manager.mo share/locale/gl/LC_MESSAGES/gnome-power-manager.mo share/locale/gu/LC_MESSAGES/gnome-power-manager.mo share/locale/he/LC_MESSAGES/gnome-power-manager.mo @@ -466,6 +469,7 @@ share/locale/id/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 +share/locale/kn/LC_MESSAGES/gnome-power-manager.mo share/locale/ko/LC_MESSAGES/gnome-power-manager.mo share/locale/ku/LC_MESSAGES/gnome-power-manager.mo share/locale/lt/LC_MESSAGES/gnome-power-manager.mo @@ -473,8 +477,10 @@ share/locale/lv/LC_MESSAGES/gnome-power-manager.mo share/locale/mg/LC_MESSAGES/gnome-power-manager.mo share/locale/mk/LC_MESSAGES/gnome-power-manager.mo share/locale/ml/LC_MESSAGES/gnome-power-manager.mo +share/locale/mr/LC_MESSAGES/gnome-power-manager.mo share/locale/nb/LC_MESSAGES/gnome-power-manager.mo share/locale/nl/LC_MESSAGES/gnome-power-manager.mo +share/locale/nn/LC_MESSAGES/gnome-power-manager.mo share/locale/oc/LC_MESSAGES/gnome-power-manager.mo share/locale/or/LC_MESSAGES/gnome-power-manager.mo share/locale/pa/LC_MESSAGES/gnome-power-manager.mo @@ -491,6 +497,7 @@ share/locale/sr@Latn/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/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 share/locale/vi/LC_MESSAGES/gnome-power-manager.mo share/locale/zh_CN/LC_MESSAGES/gnome-power-manager.mo @@ -546,12 +553,15 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrm %%DATADIR%%/icons/hicolor @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrmtry share/applications @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/mg/LC_MESSAGES @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @@ -560,4 +570,7 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @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/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile new file mode 100644 index 000000000000..c1c432debab2 --- /dev/null +++ b/sysutils/gnome-settings-daemon/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: gnome-settings-daemon +# Date created: 14 Jan 2008 +# 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 $ +# + +PORTNAME= gnome-settings-daemon +PORTVERSION= 2.22.0 +CATEGORIES= sysutils gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GNOME 2 settings daemon + +USE_XORG= xxf86misc +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd +USE_GETTEXT= yes +USE_GSTREAMER= good +GNU_CONFIGURE= 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_screensaver.schemas \ + desktop_gnome_font_rendering.schemas \ + gnome-settings-daemon.schemas + +.include <bsd.port.mk> diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo new file mode 100644 index 000000000000..677f21c818b0 --- /dev/null +++ b/sysutils/gnome-settings-daemon/distinfo @@ -0,0 +1,3 @@ +MD5 (gnome-settings-daemon-2.22.0.tar.bz2) = 5bb2b129342e3149c00892aa18926317 +SHA256 (gnome-settings-daemon-2.22.0.tar.bz2) = 265cc72958fd8ad66f7a7e2f98968bf74018c1391b5d8abb38ea1c6120c6aea5 +SIZE (gnome-settings-daemon-2.22.0.tar.bz2) = 1192937 diff --git a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c b/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c new file mode 100644 index 000000000000..6fce0da1831a --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c @@ -0,0 +1,10 @@ +--- plugins/typing-break/gsd-typing-break-manager.c.orig 2008-01-14 01:20:09.000000000 +0100 ++++ plugins/typing-break/gsd-typing-break-manager.c 2008-01-14 01:20:37.000000000 +0100 +@@ -27,6 +27,7 @@ + #include <unistd.h> + #include <string.h> + #include <errno.h> ++#include <sys/signal.h> + + #include <locale.h> + diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c new file mode 100644 index 000000000000..1db1bb16efe8 --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c @@ -0,0 +1,26 @@ +--- plugins/media-keys/gsd-media-keys-manager.c.orig 2008-01-29 15:58:30.000000000 -0600 ++++ plugins/media-keys/gsd-media-keys-manager.c 2008-01-29 16:00:55.000000000 -0600 +@@ -667,7 +667,11 @@ + if ((command != NULL) && (strcmp (command, "") != 0)) { + execute (manager, command, FALSE, FALSE); + } else { ++#if __FreeBSD__ ++ execute (manager, "cdcontrol eject", FALSE, FALSE); ++#else + execute (manager, "eject -T", FALSE, FALSE); ++#endif + } + + g_free (command); +@@ -869,7 +873,11 @@ + do_mail_action (manager); + break; + case SLEEP_KEY: ++#if __FreeBSD__ ++ do_sleep_action ("zzz", "xset dpms force off"); ++#else + do_sleep_action ("apm", "xset dpms force off"); ++#endif + break; + case SCREENSAVER_KEY: + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) { diff --git a/sysutils/gnome-settings-daemon/pkg-descr b/sysutils/gnome-settings-daemon/pkg-descr new file mode 100644 index 000000000000..42b586789ffe --- /dev/null +++ b/sysutils/gnome-settings-daemon/pkg-descr @@ -0,0 +1 @@ +GNOME 2 settings daemon. diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist new file mode 100644 index 000000000000..5b7ee38e5a94 --- /dev/null +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -0,0 +1,187 @@ +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/keybindings.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/liba11y-keyboard.a +lib/gnome-settings-daemon-2.0/liba11y-keyboard.la +lib/gnome-settings-daemon-2.0/liba11y-keyboard.so +lib/gnome-settings-daemon-2.0/libbackground.a +lib/gnome-settings-daemon-2.0/libbackground.la +lib/gnome-settings-daemon-2.0/libbackground.so +lib/gnome-settings-daemon-2.0/libclipboard.a +lib/gnome-settings-daemon-2.0/libclipboard.la +lib/gnome-settings-daemon-2.0/libclipboard.so +lib/gnome-settings-daemon-2.0/libdummy.a +lib/gnome-settings-daemon-2.0/libdummy.la +lib/gnome-settings-daemon-2.0/libdummy.so +lib/gnome-settings-daemon-2.0/libfont.a +lib/gnome-settings-daemon-2.0/libfont.la +lib/gnome-settings-daemon-2.0/libfont.so +lib/gnome-settings-daemon-2.0/libkeybindings.a +lib/gnome-settings-daemon-2.0/libkeybindings.la +lib/gnome-settings-daemon-2.0/libkeybindings.so +lib/gnome-settings-daemon-2.0/libkeyboard.a +lib/gnome-settings-daemon-2.0/libkeyboard.la +lib/gnome-settings-daemon-2.0/libkeyboard.so +lib/gnome-settings-daemon-2.0/libmedia-keys.a +lib/gnome-settings-daemon-2.0/libmedia-keys.la +lib/gnome-settings-daemon-2.0/libmedia-keys.so +lib/gnome-settings-daemon-2.0/libmouse.a +lib/gnome-settings-daemon-2.0/libmouse.la +lib/gnome-settings-daemon-2.0/libmouse.so +lib/gnome-settings-daemon-2.0/libscreensaver.a +lib/gnome-settings-daemon-2.0/libscreensaver.la +lib/gnome-settings-daemon-2.0/libscreensaver.so +lib/gnome-settings-daemon-2.0/libsound.a +lib/gnome-settings-daemon-2.0/libsound.la +lib/gnome-settings-daemon-2.0/libsound.so +lib/gnome-settings-daemon-2.0/libtyping-break.a +lib/gnome-settings-daemon-2.0/libtyping-break.la +lib/gnome-settings-daemon-2.0/libtyping-break.so +lib/gnome-settings-daemon-2.0/libxrandr.a +lib/gnome-settings-daemon-2.0/libxrandr.la +lib/gnome-settings-daemon-2.0/libxrandr.so +lib/gnome-settings-daemon-2.0/libxrdb.a +lib/gnome-settings-daemon-2.0/libxrdb.la +lib/gnome-settings-daemon-2.0/libxrdb.so +lib/gnome-settings-daemon-2.0/libxsettings.a +lib/gnome-settings-daemon-2.0/libxsettings.la +lib/gnome-settings-daemon-2.0/libxsettings.so +lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/screensaver.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin +lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin +libdata/pkgconfig/gnome-settings-daemon.pc +libexec/gnome-settings-daemon +share/dbus-1/services/org.gnome.SettingsDaemon.service +%%DATADIR%%/acme-eject.png +%%DATADIR%%/acme.glade +%%DATADIR%%/modmap-dialog.glade +%%DATADIR%%/xrdb/Editres.ad +%%DATADIR%%/xrdb/Emacs.ad +%%DATADIR%%/xrdb/General.ad +%%DATADIR%%/xrdb/Motif.ad +%%DATADIR%%/xrdb/Tk.ad +%%DATADIR%%/xrdb/Xaw.ad +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 +share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/bg/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/bn/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/de/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/dz/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/et/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/eu/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/fa/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/gu/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/he/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/hi/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/hr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/hu/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/id/LC_MESSAGES/gnome-settings-daemon.mo +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/ko/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mn/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/mr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ms/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nb/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ne/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nl/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nn/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/nso/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/oc/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/or/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/pa/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/pl/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/pt/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/pt_BR/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ro/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/ru/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/rw/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/si/LC_MESSAGES/gnome-settings-daemon.mo +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/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 +share/locale/th/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/tr/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/uk/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/vi/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/wa/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/xh/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo +share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo +@dirrm %%DATADIR%%/xrdb +@dirrm %%DATADIR%% +@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 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/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/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg +@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 diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 5bb1ec109e92..fbb8efd729fc 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.109 2007/10/15 21:02:38 mezz Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.117 2008/03/10 22:04:22 mezz Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.20.2 +PORTVERSION= 2.22.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,7 +18,6 @@ COMMENT= GNOME 2 system monitor program BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - pcre.0:${PORTSDIR}/devel/pcre \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme @@ -28,7 +26,8 @@ USE_GETTEXT= yes USE_XLIB= yes INSTALLS_OMF= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils +USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \ + librsvg2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pcrecpp CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 7e3b1ee00341..d8b8f50d4c69 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-monitor-2.20.2.tar.bz2) = d5e52f923b0b725b3a49e4bb7a296436 -SHA256 (gnome2/gnome-system-monitor-2.20.2.tar.bz2) = 2829da0e37a0758b949d4a59ab22e71b6372b9e3cc6bb907aa95e2d375ccbedc -SIZE (gnome2/gnome-system-monitor-2.20.2.tar.bz2) = 1827859 +MD5 (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = 7b809a4db72902ca5f47a63f62917d14 +SHA256 (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = a2e6b6c185063fc43e6d6293a64cd3fa6f32be58b682bc58e5913c94aa3cd1e2 +SIZE (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = 1935178 diff --git a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp new file mode 100644 index 000000000000..e57a2170425e --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp @@ -0,0 +1,11 @@ +--- src/load-graph.cpp.orig 2008-01-14 23:43:43.000000000 -0600 ++++ src/load-graph.cpp 2008-01-14 23:44:15.000000000 -0600 +@@ -501,7 +501,7 @@ + // e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10) + // where base10 = 1, coef10 = 101, pow2 = 16 + +- unsigned pow2 = std::floor(log2(new_max)); ++ unsigned pow2 = std::floor(log(new_max) / log(2)); + unsigned base10 = pow2 / 10; + unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10))); + g_assert(new_max <= (coef10 * (1UL << (base10 * 10)))); diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index f099100907d6..4ed8d93f72d6 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -117,6 +117,7 @@ share/locale/am/LC_MESSAGES/gnome-system-monitor.mo share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo share/locale/az/LC_MESSAGES/gnome-system-monitor.mo share/locale/be/LC_MESSAGES/gnome-system-monitor.mo +share/locale/be@latin/LC_MESSAGES/gnome-system-monitor.mo share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo @@ -147,6 +148,7 @@ share/locale/id/LC_MESSAGES/gnome-system-monitor.mo share/locale/it/LC_MESSAGES/gnome-system-monitor.mo share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo share/locale/ka/LC_MESSAGES/gnome-system-monitor.mo +share/locale/kn/LC_MESSAGES/gnome-system-monitor.mo share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo share/locale/li/LC_MESSAGES/gnome-system-monitor.mo @@ -196,7 +198,9 @@ share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf share/omf/gnome-system-monitor/gnome-system-monitor-pa.omf share/omf/gnome-system-monitor/gnome-system-monitor-sv.omf +share/pixmaps/gnome-system-monitor/download.svg share/pixmaps/gnome-system-monitor/side.png +share/pixmaps/gnome-system-monitor/upload.svg @dirrm share/pixmaps/gnome-system-monitor @dirrm share/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/sv/figures @@ -216,6 +220,7 @@ share/pixmaps/gnome-system-monitor/side.png @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C @dirrm share/gnome/help/gnome-system-monitor +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/ug/LC_MESSAGES @@ -238,4 +243,5 @@ share/pixmaps/gnome-system-monitor/side.png @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 diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 81bf196e48b3..2182de4117a4 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -3,21 +3,19 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.68 2007/09/16 16:56:43 ahze Exp $ +# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.78 2008/03/09 18:58:47 mezz Exp $ # PORTNAME= gnome-system-tools -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= sysutils gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -DISTNAME= gnome-system-tools-${PORTVERSION} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Tools to configure workstations -LIB_DEPENDS= oobs-1.3:${PORTSDIR}/devel/liboobs +LIB_DEPENDS= oobs-1.4:${PORTSDIR}/devel/liboobs USE_BZIP2= yes USE_GMAKE= yes diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index 1317b19b6e8d..c56c52fb6457 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 382ed1f5ad4cb6ce7b88985611e2be18 -SHA256 (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 5635b305322ee4d1e2dddd3a9b9f4b29f195663f4c51e77428f81f6bbd325581 -SIZE (gnome2/gnome-system-tools-2.20.0.tar.bz2) = 3226583 +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 diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure deleted file mode 100644 index 303edc2c5532..000000000000 --- a/sysutils/gnome-system-tools/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2007-12-22 22:34:20.000000000 -0600 -+++ configure 2007-12-22 22:34:43.000000000 -0600 -@@ -25180,7 +25180,7 @@ - GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS" - - GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS" --GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common" -+GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS" - - GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in" - GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in" diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index 95534a249571..3d2ede7481a5 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -3,24 +3,22 @@ bin/services-admin bin/shares-admin bin/time-admin bin/users-admin -lib/nautilus/extensions-1.0/libnautilus-gst-shares.a -lib/nautilus/extensions-1.0/libnautilus-gst-shares.la -lib/nautilus/extensions-1.0/libnautilus-gst-shares.so +lib/nautilus/extensions-2.0/libnautilus-gst-shares.a +lib/nautilus/extensions-2.0/libnautilus-gst-shares.la +lib/nautilus/extensions-2.0/libnautilus-gst-shares.so libdata/pkgconfig/gnome-system-tools.pc share/applications/network.desktop share/applications/services.desktop share/applications/shares.desktop share/applications/time.desktop share/applications/users.desktop -%%DATADIR%%/interfaces/boot.glade -%%DATADIR%%/interfaces/common.glade -%%DATADIR%%/interfaces/disks.glade -%%DATADIR%%/interfaces/network.glade -%%DATADIR%%/interfaces/services.glade -%%DATADIR%%/interfaces/shares.glade -%%DATADIR%%/interfaces/time.glade -%%DATADIR%%/interfaces/users.glade %%DATADIR%%/pixmaps/world_map-960.png +%%DATADIR%%/ui/common.ui +%%DATADIR%%/ui/network.ui +%%DATADIR%%/ui/services.ui +%%DATADIR%%/ui/shares.ui +%%DATADIR%%/ui/time.ui +%%DATADIR%%/ui/users.ui share/gnome/help/network-admin/C/figures/network-tool.png share/gnome/help/network-admin/C/legal.xml share/gnome/help/network-admin/C/network-admin.xml @@ -39,6 +37,8 @@ share/gnome/help/services-admin/C/legal.xml share/gnome/help/services-admin/C/services-admin.xml share/gnome/help/services-admin/ca/figures/services-tool.png share/gnome/help/services-admin/ca/services-admin.xml +share/gnome/help/services-admin/el/figures/services-tool.png +share/gnome/help/services-admin/el/services-admin.xml share/gnome/help/services-admin/es/figures/services-tool.png share/gnome/help/services-admin/es/services-admin.xml share/gnome/help/services-admin/fr/figures/services-tool.png @@ -87,7 +87,7 @@ share/gnome/help/time-admin/fr/figures/time-tool-manual.png share/gnome/help/time-admin/fr/time-admin.xml share/gnome/help/time-admin/nl/figures/time-map.png share/gnome/help/time-admin/nl/figures/time-servers.png -share/gnome/help/time-admin/nl/figures/time-tool.png +share/gnome/help/time-admin/nl/figures/time-tool-manual.png share/gnome/help/time-admin/nl/legal.xml share/gnome/help/time-admin/nl/time-admin.xml share/gnome/help/time-admin/oc/figures/time-map.png @@ -110,6 +110,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/el/figures/users-tool.png +share/gnome/help/users-admin/el/users-admin.xml share/gnome/help/users-admin/es/figures/users-tool.png share/gnome/help/users-admin/es/users-admin.xml share/gnome/help/users-admin/fr/figures/users-tool.png @@ -120,8 +122,14 @@ 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 share/gnome/help/users-admin/sv/users-admin.xml +share/icons/hicolor/16x16/apps/time-admin.png +share/icons/hicolor/22x22/apps/time-admin.png +share/icons/hicolor/24x24/apps/time-admin.png +share/icons/hicolor/32x32/apps/time-admin.png +share/icons/hicolor/48x48/apps/time-admin.png share/icons/hicolor/48x48/devices/irda.png share/icons/hicolor/48x48/devices/plip.png +share/icons/hicolor/scalable/apps/time-admin.svg share/locale/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo share/locale/az/LC_MESSAGES/gnome-system-tools.mo @@ -164,6 +172,7 @@ share/locale/mg/LC_MESSAGES/gnome-system-tools.mo share/locale/mk/LC_MESSAGES/gnome-system-tools.mo share/locale/ml/LC_MESSAGES/gnome-system-tools.mo share/locale/mn/LC_MESSAGES/gnome-system-tools.mo +share/locale/mr/LC_MESSAGES/gnome-system-tools.mo share/locale/ms/LC_MESSAGES/gnome-system-tools.mo share/locale/nb/LC_MESSAGES/gnome-system-tools.mo share/locale/ne/LC_MESSAGES/gnome-system-tools.mo @@ -180,6 +189,7 @@ share/locale/ru/LC_MESSAGES/gnome-system-tools.mo share/locale/rw/LC_MESSAGES/gnome-system-tools.mo share/locale/si/LC_MESSAGES/gnome-system-tools.mo 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 @@ -204,6 +214,7 @@ share/omf/network-admin/network-admin-oc.omf share/omf/network-admin/network-admin-sv.omf share/omf/services-admin/services-admin-C.omf share/omf/services-admin/services-admin-ca.omf +share/omf/services-admin/services-admin-el.omf share/omf/services-admin/services-admin-es.omf share/omf/services-admin/services-admin-fr.omf share/omf/services-admin/services-admin-oc.omf @@ -223,6 +234,7 @@ 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-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 @@ -244,6 +256,8 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/users-admin/fr @dirrm share/gnome/help/users-admin/es/figures @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/ca/figures @dirrm share/gnome/help/users-admin/ca @dirrm share/gnome/help/users-admin/C/figures @@ -289,6 +303,8 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/services-admin/fr @dirrm share/gnome/help/services-admin/es/figures @dirrm share/gnome/help/services-admin/es +@dirrm share/gnome/help/services-admin/el/figures +@dirrm share/gnome/help/services-admin/el @dirrm share/gnome/help/services-admin/ca/figures @dirrm share/gnome/help/services-admin/ca @dirrm share/gnome/help/services-admin/C/figures @@ -307,9 +323,10 @@ share/omf/users-admin/users-admin-sv.omf @dirrm share/gnome/help/network-admin/C/figures @dirrm share/gnome/help/network-admin/C @dirrm share/gnome/help/network-admin +@dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/pixmaps -@dirrm %%DATADIR%%/interfaces @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -320,6 +337,8 @@ share/omf/users-admin/users-admin-sv.omf @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/ku/LC_MESSAGES @@ -330,4 +349,3 @@ share/omf/users-admin/users-admin-sv.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile index e291787b154b..4f2b92b07892 100644 --- a/sysutils/gnome-volume-manager/Makefile +++ b/sysutils/gnome-volume-manager/Makefile @@ -3,12 +3,12 @@ # Whom: Jean-Yves Lefort <jylefort@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.19 2007/10/17 04:15:23 marcus Exp $ +# $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.24 2008/03/15 16:48:05 marcus Exp $ # PORTNAME= gnome-volume-manager -PORTVERSION= 2.17.0 -PORTREVISION= 8 +PORTVERSION= 2.22.1 +PORTREVISION= 3 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo index a3b7541f3610..29774bf19e52 100644 --- a/sysutils/gnome-volume-manager/distinfo +++ b/sysutils/gnome-volume-manager/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome-volume-manager-2.17.0.tar.bz2) = 104cec26e721e0bba69debd392367195 -SHA256 (gnome-volume-manager-2.17.0.tar.bz2) = 5517cf5d6a70227d66afb9a8b97a704f0d8e29098cec98bcbf68da77133537a9 -SIZE (gnome-volume-manager-2.17.0.tar.bz2) = 341241 +MD5 (gnome-volume-manager-2.22.1.tar.bz2) = a0cb86f541515f33443c848879d04785 +SHA256 (gnome-volume-manager-2.22.1.tar.bz2) = 8305428940e3aab9a7c6ccaa283489170d8de96b873695b541c8a7daacd2d591 +SIZE (gnome-volume-manager-2.22.1.tar.bz2) = 361668 diff --git a/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling b/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling new file mode 100644 index 000000000000..9abff24dcd15 --- /dev/null +++ b/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling @@ -0,0 +1,1460 @@ +# Description: Disable media handling and the respective UI tabs, since nautilus does that now. +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=509823 +--- gnome-volume-manager-2.22.1/gnome-volume-manager.schemas.in 2007-12-07 18:55:47.000000000 +0100 ++++ gnome-volume-manager.schemas.in 2008-02-29 16:30:08.000000000 +0100 +@@ -16,7 +16,7 @@ + <key>/schemas/desktop/gnome/volume_manager/automount_drives</key> + <applyto>/desktop/gnome/volume_manager/automount_drives</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Automount removable drives</short> + <long>Whether gnome-volume-manager should automatically mount +@@ -28,7 +28,7 @@ + <key>/schemas/desktop/gnome/volume_manager/automount_media</key> + <applyto>/desktop/gnome/volume_manager/automount_media</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Automount removable media</short> + <long>Whether gnome-volume-manager should automatically mount +@@ -40,7 +40,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autobrowse</key> + <applyto>/desktop/gnome/volume_manager/autobrowse</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Autorun nautilus</short> + <long>Open nautilus on removeable media insert.</long> +@@ -97,7 +97,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autoplay_cda</key> + <applyto>/desktop/gnome/volume_manager/autoplay_cda</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Play inserted audio CD's</short> + <long>Whether, when an audio CD is inserted, gnome-volume-manager +@@ -154,7 +154,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd</key> + <applyto>/desktop/gnome/volume_manager/autoplay_dvd</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Play inserted video DVDs</short> + <long>Whether, when a video DVD is inserted, +@@ -177,7 +177,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autoplay_vcd</key> + <applyto>/desktop/gnome/volume_manager/autoplay_vcd</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Play inserted video VCDs</short> + <long>Whether, when a video VCD is inserted, +@@ -248,7 +248,7 @@ + <key>/schemas/desktop/gnome/volume_manager/autoprinter</key> + <applyto>/desktop/gnome/volume_manager/autoprinter</applyto> + <type>bool</type> +- <default>true</default> ++ <default>false</default> + <locale name="C"> + <short>Run printer program</short> + <long>Whether, when a printer is connected, gnome-volume-manager should run +diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/gnome-volume-properties.glade gnome-volume-manager-2.22.1.new/gnome-volume-properties.glade +--- gnome-volume-manager-2.22.1/gnome-volume-properties.glade 2007-12-07 18:55:47.000000000 +0100 ++++ gnome-volume-properties.glade 2008-02-29 16:30:08.000000000 +0100 +@@ -68,1197 +68,6 @@ + <property name="enable_popup">False</property> + + <child> +- <widget class="GtkVBox" id="storage_vbox"> +- <property name="border_width">12</property> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">18</property> +- +- <child> +- <widget class="GtkVBox" id="removable_drives_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="removable_drives_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Removable Storage</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="removable_drives_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="removable_drives_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="removable_drives_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="automount_drives"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">_Mount removable drives when hot-plugged</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkCheckButton" id="automount_media"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Mount removable media when _inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkCheckButton" id="autobrowse"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Browse _removable media when inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkCheckButton" id="autorun"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">_Auto-run programs on new drives and media</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkCheckButton" id="autoopen"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Auto-_open files on new drives and media</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="blank_cd_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="blank_cd_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Blank CD and DVD Discs</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="blank_cd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="blank_cd_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="blank_cd_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="autoburn"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">_Burn a CD or DVD when a blank disc is inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="autoburn_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkHBox" id="hbox73"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label32"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoburn_audio_cd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="label35"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Command for A_udio CDs:</property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoburn_audio_cd_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoburn_audio_cd_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to burn audio CDs</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoburn_audio_cd_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="hbox74"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label33"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoburn_data_cd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="label37"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Command for _Data CDs: </property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoburn_data_cd_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoburn_data_cd_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to burn data CDs</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoburn_data_cd_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">False</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="tab_expand">False</property> +- <property name="tab_fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkLabel" id="storage_tab_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Storage</property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="type">tab</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="multimedia_vbox"> +- <property name="border_width">12</property> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">18</property> +- +- <child> +- <widget class="GtkVBox" id="audio_cd_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="audio_cd_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Audio CD Discs</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="audio_cd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="audio_cd_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="audio_cd_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="autoplay_cda"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Play _audio CD discs when inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="hbox20"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label23"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoplay_cda_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="autoplay_cda_command_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">C_ommand:</property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_RIGHT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoplay_cda_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoplay_cda_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to play audio CDs</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoplay_cda_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">False</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="dvd_video_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="dvd_video_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Video DVD Discs</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="dvd_video_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="dvd_video_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="dvd_video_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="autoplay_dvd"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Play _video DVD discs when inserted</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="hbox21"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label24"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoplay_dvd_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="autoplay_dvd_command_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Comma_nd:</property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_RIGHT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoplay_dvd_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoplay_dvd_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to play DVDs</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoplay_dvd_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">False</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="ipod_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkLabel" id="ipod_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"><b>Portable Music Players</b></property> +- <property name="use_underline">False</property> +- <property name="use_markup">True</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="ipod_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkImage" id="ipod_image"> +- <property name="visible">True</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkVBox" id="ipod_options_vbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">6</property> +- +- <child> +- <widget class="GtkCheckButton" id="autoipod"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">Play _music files when connected</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="hbox72"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">0</property> +- +- <child> +- <widget class="GtkLabel" id="label30"> +- <property name="visible">True</property> +- <property name="label" translatable="yes"> </property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkHBox" id="autoipod_hbox"> +- <property name="visible">True</property> +- <property name="homogeneous">False</property> +- <property name="spacing">12</property> +- +- <child> +- <widget class="GtkLabel" id="autoipod_command_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Comman_d:</property> +- <property name="use_underline">True</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_RIGHT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="mnemonic_widget">autoipod_command</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> +- +- <child> +- <widget class="GnomeFileEntry" id="autoipod_command_fileentry"> +- <property name="visible">True</property> +- <property name="max_saved">10</property> +- <property name="browse_dialog_title" translatable="yes">Select program to play music files</property> +- <property name="directory_entry">False</property> +- <property name="modal">False</property> +- <property name="use_filechooser">True</property> +- <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property> +- +- <child internal-child="entry"> +- <widget class="GtkEntry" id="autoipod_command"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="editable">True</property> +- <property name="visibility">True</property> +- <property name="max_length">0</property> +- <property name="text" translatable="yes"></property> +- <property name="has_frame">True</property> +- <property name="invisible_char">*</property> +- <property name="activates_default">False</property> +- </widget> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">True</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">True</property> +- </packing> +- </child> +- </widget> +- <packing> +- <property name="tab_expand">False</property> +- <property name="tab_fill">True</property> +- </packing> +- </child> +- +- <child> +- <widget class="GtkLabel" id="multimedia_tab_label"> +- <property name="visible">True</property> +- <property name="label" translatable="yes">Multimedia</property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> +- <property name="width_chars">-1</property> +- <property name="single_line_mode">False</property> +- <property name="angle">0</property> +- </widget> +- <packing> +- <property name="type">tab</property> +- </packing> +- </child> +- +- <child> + <widget class="GtkVBox" id="cameras_vbox"> + <property name="border_width">12</property> + <property name="visible">True</property> +diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/src/manager.c gnome-volume-manager-2.22.1.new/src/manager.c +--- gnome-volume-manager-2.22.1/src/manager.c 2008-01-18 17:30:22.000000000 +0100 ++++ src/manager.c 2008-02-29 16:30:12.000000000 +0100 +@@ -625,6 +625,27 @@ + } + } + ++static gboolean ++filter_out_media_handling (gint key, gboolean value) ++{ ++ switch (key) { ++ case AUTOBROWSE: ++ case AUTOBURN: ++ case AUTOIPOD: ++ case AUTOMOUNT_DRIVES: ++ case AUTOMOUNT_MEDIA: ++ case AUTOOPEN: ++ case AUTOPLAY_CDA: ++ case AUTOPLAY_DVD: ++ case AUTOPLAY_VCD: ++ case AUTORUN: ++ return FALSE; ++ default: ++ return value; ++ } ++} ++ ++ + /* + * gvm_load_config - synchronize gconf => config structure + */ +@@ -644,7 +665,7 @@ + *((char **) gvm_settings[i].var) ? *((char **) gvm_settings[i].var): "NULL"); + } else if (gvm_settings[i].type == TYPE_BOOL) { + *((int *) gvm_settings[i].var) = +- gconf_client_get_bool (config.client, gvm_settings[i].key, NULL); ++ filter_out_media_handling (i, gconf_client_get_bool (config.client, gvm_settings[i].key, NULL)); + dbg ("setting[%d]: bool: %s = %d\n", i, strrchr (gvm_settings[i].key, '/') + 1, + *((int *) gvm_settings[i].var)); + } else if (gvm_settings[i].type == TYPE_FLOAT) { +@@ -693,7 +714,7 @@ + dbg ("setting changed: string: %s = %s\n", strrchr (gvm_settings[which].key, '/') + 1, + *((char **) gvm_settings[which].var)); + } else if (gvm_settings[which].type == TYPE_BOOL) { +- *((int *) gvm_settings[which].var) = gconf_value_get_bool (value); ++ *((int *) gvm_settings[which].var) = filter_out_media_handling (which, gconf_value_get_bool (value)); + dbg ("setting changed: bool: %s = %d\n", strrchr (gvm_settings[which].key, '/') + 1, + *((int *) gvm_settings[which].var)); + } else if (gvm_settings[which].type == TYPE_FLOAT) { +diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/src/properties.c gnome-volume-manager-2.22.1.new/src/properties.c +--- gnome-volume-manager-2.22.1/src/properties.c 2007-12-07 18:55:46.000000000 +0100 ++++ src/properties.c 2008-02-29 16:30:08.000000000 +0100 +@@ -36,77 +36,24 @@ + TYPE_STRING, + } type_t; + +-enum { +- AUTOBROWSE, +- AUTOBURN, +- AUTOBURN_AUDIO_CD_COMMAND, +- AUTOBURN_DATA_CD_COMMAND, +- AUTOIPOD, +- AUTOIPOD_COMMAND, +- AUTOKEYBOARD, +- AUTOKEYBOARD_COMMAND, +- AUTOMOUNT_DRIVES, +- AUTOMOUNT_MEDIA, +- AUTOMOUSE, +- AUTOMOUSE_COMMAND, +- AUTOOPEN, +- AUTOPHOTO, +- AUTOPHOTO_COMMAND, +- AUTOPILOT, +- AUTOPILOT_COMMAND, +- AUTOPLAY_CDA, +- AUTOPLAY_CDA_COMMAND, +- AUTOPLAY_DVD, +- AUTOPLAY_DVD_COMMAND, +- AUTOPOCKETPC, +- AUTOPOCKETPC_COMMAND, +- AUTOPRINTER, +- AUTOPRINTER_COMMAND, +- AUTORUN, +- AUTOSCANNER, +- AUTOSCANNER_COMMAND, +- AUTOTABLET, +- AUTOTABLET_COMMAND, +- AUTOVIDEOCAM, +- AUTOVIDEOCAM_COMMAND, +- AUTOWEBCAM, +- AUTOWEBCAM_COMMAND, +- AUTORUN_PATH, +- AUTOOPEN_PATH, +-}; +- + static struct { + char *key; + type_t type; + GtkWidget *widget; + gboolean need_daemon; + } gvm_settings[] = { +- { GCONF_ROOT "autobrowse", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "autoburn", TYPE_BOOL, NULL, FALSE }, +- { GCONF_ROOT "autoburn_audio_cd_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoburn_data_cd_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoipod", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "autoipod_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autokeyboard", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autokeyboard_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "automount_drives", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "automount_media", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "automouse", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "automouse_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoopen", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autophoto", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autophoto_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autopalmsync", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autopalmsync_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoplay_cda", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "autoplay_cda_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autoplay_dvd", TYPE_BOOL, NULL, TRUE }, +- { GCONF_ROOT "autoplay_dvd_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autopocketpc", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autopocketpc_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autoprinter", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autoprinter_command", TYPE_STRING, NULL, FALSE }, +- { GCONF_ROOT "autorun", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autoscanner", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autoscanner_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autotablet", TYPE_BOOL, NULL, TRUE }, +@@ -115,9 +62,6 @@ + { GCONF_ROOT "autovideocam_command", TYPE_STRING, NULL, FALSE }, + { GCONF_ROOT "autowebcam", TYPE_BOOL, NULL, TRUE }, + { GCONF_ROOT "autowebcam_command", TYPE_STRING, NULL, FALSE }, +- /* The following entries do not (yet) have a UI */ +- /*{ GCONF_ROOT "autorun_path", TYPE_STRING, NULL, FALSE },*/ +- /*{ GCONF_ROOT "autoopen_path", TYPE_STRING, NULL, FALSE },*/ + }; + + static GHashTable *gvm_settings_hash = NULL; +@@ -151,17 +95,10 @@ + gconf_client_set_bool (gconf, key, bool, NULL); + + name = strrchr (key, '/') + 1; +- if (!strncmp (name, "automount_", 10)) { +- bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_MEDIA].widget)) || +- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_DRIVES].widget)); +- gtk_widget_set_sensitive (gvm_settings[AUTOOPEN].widget, bool); +- gtk_widget_set_sensitive (gvm_settings[AUTORUN].widget, bool); +- } else { +- name = g_strdup_printf ("%s_hbox", name); +- if ((hbox = glade_xml_get_widget (xml, name))) +- gtk_widget_set_sensitive (hbox, bool); +- g_free (name); +- } ++ name = g_strdup_printf ("%s_hbox", name); ++ if ((hbox = glade_xml_get_widget (xml, name))) ++ gtk_widget_set_sensitive (hbox, bool); ++ g_free (name); + } + + static void +@@ -205,11 +142,6 @@ + gboolean bool; + size_t i; + +- /* this is the only strange one */ +- bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_MEDIA].widget)) || +- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_DRIVES].widget)); +- gtk_widget_set_sensitive (gvm_settings[AUTORUN].widget, bool); +- + /* checkboxes can enable/disable the ability to change other settings */ + for (i = 0; i < G_N_ELEMENTS (gvm_settings); i++) { + if (gvm_settings[i].type == TYPE_BOOL) { +@@ -277,17 +209,12 @@ + const char *icon; + const char *fallback; + } icons[] = { +- { "audio_cd_image", "gnome-dev-cdrom-audio", "media-optical" }, +- { "blank_cd_image", "gnome-dev-disc-cdr", "media-optical" }, + { "digital_camera_image", "camera-photo", NULL }, +- { "dvd_video_image", "gnome-dev-dvd", "media-optical" }, +- { "ipod_image", "multimedia-player", "gnome-dev-ipod" }, + { "keyboard_image", "input-keyboard", NULL }, + { "mouse_image", "input-mouse", NULL }, + { "palm_image", "pda-palm", "palm-pilot" }, + { "pocketpc_image", "pda-pocketpc", "palm-pilot" }, + { "printer_image", "printer", NULL }, +- { "removable_drives_image", "drive-removable-media", NULL }, + { "scanner_image", "scanner", NULL }, + { "tablet_image", "input-tablet", NULL }, + { "videocam_image", "camera-video", NULL }, diff --git a/sysutils/gnome-volume-manager/files/patch-src_properties.c b/sysutils/gnome-volume-manager/files/patch-src_properties.c deleted file mode 100644 index 5e8d72a2d61b..000000000000 --- a/sysutils/gnome-volume-manager/files/patch-src_properties.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/properties.c.orig Sat Jul 15 13:54:29 2006 -+++ src/properties.c Sat Jul 15 13:55:03 2006 -@@ -499,7 +499,11 @@ main (int argc, char **argv) - _("The \"hald\" service is required but not currently " - "running. Enable the service and rerun this application, " - "or contact your system administrator.\n\n" -+#ifndef __FreeBSD__ - "Note: You need Linux kernel 2.6 for volume " -+#else -+ "Note: You need sysutils/hal installed for volume " -+#endif - "management to work.")); - - gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist index 49ded72dd76e..a3d4526cf04b 100644 --- a/sysutils/gnome-volume-manager/pkg-plist +++ b/sysutils/gnome-volume-manager/pkg-plist @@ -1,12 +1,12 @@ -bin/gnome-volume-manager bin/gnome-volume-properties +etc/xdg/autostart/gnome-volume-manager.desktop +libexec/gnome-volume-manager share/applications/gnome-volume-properties.desktop -share/gnome/autostart/gnome-volume-manager.desktop -share/gnome-volume-manager/gnome-volume-properties.glade -share/gnome-volume-manager/icons/gvm-dev-tablet.png +%%DATADIR%%/gnome-volume-properties.glade share/locale/ang/LC_MESSAGES/gnome-volume-manager.mo share/locale/ar/LC_MESSAGES/gnome-volume-manager.mo share/locale/az/LC_MESSAGES/gnome-volume-manager.mo +share/locale/be@latin/LC_MESSAGES/gnome-volume-manager.mo share/locale/bg/LC_MESSAGES/gnome-volume-manager.mo share/locale/bn/LC_MESSAGES/gnome-volume-manager.mo share/locale/bn_IN/LC_MESSAGES/gnome-volume-manager.mo @@ -50,6 +50,7 @@ share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo share/locale/ne/LC_MESSAGES/gnome-volume-manager.mo share/locale/nl/LC_MESSAGES/gnome-volume-manager.mo share/locale/nn/LC_MESSAGES/gnome-volume-manager.mo +share/locale/oc/LC_MESSAGES/gnome-volume-manager.mo share/locale/or/LC_MESSAGES/gnome-volume-manager.mo share/locale/pa/LC_MESSAGES/gnome-volume-manager.mo share/locale/pl/LC_MESSAGES/gnome-volume-manager.mo @@ -58,6 +59,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-volume-manager.mo share/locale/ro/LC_MESSAGES/gnome-volume-manager.mo share/locale/ru/LC_MESSAGES/gnome-volume-manager.mo share/locale/rw/LC_MESSAGES/gnome-volume-manager.mo +share/locale/si/LC_MESSAGES/gnome-volume-manager.mo 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 @@ -65,6 +67,7 @@ share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo share/locale/sr@Latn/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 share/locale/th/LC_MESSAGES/gnome-volume-manager.mo share/locale/tr/LC_MESSAGES/gnome-volume-manager.mo share/locale/uk/LC_MESSAGES/gnome-volume-manager.mo @@ -73,14 +76,22 @@ share/locale/xh/LC_MESSAGES/gnome-volume-manager.mo share/locale/zh_CN/LC_MESSAGES/gnome-volume-manager.mo share/locale/zh_HK/LC_MESSAGES/gnome-volume-manager.mo share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo -@dirrm share/gnome-volume-manager/icons -@dirrm share/gnome-volume-manager +@dirrm %%DATADIR%% +@dirrmtry share/applications +@dirrmtry etc/xdg/autostart +@dirrmtry etc/xdg @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/mg/LC_MESSAGES @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @@ -89,6 +100,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.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/ang/LC_MESSAGES @dirrmtry share/locale/ang -@dirrmtry share/applications diff --git a/sysutils/gstreamer-plugins-hal/Makefile b/sysutils/gstreamer-plugins-hal/Makefile index c83708436bd9..9ed2ed3d3e1e 100644 --- a/sysutils/gstreamer-plugins-hal/Makefile +++ b/sysutils/gstreamer-plugins-hal/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gstreamer-plugins-hal/Makefile,v 1.1 2006/05/17 12:29:05 ahze Exp $ +# $MCom: ports/sysutils/gstreamer-plugins-hal/Makefile,v 1.6 2008/03/19 14:05:38 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils COMMENT= Gstreamer hal plugin diff --git a/sysutils/hal-device-manager/Makefile b/sysutils/hal-device-manager/Makefile deleted file mode 100644 index eaf3a019a88f..000000000000 --- a/sysutils/hal-device-manager/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# New ports collection makefile for: hal-device-manager -# Date created: 2006-05-18 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/sysutils/hal-device-manager/Makefile,v 1.3 2006/05/18 22:15:41 ahze Exp $ - -PORTREVISION= 1 -CATEGORIES= sysutils gnome -PKGNAMESUFFIX= -device-manager - -MAINTAINER= gnome@FreeBSD.org -COMMENT= HAL device manager - -HAL_SLAVE= yes - -MASTERDIR= ${.CURDIR}/../../sysutils/hal -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/hal-device-manager/pkg-plist b/sysutils/hal-device-manager/pkg-plist deleted file mode 100644 index b00763e2edd5..000000000000 --- a/sysutils/hal-device-manager/pkg-plist +++ /dev/null @@ -1,39 +0,0 @@ -bin/hal-device-manager -%%DATADIR%%/device-manager/Const.py -%%DATADIR%%/device-manager/Const.pyc -%%DATADIR%%/device-manager/Const.pyo -%%DATADIR%%/device-manager/Device.py -%%DATADIR%%/device-manager/Device.pyc -%%DATADIR%%/device-manager/Device.pyo -%%DATADIR%%/device-manager/DeviceManager.py -%%DATADIR%%/device-manager/DeviceManager.pyc -%%DATADIR%%/device-manager/DeviceManager.pyo -%%DATADIR%%/device-manager/GtkAttributesFacade.py -%%DATADIR%%/device-manager/GtkAttributesFacade.pyc -%%DATADIR%%/device-manager/GtkAttributesFacade.pyo -%%DATADIR%%/device-manager/LibGladeApplication.py -%%DATADIR%%/device-manager/LibGladeApplication.pyc -%%DATADIR%%/device-manager/LibGladeApplication.pyo -%%DATADIR%%/device-manager/Representation.py -%%DATADIR%%/device-manager/Representation.pyc -%%DATADIR%%/device-manager/Representation.pyo -%%DATADIR%%/device-manager/fdo-logo.png -%%DATADIR%%/device-manager/hal-abstract.png -%%DATADIR%%/device-manager/hal-audio.png -%%DATADIR%%/device-manager/hal-bus-pci.png -%%DATADIR%%/device-manager/hal-bus-usb.png -%%DATADIR%%/device-manager/hal-camera.png -%%DATADIR%%/device-manager/hal-cat-cardbus.png -%%DATADIR%%/device-manager/hal-cat-keyboard.png -%%DATADIR%%/device-manager/hal-cat-mouse.png -%%DATADIR%%/device-manager/hal-cdrom.png -%%DATADIR%%/device-manager/hal-computer.png -%%DATADIR%%/device-manager/hal-device-manager.glade -%%DATADIR%%/device-manager/hal-flash.png -%%DATADIR%%/device-manager/hal-floppy.png -%%DATADIR%%/device-manager/hal-harddisk.png -%%DATADIR%%/device-manager/hal-network.png -%%DATADIR%%/device-manager/hal-serial-port.png -%%DATADIR%%/device-manager/hal-unknown.png -%%DATADIR%%/device-manager/hal-video.png -@dirrm %%DATADIR%%/device-manager diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile new file mode 100644 index 000000000000..7bcba489a709 --- /dev/null +++ b/sysutils/hal-info/Makefile @@ -0,0 +1,28 @@ +# New ports collection makefile for: hal-info +# Date Created: 25 January 2008 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/hal-info/Makefile,v 1.3 2008/03/17 22:31:58 marcus Exp $ +# + +PORTNAME= hal-info +PORTVERSION= 20080317 +CATEGORIES= sysutils +MASTER_SITES= http://hal.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Additional FDI files to further classify HAL devices + +LIB_PC_DEPENDS= hal.pc:${PORTSDIR}/sysutils/hal + +BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} +RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} + +USE_GMAKE= yes +USE_GNOME= gnomehack gnometarget +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/sysutils/hal-info/distinfo b/sysutils/hal-info/distinfo new file mode 100644 index 000000000000..a058eaa17f47 --- /dev/null +++ b/sysutils/hal-info/distinfo @@ -0,0 +1,3 @@ +MD5 (hal-info-20080317.tar.gz) = 4cde7ff94f660879c44da17eb525edfd +SHA256 (hal-info-20080317.tar.gz) = b6e3c45cb7929ed66eb154f28b7f89b6e36a9a6645a37f583f8b7c7e29322405 +SIZE (hal-info-20080317.tar.gz) = 184704 diff --git a/sysutils/hal-info/files/patch-configure b/sysutils/hal-info/files/patch-configure new file mode 100644 index 000000000000..0a70073241be --- /dev/null +++ b/sysutils/hal-info/files/patch-configure @@ -0,0 +1,83 @@ +--- configure.orig 2008-03-17 18:27:34.000000000 -0400 ++++ configure 2008-03-17 18:28:11.000000000 -0400 +@@ -3436,7 +3436,7 @@ else + enable_recall=yes + fi + +- if test x$enable_recall == xyes; then ++ if test x$enable_recall = xyes; then + BUILD_RECALL_TRUE= + BUILD_RECALL_FALSE='#' + else +@@ -3452,7 +3452,7 @@ else + enable_video=yes + fi + +- if test x$enable_video == xyes; then ++ if test x$enable_video = xyes; then + BUILD_VIDEO_TRUE= + BUILD_VIDEO_FALSE='#' + else +@@ -3468,7 +3468,7 @@ else + enable_keymaps=yes + fi + +- if test x$enable_keymaps == xyes; then ++ if test x$enable_keymaps = xyes; then + BUILD_KEYMAPS_TRUE= + BUILD_KEYMAPS_FALSE='#' + else +@@ -3484,7 +3484,7 @@ else + enable_killswitch_dell_wlan=yes + fi + +- if test x$enable_killswitch_dell_wlan == xyes; then ++ if test x$enable_killswitch_dell_wlan = xyes; then + BUILD_KILLSWITCH_DELL_WLAN_TRUE= + BUILD_KILLSWITCH_DELL_WLAN_FALSE='#' + else +@@ -3500,7 +3500,7 @@ else + enable_killswitch_dell_bluetooth=yes + fi + +- if test x$enable_killswitch_dell_bluetooth == xyes; then ++ if test x$enable_killswitch_dell_bluetooth = xyes; then + BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE= + BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE='#' + else +@@ -3516,7 +3516,7 @@ else + enable_killswitch_dell_wwan=yes + fi + +- if test x$enable_killswitch_dell_wwan == xyes; then ++ if test x$enable_killswitch_dell_wwan = xyes; then + BUILD_KILLSWITCH_DELL_WWAN_TRUE= + BUILD_KILLSWITCH_DELL_WWAN_FALSE='#' + else +@@ -3532,7 +3532,7 @@ else + enable_killswitch_sony_bluetooth=yes + fi + +- if test x$enable_killswitch_sony_bluetooth == xyes; then ++ if test x$enable_killswitch_sony_bluetooth = xyes; then + BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE= + BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE='#' + else +@@ -3548,7 +3548,7 @@ else + enable_killswitch_thinkpad_bluetooth=yes + fi + +- if test x$enable_killswitch_thinkpad_bluetooth == xyes; then ++ if test x$enable_killswitch_thinkpad_bluetooth = xyes; then + BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE= + BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE='#' + else +@@ -3564,7 +3564,7 @@ else + enable_killswitch_ipw_wlan=yes + fi + +- if test x$enable_killswitch_ipw_wlan == xyes; then ++ if test x$enable_killswitch_ipw_wlan = xyes; then + BUILD_KILLSWITCH_IPW_WLAN_TRUE= + BUILD_KILLSWITCH_IPW_WLAN_FALSE='#' + else diff --git a/sysutils/hal-info/pkg-descr b/sysutils/hal-info/pkg-descr new file mode 100644 index 000000000000..dd42292fcc44 --- /dev/null +++ b/sysutils/hal-info/pkg-descr @@ -0,0 +1,3 @@ +hal-info contains device information for HAL. + +WWW: http://www.freedesktop.org/Software/hal diff --git a/sysutils/hal-info/pkg-plist b/sysutils/hal-info/pkg-plist new file mode 100644 index 000000000000..b48a5514f0db --- /dev/null +++ b/sysutils/hal-info/pkg-plist @@ -0,0 +1,44 @@ +share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi +share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi +share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi +share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi +share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi +share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi +share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi +share/hal/fdi/information/10freedesktop/10-modem.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi +share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi +share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi +share/hal/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi +share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi +share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi +share/hal/fdi/information/10freedesktop/10-usb-pda.fdi +share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi +share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi +share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi +share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi +share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi +share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi +share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi +share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi +share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi +share/hal/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi +share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi +share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi +share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi +share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 32042dbb14b3..f757a5167fc7 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,25 +3,23 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.26 2006/10/13 10:00:57 ahze Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.43 2008/03/22 19:31:15 marcus Exp $ # PORTNAME= hal -PORTVERSION= ${HALVERSION}.${SNAPVERSION} -PORTREVISION?= 0 -CATEGORIES?= sysutils -MASTER_SITES= http://www.marcuscom.com/downloads/ +DISTVERSION= 0.5.11rc2 +PORTREVISION= 3 +CATEGORIES= sysutils +MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org -COMMENT?= Hardware Abstraction Layer for simplifying device access +COMMENT= Hardware Abstraction Layer for simplifying device access -.if !defined(HAL_SLAVE) -LIB_DEPENDS= polkit.0:${PORTSDIR}/sysutils/policykit \ - volume_id.0:${PORTSDIR}/devel/libvolume_id +LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \ + volume_id.0:${PORTSDIR}/devel/libvolume_id \ + ck-connector.0:${PORTSDIR}/sysutils/consolekit RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids -.endif -USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget intlhack ltverhack @@ -29,56 +27,47 @@ USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes USE_PYTHON= yes CONFIGURE_ARGS= --disable-gtk-doc \ - --with-hwdata=${LOCALBASE}/share/pciids \ --with-backend=freebsd \ --disable-docbook-docs \ + --with-pci-ids=${LOCALBASE}/share/pciids \ + --disable-usb-ids \ + --without-libpci \ + --disable-usb \ + --disable-smbios \ + --disable-apm \ + --disable-pmu \ + --enable-policy-kit \ + --enable-console-kit \ --with-socket-dir=/var/run/hald \ - --with-pid-file=/var/run/hald/hald.pid + --with-eject=/usr/sbin/cdcontrol \ + --with-pid-file=/var/run/hald/hald.pid \ + --with-deprecated-keys \ + --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" -HALVERSION= 0.5.8 -SNAPVERSION= 20080203 +#HALVERSION= 0.5.10 +#SNAPVERSION= 20080218 -.if !defined(HAL_SLAVE) USE_RC_SUBR= hald USE_GNOME_SUBR= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${HALVERSION} PLIST_SUB= VERSION=${HALVERSION} -PRIV_FILES= hal-power-hibernate \ - hal-power-poweroff \ - hal-power-reboot \ - hal-power-suspend \ - hal-storage-fixed-mount-change-uid \ - hal-storage-fixed-mount \ - hal-storage-removable-mount-change-uid \ - hal-storage-removable-mount -PRIV_FILES:= ${PRIV_FILES:S|$|.privilege|} - -RC_FILES= hal.conf:${PREFIX}/etc/dbus-1/system.d \ - ${PRIV_FILES:S|$|:${PREFIX}/etc/PolicyKit/privilege.d|} +RC_FILES= hal.conf:${PREFIX}/etc/dbus-1/system.d PLIST_FILES= ${PRIV_FILES:S|^|%%DATADIR%%/dist/|} SUB_FILES= pkg-install pkg-deinstall SUB_LIST= RC_FILES="${RC_FILES}" +MAN1= hal-disable-polling.1 hal-find-by-capability.1 \ + hal-find-by-property.1 hal-get-property.1 \ + hal-is-caller-locked-out.1 hal-is-caller-privileged.1 \ + hal-lock.1 hal-set-property.1 lshal.1 +MAN8= hald.8 + OPTIONS= FIXED_MOUNTPOINTS "use fixed mountpoints" off -.else # Slave port stuff -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus - -USE_GNOME+= pygnome2 -DESKTOP_ENTRIES="Device Manager" \ - "Examine your devices" \ - "${DATADIR}/device-manager/hal-bus-pci.png" \ - "hal-device-manager" \ - "Application;System;" \ - true -BUILD_WRKSRC= ${WRKSRC}/tools/device-manager -INSTALL_WRKSRC= ${BUILD_WRKSRC} -.endif .include <bsd.port.pre.mk> @@ -86,7 +75,6 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} IGNORE= not supported on FreeBSD prior to 5.5-RELEASE .endif -.if !defined(HAL_SLAVE) .if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64") RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif @@ -101,38 +89,28 @@ PLIST_SUB+= MEDIA="@comment " .if defined(WITH_FIXED_MOUNTPOINTS) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c .endif -.endif post-patch: -.if !defined(HAL_SLAVE) - @${REINPLACE_CMD} -e 's|device-manager||' \ - ${WRKSRC}/tools/Makefile.in -.endif @${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \ ${WRKSRC}/tools/Makefile.in \ ${WRKSRC}/tools/freebsd/Makefile.in @${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \ ${WRKSRC}/hald/Makefile.in - @${REINPLACE_CMD} -e '/^SUBDIRS/ s|txt||' \ - ${WRKSRC}/policy/Makefile.in @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \ ${WRKSRC}/hal.conf.in - @${TOUCH} ${WRKSRC}/doc/spec/hal-spec.html post-install: -.if !defined(HAL_SLAVE) ${MKDIR} ${DATADIR}/dist - ${INSTALL_DATA} ${WRKSRC}/hal.conf ${WRKSRC}/policy/txt/*.privilege \ - ${DATADIR}/dist + ${INSTALL_DATA} ${WRKSRC}/hal.conf ${DATADIR}/dist @${SETENV} PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(PACKAGE_BUILDING) && defined(NEEDS_MEDIA) ${MKDIR} /media .endif .if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \ ${DOCSDIR}/README.freebsd .endif -.endif .include <bsd.port.post.mk> diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index 8988c420cd0e..1c49bac643a4 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,3 +1,3 @@ -MD5 (hal-0.5.8.20080203.tar.bz2) = 2bdd6f8dd009b8173808494c3e98b6f4 -SHA256 (hal-0.5.8.20080203.tar.bz2) = e189038d6406486534264957e0f68af32b80b36291873ed43ceb47c238513245 -SIZE (hal-0.5.8.20080203.tar.bz2) = 1366915 +MD5 (hal-0.5.11rc2.tar.gz) = ade962044a62e8f2dc4625a17f4a5c7e +SHA256 (hal-0.5.11rc2.tar.gz) = 3937d2ab06c091d0b5d604f7615096be505455448cc13635ebdba169d29b4bdc +SIZE (hal-0.5.11rc2.tar.gz) = 1665175 diff --git a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c index ce9895f941a4..82a7fb6070e0 100644 --- a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c +++ b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c @@ -1,30 +1,30 @@ ---- tools/hal-storage-mount.c.orig Sun May 14 20:57:59 2006 -+++ tools/hal-storage-mount.c Sat Apr 7 12:50:53 2007 -@@ -513,23 +513,11 @@ - explicit_mount_point_given = FALSE; - if (strlen (mount_point) == 0) { - char *p; -- const char *label; -+ char *basename; - -- if (volume != NULL) -- label = libhal_volume_get_label (volume); -- else -- label = NULL; -- -- if (label != NULL) { -- /* best - use label */ -- g_strlcpy (mount_point, label, sizeof (mount_point)); -- -- /* TODO: use drive type */ -- -- } else { -- /* fallback - use "disk" */ -- g_snprintf (mount_point, sizeof (mount_point), "disk"); -- } -+ basename = g_path_get_basename (device); -+ g_strlcpy (mount_point, basename, sizeof (mount_point)); -+ g_free (basename); - - /* sanitize computed mount point name, e.g. replace invalid chars with '-' */ - p = mount_point; +--- tools/hal-storage-mount.c.orig 2008-01-03 21:10:54.000000000 -0500 ++++ tools/hal-storage-mount.c 2008-01-04 09:29:10.000000000 -0500 +@@ -583,23 +583,11 @@ handle_mount (LibHalContext *hal_ctx, + explicit_mount_point_given = FALSE; + if (strlen (mount_point) == 0) { + char *p; +- const char *label; ++ char *basename; + +- if (volume != NULL) +- label = libhal_volume_get_label (volume); +- else +- label = NULL; +- +- if (label != NULL) { +- /* best - use label */ +- g_strlcpy (mount_point, label, sizeof (mount_point)); +- +- /* TODO: use drive type */ +- +- } else { +- /* fallback - use "disk" */ +- g_snprintf (mount_point, sizeof (mount_point), "%s", "disk"); +- } ++ basename = g_path_get_basename (device); ++ g_strlcpy (mount_point, basename, sizeof (mount_point)); ++ g_free (basename); + + /* sanitize computed mount point name, e.g. replace invalid chars with '-' */ + p = mount_point; diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index ab906a516f30..7f8f2c659c86 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: hald -# REQUIRE: DAEMON usbd devd dbus polkitd +# REQUIRE: DAEMON usbd devd dbus # # Add the following line to /etc/rc.conf to enable the HAL daemon: # @@ -24,6 +24,7 @@ pidfile="/var/run/${name}/${name}.pid" stop_postcmd="hald_postcmd" start_precmd="hald_precmd" +start_cmd="hald_start" local_force_depend() { @@ -46,10 +47,7 @@ hald_precmd() local_force_depend dbus || return 1 fi - if ! checkyesno polkitd_enable - then - local_force_depend polkitd || return 1 - fi + chmod 0755 /var/cache mkdir -p $(dirname $pidfile) } @@ -59,5 +57,23 @@ hald_postcmd() rm -f $pidfile } +hald_start() +{ + if ! checkyesno hald_enable ; then + return 0 + fi + echo "Starting ${name}." + + ( iter=0 + while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do + if [ ${iter} -eq 60 ]; then + break + fi + sleep 1 + iter=$(expr ${iter} + 1) + done + ${command} ${hald_flags} ) & +} + load_rc_config ${name} run_rc_command "$1" diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in index 27219f54c076..17d23980f55c 100644 --- a/sysutils/hal/files/patch-Makefile.in +++ b/sysutils/hal/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Thu May 4 15:35:41 2006 -+++ Makefile.in Thu May 4 15:36:40 2006 -@@ -377,14 +377,14 @@ distclean-libtool: +--- Makefile.in.orig 2008-01-03 21:28:32.000000000 -0500 ++++ Makefile.in 2008-01-03 21:29:15.000000000 -0500 +@@ -311,14 +311,14 @@ clean-libtool: + distclean-libtool: -rm -f libtool - uninstall-info-am: install-dist_dbusDATA: $(dist_dbus_DATA) - @$(NORMAL_INSTALL) -- test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)" +- test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" - @list='$(dist_dbus_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ @@ -13,7 +13,7 @@ - $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \ - done +# @$(NORMAL_INSTALL) -+# test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)" ++# test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" +# @list='$(dist_dbus_DATA)'; for p in $$list; do \ +# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +# f=$(am__strip_dir) \ diff --git a/sysutils/hal/files/patch-doc_Makefile.in b/sysutils/hal/files/patch-doc_Makefile.in index d05f0136ccbf..9cd951720ede 100644 --- a/sysutils/hal/files/patch-doc_Makefile.in +++ b/sysutils/hal/files/patch-doc_Makefile.in @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Tue May 2 01:04:31 2006 -+++ doc/Makefile.in Tue May 2 01:04:42 2006 -@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- doc/Makefile.in.orig 2008-01-03 21:41:19.000000000 -0500 ++++ doc/Makefile.in 2008-01-03 21:41:31.000000000 -0500 +@@ -203,7 +203,7 @@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ EXTRA_DIST = TODO --SUBDIRS = api spec conf -+SUBDIRS = spec conf - all: all-recursive - - .SUFFIXES: +-SUBDIRS = api spec man ++SUBDIRS = spec man + MAINTAINERCLEANFILES = \ + *~ \ + Makefile.in diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c new file mode 100644 index 000000000000..ebeeb072c7af --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c @@ -0,0 +1,135 @@ +--- hald/freebsd/addons/addon-storage.c.orig 2008-03-17 17:25:16.000000000 -0400 ++++ hald/freebsd/addons/addon-storage.c 2008-03-22 03:25:19.000000000 -0400 +@@ -150,6 +150,34 @@ hf_addon_storage_update (void) + return has_media; + } + ++static boolean ++poll_for_media (void) ++{ ++ boolean has_media; ++ ++ has_media = hf_addon_storage_update(); ++ if (has_media != addon.had_media) ++ { ++ /* ++ * FIXME: if the media was removed, we should force-unmount ++ * all its child volumes (see linux2/addons/addon-storage.c). ++ * However, currently (FreeBSD 6.0) umount -f is broken and ++ * can cause kernel panics. When I tried to umount -f a ++ * flash card after removing it, it failed with EAGAIN. It ++ * continued to fail after I inserted the card. The system ++ * then hung while rebooting and did not unmount my other ++ * filesystems. ++ */ ++ ++ libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error); ++ dbus_error_free(&hfp_error); ++ addon.had_media = has_media; ++ ++ return TRUE; ++ } ++ return FALSE; ++} ++ + static void + update_proc_title (const char *device, boolean polling_enabled) + { +@@ -159,6 +187,29 @@ update_proc_title (const char *device, b + setproctitle("no polling on %s because it is explicitly disabled", device); + } + ++static DBusHandlerResult ++filter_function (DBusConnection *connection, DBusMessage *message, void *user_data) ++{ ++ if (dbus_message_is_method_call(message, ++ "org.freedesktop.Hal.Device.Storage.Removable", ++ "CheckForMedia")) ++ { ++ DBusMessage *reply; ++ dbus_bool_t had_effect; ++ ++ hfp_info("Forcing poll for media becusse CheckForMedia() was called"); ++ ++ had_effect = poll_for_media(); ++ ++ reply = dbus_message_new_method_return (message); ++ dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID); ++ dbus_connection_send(connection, reply, NULL); ++ dbus_message_unref(reply); ++ } ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++} ++ + int + main (int argc, char **argv) + { +@@ -202,13 +253,30 @@ main (int argc, char **argv) + ! strcmp(driver, "cd")))) && ! strcmp(removable, "true"); + addon.had_media = hf_addon_storage_update(); + ++ if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error)) ++ goto end; ++ dbus_error_free(&hfp_error); ++ + connection = libhal_ctx_get_dbus_connection(hfp_ctx); + assert(connection != NULL); ++ dbus_connection_set_exit_on_disconnect(connection, 0); ++ dbus_connection_add_filter(connection, filter_function, NULL, NULL); + +- while (TRUE) ++ if (! libhal_device_claim_interface(hfp_ctx, ++ hfp_udi, ++ "org.freedesktop.Hal.Device.Storage.Removable", ++ " <method name=\"CheckForMedia\">\n" ++ " <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n" ++ " </method>\n", ++ &hfp_error)) + { +- boolean has_media; ++ hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'"); ++ goto end; ++ } ++ dbus_error_free(&hfp_error); + ++ while (TRUE) ++ { + /* process dbus traffic until update interval has elapsed */ + while (TRUE) + { +@@ -225,7 +293,7 @@ main (int argc, char **argv) + if (timeout.tv_sec < 0) /* current time went backwards */ + timeout = addon.update_interval; + +- dbus_connection_read_write(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000); ++ dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000); + if (! dbus_connection_get_is_connected(connection)) + goto end; + } +@@ -239,24 +307,7 @@ main (int argc, char **argv) + + if (should_poll) + { +- has_media = hf_addon_storage_update(); +- if (has_media != addon.had_media) +- { +- /* +- * FIXME: if the media was removed, we should force-unmount +- * all its child volumes (see linux2/addons/addon-storage.c). +- * However, currently (FreeBSD 6.0) umount -f is broken and +- * can cause kernel panics. When I tried to umount -f a +- * flash card after removing it, it failed with EAGAIN. It +- * continued to fail after I inserted the card. The system +- * then hung while rebooting and did not unmount my other +- * filesystems. +- */ +- +- libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error); +- dbus_error_free(&hfp_error); +- addon.had_media = has_media; +- } ++ poll_for_media(); + } + else + { diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c new file mode 100644 index 000000000000..598ac6283341 --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c @@ -0,0 +1,12 @@ +--- hald/freebsd/hf-scsi.c.orig 2008-03-18 15:58:59.000000000 -0400 ++++ hald/freebsd/hf-scsi.c 2008-03-18 15:57:36.000000000 -0400 +@@ -409,8 +409,8 @@ hf_scsi_handle_pending_device (struct de + */ + hf_block_device_complete(block_device, block_device, FALSE); + +- hf_storage_device_probe(block_device, FALSE); + hf_device_add(block_device); ++ hf_storage_device_probe(block_device, FALSE); + } + } + } diff --git a/sysutils/hal/files/patch-tools_Makefile.in b/sysutils/hal/files/patch-tools_Makefile.in deleted file mode 100644 index c5ce9282732e..000000000000 --- a/sysutils/hal/files/patch-tools_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/Makefile.in.orig Tue May 2 20:23:05 2006 -+++ tools/Makefile.in Tue May 2 20:23:22 2006 -@@ -325,7 +325,7 @@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = freebsd linux device-manager -+SUBDIRS = freebsd device-manager - INCLUDES = \ - -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ - -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \ diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in index 2cfda5753d4c..72b67ff95936 100644 --- a/sysutils/hal/files/pkg-install.in +++ b/sysutils/hal/files/pkg-install.in @@ -34,6 +34,8 @@ if [ -z "${PACKAGE_BUILDING}" ]; then fi /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald + /usr/bin/install -d -o ${USER} -g ${GROUP} /var/cache/hald + /usr/bin/install -d -o ${USER} -g ${GROUP} /var/lib/hal fi for pair in %%RC_FILES%%; do diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist index 6b0d1e7589aa..3b60cfa41a2f 100644 --- a/sysutils/hal/pkg-plist +++ b/sysutils/hal/pkg-plist @@ -1,9 +1,13 @@ @unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true %%MEDIA%%@exec mkdir -p /media bin/hal-device +bin/hal-disable-polling bin/hal-find-by-capability bin/hal-find-by-property bin/hal-get-property +bin/hal-is-caller-locked-out +bin/hal-is-caller-privileged +bin/hal-lock bin/hal-set-property bin/lshal @exec mkdir -p %D/etc/hal/fdi/preprobe @@ -25,32 +29,40 @@ lib/libhald_freebsd_probe.so lib/libhald_freebsd_probe.so.0 libdata/pkgconfig/hal-storage.pc libdata/pkgconfig/hal.pc +libexec/hal-storage-cleanup-all-mountpoints +libexec/hal-storage-cleanup-mountpoint +libexec/hal-storage-closetray +libexec/hal-storage-eject libexec/hal-storage-mount -libexec/hal-system-power-pmu +libexec/hal-storage-unmount +libexec/hal-system-power-pm-is-supported +libexec/hal-system-setserial +libexec/hal/scripts/freebsd/hal-system-lcd-get-brightness-freebsd +libexec/hal/scripts/freebsd/hal-system-lcd-set-brightness-freebsd +libexec/hal/scripts/freebsd/hal-system-power-reboot-freebsd +libexec/hal/scripts/freebsd/hal-system-power-set-power-save-freebsd +libexec/hal/scripts/freebsd/hal-system-power-shutdown-freebsd +libexec/hal/scripts/freebsd/hal-system-power-suspend-freebsd +libexec/hal/scripts/hal-dockstation-undock +libexec/hal/scripts/hal-functions libexec/hal/scripts/hal-luks-remove libexec/hal/scripts/hal-luks-setup libexec/hal/scripts/hal-luks-teardown +libexec/hal/scripts/hal-system-killswitch-get-power +libexec/hal/scripts/hal-system-killswitch-set-power libexec/hal/scripts/hal-system-lcd-get-brightness -libexec/hal/scripts/hal-system-lcd-get-brightness-freebsd libexec/hal/scripts/hal-system-lcd-set-brightness -libexec/hal/scripts/hal-system-lcd-set-brightness-freebsd libexec/hal/scripts/hal-system-power-hibernate libexec/hal/scripts/hal-system-power-reboot -libexec/hal/scripts/hal-system-power-reboot-freebsd libexec/hal/scripts/hal-system-power-set-power-save -libexec/hal/scripts/hal-system-power-set-power-save-freebsd libexec/hal/scripts/hal-system-power-shutdown -libexec/hal/scripts/hal-system-power-shutdown-freebsd libexec/hal/scripts/hal-system-power-suspend -libexec/hal/scripts/hal-system-power-suspend-freebsd -libexec/hal/scripts/hal-system-storage-cleanup-mountpoint -libexec/hal/scripts/hal-system-storage-cleanup-mountpoints -libexec/hal/scripts/hal-system-storage-cleanup-mountpoints-freebsd -libexec/hal/scripts/hal-system-storage-eject -libexec/hal/scripts/hal-system-storage-eject-freebsd -libexec/hal/scripts/hal-system-storage-unmount -libexec/hal/scripts/hal-system-storage-unmount-freebsd +libexec/hal/scripts/hal-system-power-suspend-hybrid +libexec/hal/scripts/hal-system-wol-enable +libexec/hal/scripts/hal-system-wol-enabled +libexec/hal/scripts/hal-system-wol-supported libexec/hald-addon-storage +libexec/hald-generate-fdi-cache libexec/hald-probe-hiddev libexec/hald-probe-scsi libexec/hald-probe-smbios @@ -59,57 +71,28 @@ libexec/hald-probe-volume libexec/hald-runner sbin/hald %%PORTDOCS%%%%DOCSDIR%%/README.freebsd -%%DOCSDIR%%/conf/match-USB-camera.fdi -%%DOCSDIR%%/conf/match-USB-mp3-player.fdi -%%DOCSDIR%%/conf/match-cardreader.fdi -%%DOCSDIR%%/conf/storage-non-fixed.fdi -%%DOCSDIR%%/conf/storage-policy-examples.fdi -%%DOCSDIR%%/conf/storage-skip-all.fdi %%DATADIR%%/dist/hal.conf %%DATADIR%%/fdi/fdi.dtd -%%DATADIR%%/fdi/fdi.rng -%%DATADIR%%/fdi/information/10freedesktop/10-camera-ptp.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-cd-dvd-burner.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-usb-card-readers.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-usb-music-players.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-usb-pda.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-usb-zip-drives.fdi -%%DATADIR%%/fdi/information/10freedesktop/10-wireless-mice.fdi +%%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.fdi @exec mkdir -p %D/%%DATADIR%%/fdi/information/20thirdparty -%%DATADIR%%/fdi/policy/10osvendor/10-keyboard-policy.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-dockstation.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-input-policy.fdi %%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi %%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi -%%DATADIR%%/fdi/policy/10osvendor/10-toshiba-buttons.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-rfkill-switch.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-tabletPCs.fdi +%%DATADIR%%/fdi/policy/10osvendor/10-x11-input.fdi %%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi %%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi +%%DATADIR%%/fdi/policy/10osvendor/30-wol.fdi +share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy +share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy +share/PolicyKit/policy/org.freedesktop.hal.policy +share/PolicyKit/policy/org.freedesktop.hal.power-management.policy +share/PolicyKit/policy/org.freedesktop.hal.storage.policy +share/PolicyKit/policy/org.freedesktop.hal.wol.policy @exec mkdir -p %D/%%DATADIR%%/fdi/policy/20thirdparty -%%DATADIR%%/fdi/preprobe/10osvendor/10-ide-drives.fdi @exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/20thirdparty -share/locale/cs/LC_MESSAGES/hal.mo -share/locale/da/LC_MESSAGES/hal.mo -share/locale/de/LC_MESSAGES/hal.mo -share/locale/el/LC_MESSAGES/hal.mo -share/locale/es/LC_MESSAGES/hal.mo -share/locale/eu/LC_MESSAGES/hal.mo -share/locale/fi/LC_MESSAGES/hal.mo -share/locale/fr/LC_MESSAGES/hal.mo -share/locale/hu/LC_MESSAGES/hal.mo -share/locale/it/LC_MESSAGES/hal.mo -share/locale/ja/LC_MESSAGES/hal.mo -share/locale/km/LC_MESSAGES/hal.mo -share/locale/ko/LC_MESSAGES/hal.mo -share/locale/lt/LC_MESSAGES/hal.mo -share/locale/nb/LC_MESSAGES/hal.mo -share/locale/nl/LC_MESSAGES/hal.mo -share/locale/pa/LC_MESSAGES/hal.mo -share/locale/pl/LC_MESSAGES/hal.mo -share/locale/pt/LC_MESSAGES/hal.mo -share/locale/pt_BR/LC_MESSAGES/hal.mo -share/locale/ru/LC_MESSAGES/hal.mo -share/locale/sl_SI/LC_MESSAGES/hal.mo -share/locale/uk/LC_MESSAGES/hal.mo -share/locale/zh_CN/LC_MESSAGES/hal.mo -share/locale/zh_TW/LC_MESSAGES/hal.mo @dirrm %%DATADIR%%/fdi/preprobe/20thirdparty @dirrm %%DATADIR%%/fdi/preprobe/10osvendor @dirrm %%DATADIR%%/fdi/preprobe @@ -122,8 +105,8 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo @dirrm %%DATADIR%%/fdi @dirrm %%DATADIR%%/dist @dirrm %%DATADIR%% -@dirrm %%DOCSDIR%%/conf @dirrm %%DOCSDIR%% +@dirrm libexec/hal/scripts/freebsd @dirrm libexec/hal/scripts @dirrm libexec/hal @dirrm include/hal @@ -136,8 +119,8 @@ share/locale/zh_TW/LC_MESSAGES/hal.mo @unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true @unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true @unexec rmdir /var/run/hald 2>/dev/null || true -@dirrmtry share/locale/sl_SI/LC_MESSAGES -@dirrmtry share/locale/sl_SI -@dirrmtry share/locale/km/LC_MESSAGES -@dirrmtry share/locale/km +@unexec rmdir /var/cache/hald 2>/dev/null || true +@unexec rmdir /var/cache 2>/dev/null || true +@unexec /var/lib/hal 2>/dev/null || true +@unexec /var/lib 2>/dev/null || true %%MEDIA%%@unexec rmdir /media 2>/dev/null || true diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 9900ba6a5edf..531684648a58 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,29 +3,31 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.134 2007/09/18 00:44:04 marcus Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.141 2008/03/15 19:36:22 ahze Exp $ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 PORTREVISION= 1 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 COMMENT= CD burner view for Nautilus -RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao +BUILD_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount +RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ + cdrdao:${PORTSDIR}/sysutils/cdrdao +CONFIGURE_ARGS= --enable-gnome-mount USE_BZIP2= yes USE_GETTEXT= yes USE_XLIB= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \ - desktopfileutils + desktopfileutils ltasneededhack USE_CDRTOOLS= yes INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool:15 @@ -36,8 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= nautilus-cd-burner.schemas OPTIONS= DVD "Enable DVD support" on \ - CJK "Use cdrtools-cjk instead of cdrtools" off \ - GNOMEMOUNT "Enable sysutils/gnome-mount support" off + CJK "Use cdrtools-cjk instead of cdrtools" off .include <bsd.port.pre.mk> @@ -49,14 +50,6 @@ WITHOUT_DVD= yes RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools .endif -.if defined(WITH_GNOMEMOUNT) -BUILD_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount -RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount -CONFIGURE_ARGS+= --enable-gnome-mount -.else -CONFIGURE_ARGS+= --disable-gnome-mount -.endif - post-install: -@update-desktop-database @${CAT} ${PKGMESSAGE} diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 95075e8ab2c7..029d3fe5eb2b 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = a7ddb02c33be107f6c9c1874b7703e9e -SHA256 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = fc7a91473bc3cab7cba8ef4185e8f62ea6ad50a4558d8bce1aa639a4397ec905 -SIZE (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = 730319 +MD5 (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = e75c61879a12ab329fd2f3081b7e5d76 +SHA256 (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = c8bc7d9211438e5f12c755226d953884bfdf16957084ec423dcf80f4acb4cd63 +SIZE (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = 734921 diff --git a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c index 7b228d462b33..71f43178c354 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c @@ -1,10 +1,10 @@ ---- src/list_cddrives.c.orig Sun Nov 19 13:36:40 2006 -+++ src/list_cddrives.c Sun Nov 19 13:37:08 2006 +--- src/list_cddrives.c.orig 2008-01-21 11:14:45.000000000 -0500 ++++ src/list_cddrives.c 2008-01-21 19:48:49.000000000 -0500 @@ -49,6 +49,7 @@ list_drive_info (NautilusBurnDrive *driv - g_print ("Drive:\n"); - g_print (" name:\t\t\t%s\n", display_name); - g_print (" device:\t\t%s\n", nautilus_burn_drive_get_device (drive)); -+ g_print (" cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive)); - g_print (" door:\t\t\t%s\n", door_is_open ? "open" : "closed"); - g_print (" type:\t\t\t%s\n", type_str); - g_print (" is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE"); + g_print ("Drive:\n"); + g_print (" name:\t\t\t%s\n", display_name); + g_print (" device:\t\t%s\n", nautilus_burn_drive_get_device (drive)); ++ g_print (" cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive)); + g_print (" door:\t\t\t%s\n", door_is_open ? "open" : "closed"); + g_print (" type:\t\t\t%s\n", type_str); + g_print (" is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE"); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c index f3fa05c13792..18183a421d3b 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c @@ -1,38 +1,38 @@ ---- src/make-iso.c.orig Sun Nov 19 13:34:29 2006 -+++ src/make-iso.c Sun Nov 19 13:36:03 2006 +--- src/make-iso.c.orig Sun Nov 19 13:34:29 2006 ++++ src/make-iso.c Sun Nov 19 13:36:03 2006 @@ -1367,7 +1367,7 @@ get_disc_info (NautilusBurnIso *iso, - &has_data, - &_has_audio); - if (_has_audio) { -- device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive)); -+ device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive)); + &has_data, + &_has_audio); + if (_has_audio) { +- device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive)); ++ device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive)); - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "cdrdao"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, "cdrdao"); @@ -1377,7 +1377,7 @@ get_disc_info (NautilusBurnIso *iso, - g_ptr_array_add (argv, NULL); + g_ptr_array_add (argv, NULL); - } else { -- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive)); -+ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); + } else { +- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive)); ++ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "readcd"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, "readcd"); @@ -1547,7 +1547,7 @@ nautilus_burn_iso_make_from_drive (Nauti - g_ptr_array_add (argv, "--datafile"); - g_ptr_array_add (argv, (char *)filename); - g_ptr_array_add (argv, "--device"); -- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); -+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, "-v"); - g_ptr_array_add (argv, "2"); - g_ptr_array_add (argv, (char *)toc_filename_arg); + g_ptr_array_add (argv, "--datafile"); + g_ptr_array_add (argv, (char *)filename); + g_ptr_array_add (argv, "--device"); +- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); ++ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); + g_ptr_array_add (argv, "-v"); + g_ptr_array_add (argv, "2"); + g_ptr_array_add (argv, (char *)toc_filename_arg); @@ -1559,7 +1559,7 @@ nautilus_burn_iso_make_from_drive (Nauti - filename_arg = g_strdup_printf ("f=%s", filename); + filename_arg = g_strdup_printf ("f=%s", filename); -- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); +- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); ++ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "readcd"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, "readcd"); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c index 58743c0fe275..2d62886636fa 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c @@ -1,48 +1,48 @@ ---- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400 -+++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500 +--- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400 ++++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500 @@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo - */ - if (drive->priv->device != NULL && - (strcmp (drive->priv->device, target) == 0 || + */ + if (drive->priv->device != NULL && + (strcmp (drive->priv->device, target) == 0 || - strcmp (drive->priv->device, device) == 0)) { + strcmp (drive->priv->device, device) == 0 || + strcmp (drive->priv->cdrecord_device, device) == 0)) { - ret = nautilus_burn_drive_ref (drive); - break; - } + ret = nautilus_burn_drive_ref (drive); + break; + } @@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx, - NautilusBurnDrive *drive; - char **write_speeds = NULL; - char *raw_device = NULL; -+ char *cam_path = NULL; -+ char *cam_device = NULL; + NautilusBurnDrive *drive; + char **write_speeds = NULL; + char *raw_device = NULL; ++ char *cam_path = NULL; ++ char *cam_device = NULL; - LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE); + LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE); @@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx, - LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device); - LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device); -+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device); -+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path); - LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name); + LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device); + LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device); ++ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device); ++ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path); + LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name); - LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read); + LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read); @@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx, - drive->priv->device = raw_device; - } + drive->priv->device = raw_device; + } -+ if (cam_device != NULL) { -+ g_free (drive->priv->device); -+ drive->priv->device = cam_device; -+ } ++ if (cam_device != NULL) { ++ g_free (drive->priv->device); ++ drive->priv->device = cam_device; ++ } + -+ if (cam_path != NULL) { -+ drive->priv->cdrecord_device = cam_path; -+ } else { -+ drive->priv->cdrecord_device = g_strdup (drive->priv->device); -+ } ++ if (cam_path != NULL) { ++ drive->priv->cdrecord_device = cam_path; ++ } else { ++ drive->priv->cdrecord_device = g_strdup (drive->priv->device); ++ } + - drive->priv->drive_udi = g_strdup (udi); - drive->priv->write_speeds = hal_parse_write_speeds (write_speeds); - /* we do not own write_speeds so do not free it. */ + drive->priv->drive_udi = g_strdup (udi); + drive->priv->write_speeds = hal_parse_write_speeds (write_speeds); + /* we do not own write_speeds so do not free it. */ diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h index f70c5d4a2c65..a4da309cbb17 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h @@ -1,10 +1,10 @@ ---- src/nautilus-burn-drive-private.h.orig Sun Nov 19 13:43:24 2006 -+++ src/nautilus-burn-drive-private.h Sun Nov 19 13:43:50 2006 +--- src/nautilus-burn-drive-private.h.orig Sun Nov 19 13:43:24 2006 ++++ src/nautilus-burn-drive-private.h Sun Nov 19 13:43:50 2006 @@ -34,6 +34,7 @@ struct NautilusBurnDrivePrivate { - int type; - char *device; -+ char *cdrecord_device; - char *display_name; - int max_speed_write; - int max_speed_read; + int type; + char *device; ++ char *cdrecord_device; + char *display_name; + int max_speed_write; + int max_speed_read; diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c index 0210c9f4d32b..a3d5a2949a3e 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c @@ -1,29 +1,29 @@ ---- src/nautilus-burn-drive-selection.c.orig Sun Nov 19 13:39:17 2006 -+++ src/nautilus-burn-drive-selection.c Sun Nov 19 13:39:30 2006 +--- src/nautilus-burn-drive-selection.c.orig Sun Nov 19 13:39:17 2006 ++++ src/nautilus-burn-drive-selection.c Sun Nov 19 13:39:30 2006 @@ -151,7 +151,7 @@ nautilus_burn_drive_selection_set_drive_ - 0, drive); - g_signal_emit (G_OBJECT (selection), - nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED], -- 0, nautilus_burn_drive_get_device (drive)); -+ 0, nautilus_burn_drive_get_cdrecord_device (drive)); + 0, drive); + g_signal_emit (G_OBJECT (selection), + nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED], +- 0, nautilus_burn_drive_get_device (drive)); ++ 0, nautilus_burn_drive_get_cdrecord_device (drive)); - g_object_notify (G_OBJECT (selection), "device"); - g_object_notify (G_OBJECT (selection), "drive"); + g_object_notify (G_OBJECT (selection), "device"); + g_object_notify (G_OBJECT (selection), "drive"); @@ -584,7 +584,7 @@ nautilus_burn_drive_selection_get_defaul - if (drives == NULL) { - device = "/dev/cdrom"; - } else { -- device = nautilus_burn_drive_get_device (drives->data); -+ device = nautilus_burn_drive_get_cdrecord_device (drives->data); - g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL); - g_list_free (drives); - } + if (drives == NULL) { + device = "/dev/cdrom"; + } else { +- device = nautilus_burn_drive_get_device (drives->data); ++ device = nautilus_burn_drive_get_cdrecord_device (drives->data); + g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL); + g_list_free (drives); + } @@ -633,7 +633,7 @@ nautilus_burn_drive_selection_get_device - g_return_val_if_fail (selection != NULL, NULL); - g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL); + g_return_val_if_fail (selection != NULL, NULL); + g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL); -- return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL; -+ return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL; +- return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL; ++ return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL; } /** diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c index cb0cd120ec2a..17a0384464ec 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c @@ -1,5 +1,5 @@ ---- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006 -+++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006 +--- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006 ++++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006 @@ -266,6 +266,25 @@ nautilus_burn_drive_get_device (Nautilus } @@ -17,41 +17,28 @@ +const char * +nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive) +{ -+ g_return_val_if_fail (drive != NULL, NULL); ++ g_return_val_if_fail (drive != NULL, NULL); + -+ return drive->priv->cdrecord_device; ++ return drive->priv->cdrecord_device; +} + +/** * nautilus_burn_drive_get_drive_type: * @drive: #NautilusBurnDrive * -@@ -808,8 +827,12 @@ nautilus_burn_drive_eject (NautilusBurnD - #ifdef USE_GNOME_MOUNT - cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->priv->device); - #else -+#ifdef __FreeBSD_ -+ cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->priv->device); -+#else - cmd = g_strdup_printf ("eject %s", drive->priv->device); - #endif -+#endif - - res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL); - g_free (cmd); @@ -1021,6 +1044,7 @@ nautilus_burn_drive_finalize (GObject *o - g_free (drive->priv->write_speeds); - g_free (drive->priv->display_name); - g_free (drive->priv->device); -+ g_free (drive->priv->cdrecord_device); + g_free (drive->priv->write_speeds); + g_free (drive->priv->display_name); + g_free (drive->priv->device); ++ g_free (drive->priv->cdrecord_device); - if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) { - (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object); + if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) { + (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object); @@ -1038,6 +1062,7 @@ nautilus_burn_drive_init (NautilusBurnDr - drive->priv->max_speed_read = 0; - drive->priv->write_speeds = NULL; - drive->priv->device = NULL; -+ drive->priv->cdrecord_device = NULL; + drive->priv->max_speed_read = 0; + drive->priv->write_speeds = NULL; + drive->priv->device = NULL; ++ drive->priv->cdrecord_device = NULL; } /** diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h index 034d495b509e..f033fa3ba295 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h @@ -1,5 +1,5 @@ ---- src/nautilus-burn-drive.h.orig Sun Nov 19 13:37:32 2006 -+++ src/nautilus-burn-drive.h Sun Nov 19 13:37:55 2006 +--- src/nautilus-burn-drive.h.orig Sun Nov 19 13:37:32 2006 ++++ src/nautilus-burn-drive.h Sun Nov 19 13:37:55 2006 @@ -127,6 +127,7 @@ gboolean nautilus_burn_driv int nautilus_burn_drive_get_drive_type (NautilusBurnDrive *drive); char * nautilus_burn_drive_get_name_for_display (NautilusBurnDrive *drive); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c index 186f433fb659..85f6416abcfe 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c @@ -1,29 +1,29 @@ ---- src/nautilus-burn-recorder.c.orig Fri Sep 29 14:18:37 2006 -+++ src/nautilus-burn-recorder.c Mon Nov 20 18:13:24 2006 +--- src/nautilus-burn-recorder.c.orig Fri Sep 29 14:18:37 2006 ++++ src/nautilus-burn-recorder.c Mon Nov 20 18:13:24 2006 @@ -1343,7 +1343,7 @@ nautilus_burn_recorder_write_cdrecord (N - g_ptr_array_add (argv, "cdrdao"); - g_ptr_array_add (argv, "write"); - g_ptr_array_add (argv, "--device"); -- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); -+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, "--speed"); - speed_str = g_strdup_printf ("%d", speed); - g_ptr_array_add (argv, speed_str); + g_ptr_array_add (argv, "cdrdao"); + g_ptr_array_add (argv, "write"); + g_ptr_array_add (argv, "--device"); +- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); ++ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); + g_ptr_array_add (argv, "--speed"); + speed_str = g_strdup_printf ("%d", speed); + g_ptr_array_add (argv, speed_str); @@ -1375,7 +1375,7 @@ nautilus_burn_recorder_write_cdrecord (N - if (speed != 0) { - g_ptr_array_add (argv, speed_str); - } -- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, dev_str); - if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) { - g_ptr_array_add (argv, "-dummy"); + if (speed != 0) { + g_ptr_array_add (argv, speed_str); + } +- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); ++ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); + g_ptr_array_add (argv, dev_str); + if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) { + g_ptr_array_add (argv, "-dummy"); @@ -1486,7 +1486,7 @@ nautilus_burn_recorder_blank_disc_cdreco - argv = g_ptr_array_new (); - g_ptr_array_add (argv, "cdrecord"); + argv = g_ptr_array_new (); + g_ptr_array_add (argv, "cdrecord"); -- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); -+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, dev_str); - g_ptr_array_add (argv, "-v"); +- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive)); ++ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive)); + g_ptr_array_add (argv, dev_str); + g_ptr_array_add (argv, "-v"); diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c index 9f729b800b17..3ed06173992e 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c @@ -1,5 +1,5 @@ ---- src/nautilus-cd-burner.c.orig Fri Jul 14 10:20:19 2006 -+++ src/nautilus-cd-burner.c Sun Nov 19 13:41:34 2006 +--- src/nautilus-cd-burner.c.orig Fri Jul 14 10:20:19 2006 ++++ src/nautilus-cd-burner.c Sun Nov 19 13:41:34 2006 @@ -27,6 +27,8 @@ #include "config.h" @@ -10,11 +10,11 @@ #include <stdio.h> #include <stdlib.h> @@ -246,7 +248,7 @@ selection_dialog_response (GtkWidget *di - /* save selections */ - gconf_client = gconf_client_get_default (); - gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL); -- gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive)); -+ gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive)); - g_object_unref (gconf_client); + /* save selections */ + gconf_client = gconf_client_get_default (); + gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL); +- gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive)); ++ gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive)); + g_object_unref (gconf_client); - operation = ncb_operation_new (); + operation = ncb_operation_new (); diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index efd6f53c256c..635ccb6e5989 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -1,5 +1,4 @@ bin/nautilus-cd-burner -etc/gnome-vfs-2.0/modules/mapping-modules.conf include/libnautilus-burn/nautilus-burn-drive-monitor.h include/libnautilus-burn/nautilus-burn-drive-selection.h include/libnautilus-burn/nautilus-burn-drive.h @@ -7,18 +6,14 @@ include/libnautilus-burn/nautilus-burn-features.h include/libnautilus-burn/nautilus-burn-init.h include/libnautilus-burn/nautilus-burn-recorder.h include/libnautilus-burn/nautilus-burn.h -lib/gnome-vfs-2.0/modules/libmapping.a -lib/gnome-vfs-2.0/modules/libmapping.la -lib/gnome-vfs-2.0/modules/libmapping.so lib/libnautilus-burn.a lib/libnautilus-burn.la lib/libnautilus-burn.so lib/libnautilus-burn.so.4 -lib/nautilus/extensions-1.0/libnautilus-burn-extension.a -lib/nautilus/extensions-1.0/libnautilus-burn-extension.la -lib/nautilus/extensions-1.0/libnautilus-burn-extension.so +lib/nautilus/extensions-2.0/libnautilus-burn-extension.a +lib/nautilus/extensions-2.0/libnautilus-burn-extension.la +lib/nautilus/extensions-2.0/libnautilus-burn-extension.so libdata/pkgconfig/libnautilus-burn.pc -libexec/mapping-daemon share/applications/nautilus-cd-burner-open-iso.desktop share/applications/nautilus-cd-burner.desktop share/icons/hicolor/16x16/apps/nautilus-cd-burner.png @@ -27,6 +22,7 @@ share/icons/hicolor/24x24/apps/nautilus-cd-burner.png share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/as/LC_MESSAGES/nautilus-cd-burner.mo share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo share/locale/be@latin/LC_MESSAGES/nautilus-cd-burner.mo @@ -62,6 +58,7 @@ share/locale/is/LC_MESSAGES/nautilus-cd-burner.mo share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ka/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/kn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ku/LC_MESSAGES/nautilus-cd-burner.mo share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo @@ -70,6 +67,7 @@ share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ml/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/mr/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo @@ -112,6 +110,7 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo %%DATADIR%%/cdspin8.png %%DATADIR%%/nautilus-cd-burner.glade @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm include/libnautilus-burn @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @@ -129,6 +128,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo @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/ku/LC_MESSAGES @@ -141,4 +142,5 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile index 02c64f4972f9..29828f5c4c4c 100644 --- a/sysutils/pessulus/Makefile +++ b/sysutils/pessulus/Makefile @@ -3,11 +3,11 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/sysutils/pessulus/Makefile,v 1.14 2007/09/17 20:08:42 ahze Exp $ +# $MCom: ports/sysutils/pessulus/Makefile,v 1.16 2008/03/10 23:41:35 ahze Exp $ # PORTNAME= pessulus -PORTVERSION= 2.16.3 +PORTVERSION= 2.16.4 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 da3165e0369f..f8179e2a9a39 100644 --- a/sysutils/pessulus/distinfo +++ b/sysutils/pessulus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pessulus-2.16.3.tar.gz) = 002c70e42a04cf1abb3e02d962dad11f -SHA256 (gnome2/pessulus-2.16.3.tar.gz) = a9c164cae356382c83779ff6e1273e7e50184d95eb66a2c3e563816d4b2a73f4 -SIZE (gnome2/pessulus-2.16.3.tar.gz) = 213734 +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 diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist index beaade773392..0d8d984c4cb6 100644 --- a/sysutils/pessulus/pkg-plist +++ b/sysutils/pessulus/pkg-plist @@ -88,6 +88,7 @@ share/locale/mr/LC_MESSAGES/pessulus.mo share/locale/nb/LC_MESSAGES/pessulus.mo share/locale/ne/LC_MESSAGES/pessulus.mo share/locale/nl/LC_MESSAGES/pessulus.mo +share/locale/nn/LC_MESSAGES/pessulus.mo share/locale/oc/LC_MESSAGES/pessulus.mo share/locale/or/LC_MESSAGES/pessulus.mo share/locale/pa/LC_MESSAGES/pessulus.mo @@ -115,6 +116,7 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/Pessulus +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/te/LC_MESSAGES @@ -133,4 +135,3 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile new file mode 100644 index 000000000000..95027020488e --- /dev/null +++ b/sysutils/policykit-gnome/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: PolicyKit-gnome +# Date Created: 20 January 2008 +# 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 $ +# + +PORTNAME= policykit-gnome +PORTVERSION= 0.7 +PORTREVISION= 2 +CATEGORIES= sysutils gnome +MASTER_SITES= http://hal.freedesktop.org/releases/ +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 + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GETTEXT= yes +USE_GNOME= gnomehack gnometarget gnomevfs2 intlhack gnomedocutils +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +CONFIGURE_ARGS= --disable-gtk-doc \ + --localstatedir=/var +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/sysutils/policykit-gnome/distinfo b/sysutils/policykit-gnome/distinfo new file mode 100644 index 000000000000..c6fa5c414308 --- /dev/null +++ b/sysutils/policykit-gnome/distinfo @@ -0,0 +1,3 @@ +MD5 (PolicyKit-gnome-0.7.tar.bz2) = 978ccbe3c9426f4d59c7903f566f954b +SHA256 (PolicyKit-gnome-0.7.tar.bz2) = bff0612c12cc8380774674293fc89cb486d8e79bdb5c5b31b25aabc38d2251e4 +SIZE (PolicyKit-gnome-0.7.tar.bz2) = 990594 diff --git a/sysutils/policykit-gnome/files/patch-Makefile.in b/sysutils/policykit-gnome/files/patch-Makefile.in new file mode 100644 index 000000000000..da7d36ad049e --- /dev/null +++ b/sysutils/policykit-gnome/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2008-01-20 20:11:12.000000000 -0500 ++++ Makefile.in 2008-01-20 20:11:21.000000000 -0500 +@@ -251,7 +251,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + + # Need to build docs after examples because the docs include generated files +-SUBDIRS = data src polkit-gnome tools $(am__append_1) doc po ++SUBDIRS = data src polkit-gnome tools $(am__append_1) po + EXTRA_DIST = \ + autogen.sh \ + intltool-extract.in \ diff --git a/sysutils/policykit-gnome/pkg-descr b/sysutils/policykit-gnome/pkg-descr new file mode 100644 index 000000000000..37eebb83c9f3 --- /dev/null +++ b/sysutils/policykit-gnome/pkg-descr @@ -0,0 +1,5 @@ +PolicyKit is a framework for defining policy for system-wide components and +for desktop pieces to configure it. PolicyKit-gnome is a GTK+/GNOME frontend +for that framework. + +WWW: http://www.freedesktop.org/Software/hal diff --git a/sysutils/policykit-gnome/pkg-plist b/sysutils/policykit-gnome/pkg-plist new file mode 100644 index 000000000000..d4e3266dec01 --- /dev/null +++ b/sysutils/policykit-gnome/pkg-plist @@ -0,0 +1,21 @@ +bin/polkit-gnome-authorization +bin/polkit-gnome-example +include/PolicyKit/polkit-gnome/polkit-gnome-action.h +include/PolicyKit/polkit-gnome/polkit-gnome-auth.h +include/PolicyKit/polkit-gnome/polkit-gnome-context.h +include/PolicyKit/polkit-gnome/polkit-gnome-toggle-action.h +include/PolicyKit/polkit-gnome/polkit-gnome.h +lib/libpolkit-gnome.a +lib/libpolkit-gnome.la +lib/libpolkit-gnome.so +lib/libpolkit-gnome.so.0 +libdata/pkgconfig/polkit-gnome.pc +libexec/polkit-gnome-manager +share/PolicyKit/policy/polkit-gnome-example.policy +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/da/LC_MESSAGES/PolicyKit-gnome.mo +@dirrmtry share/applications +@dirrm include/PolicyKit/polkit-gnome diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile index 794b57676a41..4a083a5bd0f4 100644 --- a/sysutils/policykit/Makefile +++ b/sysutils/policykit/Makefile @@ -3,37 +3,54 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/policykit/Makefile,v 1.12 2006/10/07 19:45:38 marcus Exp $ +# $MCom: ports/sysutils/policykit/Makefile,v 1.19 2008/01/20 04:41:31 marcus Exp $ # PORTNAME= policykit -PORTVERSION= 0.1.20060514 -PORTREVISION= 4 +PORTVERSION= 0.7 +PORTREVISION= 2 CATEGORIES= sysutils gnome -MASTER_SITES= http://www.marcuscom.com/downloads/ +MASTER_SITES= http://hal.freedesktop.org/releases/ DISTNAME= PolicyKit-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for controlling access to system-wide components -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +BUILD_DEPENDS= docbook2html:${PORTSDIR}/textproc/docbook-utils \ + ${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + expat.6:${PORTSDIR}/textproc/expat2 +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USE_BZIP2= yes -USE_GNOME= gnomehack gnometarget +USE_GNOME= gnomehack gnometarget glib20 intlhack USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ - --with-pid-file=/var/run/polkitd/polkitd.pid \ - --with-pam-include=system + --with-pam-include=system \ + --with-os-type=freebsd \ + --localstatedir=/var \ + --with-polkit-user=polkit \ + --with-polkit-group=polkit CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" -USE_RC_SUBR= polkitd -USE_GNOME_SUBR= yes +MAN1= polkit-action.1 polkit-auth.1 polkit-config-file-validate.1 \ + polkit-policy-file-validate.1 +MAN5= PolicyKit.conf.5 +MAN8= PolicyKit.8 post-install: + ${MKDIR} ${PREFIX}/etc/PolicyKit + if [ ! -f ${PREFIX}/etc/PolicyKit/PolicyKit.conf ]; then \ + ${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \ + ${PREFIX}/etc/PolicyKit/PolicyKit.conf ; \ + fi + ${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \ + ${PREFIX}/etc/PolicyKit/PolicyKit.conf.dist .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/sysutils/policykit/distinfo b/sysutils/policykit/distinfo index 2bf4052122f3..875461516bb4 100644 --- a/sysutils/policykit/distinfo +++ b/sysutils/policykit/distinfo @@ -1,3 +1,3 @@ -MD5 (PolicyKit-0.1.20060514.tar.bz2) = f81ac5fb28603a4b419fca6c4efc027a -SHA256 (PolicyKit-0.1.20060514.tar.bz2) = d9015a69d63902b091475ad2cad1b6fe012cf0e8fead6603cf822c2033c9d552 -SIZE (PolicyKit-0.1.20060514.tar.bz2) = 333800 +MD5 (PolicyKit-0.7.tar.gz) = 99e0cc588310656fa25f8f66a411c71f +SHA256 (PolicyKit-0.7.tar.gz) = 87245f790142a245a5f5ba75d4a4e95612b391e82cf4d61659b3e50c4f6b9eeb +SIZE (PolicyKit-0.7.tar.gz) = 1214032 diff --git a/sysutils/policykit/files/patch-Makefile.in b/sysutils/policykit/files/patch-Makefile.in index 0c9552c020d6..29a907e4414a 100644 --- a/sysutils/policykit/files/patch-Makefile.in +++ b/sysutils/policykit/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Mon May 1 01:11:30 2006 -+++ Makefile.in Mon May 1 01:11:43 2006 -@@ -231,7 +231,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ +--- Makefile.in.orig 2007-12-22 19:11:03.000000000 -0500 ++++ Makefile.in 2007-12-22 19:11:13.000000000 -0500 +@@ -246,7 +246,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ --SUBDIRS = libpolkit polkitd doc tools privileges -+SUBDIRS = libpolkit polkitd tools privileges - pamdir = $(sysconfdir)/pam.d - pam_DATA = policy-kit - pkgconfigdir = $(prefix)/libdata/pkgconfig + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = data src polkitd doc tools policy po test ++SUBDIRS = data src polkitd doc tools policy po + EXTRA_DIST = \ + HACKING \ + mkinstalldirs \ diff --git a/sysutils/policykit/files/patch-config.h.in b/sysutils/policykit/files/patch-config.h.in new file mode 100644 index 000000000000..b8cb8f384d74 --- /dev/null +++ b/sysutils/policykit/files/patch-config.h.in @@ -0,0 +1,34 @@ +--- config.h.in.orig 2007-11-30 20:43:35.000000000 -0500 ++++ config.h.in 2007-12-24 14:47:06.000000000 -0500 +@@ -24,6 +24,18 @@ + /* Define to 1 if you have the `getgrouplist' function. */ + #undef HAVE_GETGROUPLIST + ++/* Define to 1 if you have the `clearenv' function. */ ++#undef HAVE_CLEARENV ++ ++/* Define to 1 if you have the `strndup' function. */ ++#undef HAVE_STRNDUP ++ ++/* Define to 1 if you have the `readdir64' function. */ ++#undef HAVE_READDIR64 ++ ++/* Define to 1 if you have the `getline' function. */ ++#undef HAVE_GETLINE ++ + /* Define if the GNU gettext() function is already present or preinstalled. */ + #undef HAVE_GETTEXT + +@@ -117,6 +129,12 @@ + /* Define if pam_strerror takes two arguments */ + #undef PAM_STRERROR_TWO_ARGS + ++/* Enable Linux inotify() usage */ ++#undef HAVE_INOTIFY ++ ++/* Enable BSD kqueue() usage */ ++#undef HAVE_KQUEUE ++ + /* Authorization Database to use */ + #undef POLKIT_AUTHDB + diff --git a/sysutils/policykit/files/patch-configure b/sysutils/policykit/files/patch-configure new file mode 100644 index 000000000000..2e99765e746d --- /dev/null +++ b/sysutils/policykit/files/patch-configure @@ -0,0 +1,735 @@ +--- configure.bak 2007-11-30 20:42:54.000000000 -0500 ++++ configure 2007-12-23 00:35:53.000000000 -0500 +@@ -929,10 +929,16 @@ OS_TYPE_GENTOO_TRUE + OS_TYPE_GENTOO_FALSE + OS_TYPE_PARDUS_TRUE + OS_TYPE_PARDUS_FALSE ++OS_TYPE_FREEBSD_TRUE ++OS_TYPE_FREEBSD_FALSE + PAM_FILE_INCLUDE_AUTH + PAM_FILE_INCLUDE_ACCOUNT + PAM_FILE_INCLUDE_PASSWORD + PAM_FILE_INCLUDE_SESSION ++HAVE_INOTIFY_TRUE ++HAVE_INOTIFY_FALSE ++HAVE_KQUEUE_TRUE ++HAVE_KQUEUE_FALSE + INTLTOOL_DESKTOP_RULE + INTLTOOL_DIRECTORY_RULE + INTLTOOL_KEYS_RULE +@@ -6544,7 +6550,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6547 "configure"' > conftest.$ac_ext ++ echo '#line 6553 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8882,11 +8888,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:8885: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8891: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8889: \$? = $ac_status" >&5 ++ echo "$as_me:8895: \$? = $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. +@@ -9172,11 +9178,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:9175: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9181: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9179: \$? = $ac_status" >&5 ++ echo "$as_me:9185: \$? = $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. +@@ -9276,11 +9282,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:9279: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9285: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9283: \$? = $ac_status" >&5 ++ echo "$as_me:9289: \$? = $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 +@@ -11627,7 +11633,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 11630 "configure" ++#line 11636 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11727,7 +11733,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 11730 "configure" ++#line 11736 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14147,11 +14153,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:14150: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14156: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14154: \$? = $ac_status" >&5 ++ echo "$as_me:14160: \$? = $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. +@@ -14251,11 +14257,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:14254: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14260: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14258: \$? = $ac_status" >&5 ++ echo "$as_me:14264: \$? = $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 +@@ -15815,11 +15821,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:15818: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15824: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15822: \$? = $ac_status" >&5 ++ echo "$as_me:15828: \$? = $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. +@@ -15919,11 +15925,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:15922: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15928: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15926: \$? = $ac_status" >&5 ++ echo "$as_me:15932: \$? = $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 +@@ -18108,11 +18114,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:18111: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18117: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18115: \$? = $ac_status" >&5 ++ echo "$as_me:18121: \$? = $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. +@@ -18398,11 +18404,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:18401: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18407: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18405: \$? = $ac_status" >&5 ++ echo "$as_me:18411: \$? = $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. +@@ -18502,11 +18508,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:18505: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18511: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:18509: \$? = $ac_status" >&5 ++ echo "$as_me:18515: \$? = $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 +@@ -22501,7 +22507,9 @@ fi + + + +-for ac_func in getgrouplist ++ ++ ++for ac_func in getgrouplist clearenv strndup getline readdir64 + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + { echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -24087,6 +24095,14 @@ else + OS_TYPE_PARDUS_FALSE= + fi + ++ if test x$with_os_type = xfreebsd; then ++ OS_TYPE_FREEBSD_TRUE= ++ OS_TYPE_FREEBSD_FALSE='#' ++else ++ OS_TYPE_FREEBSD_TRUE='#' ++ OS_TYPE_FREEBSD_FALSE= ++fi ++ + + + # Check whether --with-pam-include was given. +@@ -24111,6 +24127,11 @@ elif test x$with_os_type = xsuse ; then + PAM_FILE_INCLUDE_ACCOUNT=common-account + PAM_FILE_INCLUDE_PASSWORD=common-password + PAM_FILE_INCLUDE_SESSION=common-session ++elif test x$with_os_type = xfreebsd ; then ++ PAM_FILE_INCLUDE_AUTH=system ++ PAM_FILE_INCLUDE_ACCOUNT=system ++ PAM_FILE_INCLUDE_PASSWORD=system ++ PAM_FILE_INCLUDE_SESSION=system + else + PAM_FILE_INCLUDE_AUTH=system-auth + PAM_FILE_INCLUDE_ACCOUNT=system-auth +@@ -24143,6 +24164,430 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + ++have_inotify=no ++ ++for ac_header in linux/inotify.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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 ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ----------------------------- ## ++## Report this to david@fubar.dk ## ++## ----------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ have_inotify=yes ++fi ++ ++done ++ ++ ++for ac_header in sys/inotify.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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 ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&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 "echo \"\$as_me:$LINENO: $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 ++ 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 ++ 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 ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ----------------------------- ## ++## Report this to david@fubar.dk ## ++## ----------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ have_inotify=yes ++fi ++ ++done ++ ++ ++ if test "x$have_inotify" = "xyes"; then ++ HAVE_INOTIFY_TRUE= ++ HAVE_INOTIFY_FALSE='#' ++else ++ HAVE_INOTIFY_TRUE='#' ++ HAVE_INOTIFY_FALSE= ++fi ++ ++ ++if test "x$have_inotify" = "xyes" ; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_INOTIFY 1 ++_ACEOF ++ ++fi ++ ++have_kqueue=yes ++ ++for ac_func in kqueue ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $ac_func ++ ++/* 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 $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ 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 ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++else ++ have_kqueue=no ++fi ++done ++ ++ ++ if test "x$have_kqueue" = "xyes"; then ++ HAVE_KQUEUE_TRUE= ++ HAVE_KQUEUE_FALSE='#' ++else ++ HAVE_KQUEUE_TRUE='#' ++ HAVE_KQUEUE_FALSE= ++fi ++ ++ ++if test "x$have_kqueue" = "xyes" ; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_KQUEUE 1 ++_ACEOF ++ ++fi ++ + # ******************** + # Internationalisation + # ******************** +@@ -26232,6 +26677,27 @@ echo "$as_me: error: conditional \"OS_TY + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${OS_TYPE_FREEBSD_TRUE}" && test -z "${OS_TYPE_FREEBSD_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"OS_TYPE_FREEBSD\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"OS_TYPE_FREEBSD\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_INOTIFY_TRUE}" && test -z "${HAVE_INOTIFY_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INOTIFY\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_INOTIFY\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_KQUEUE_TRUE}" && test -z "${HAVE_KQUEUE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_KQUEUE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_KQUEUE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + + ac_config_commands="$ac_config_commands po/stamp-it" + +@@ -26995,10 +27461,16 @@ OS_TYPE_GENTOO_TRUE!$OS_TYPE_GENTOO_TRUE + OS_TYPE_GENTOO_FALSE!$OS_TYPE_GENTOO_FALSE$ac_delim + OS_TYPE_PARDUS_TRUE!$OS_TYPE_PARDUS_TRUE$ac_delim + OS_TYPE_PARDUS_FALSE!$OS_TYPE_PARDUS_FALSE$ac_delim ++OS_TYPE_FREEBSD_TRUE!$OS_TYPE_FREEBSD_TRUE$ac_delim ++OS_TYPE_FREEBSD_FALSE!$OS_TYPE_FREEBSD_FALSE$ac_delim + PAM_FILE_INCLUDE_AUTH!$PAM_FILE_INCLUDE_AUTH$ac_delim + PAM_FILE_INCLUDE_ACCOUNT!$PAM_FILE_INCLUDE_ACCOUNT$ac_delim + PAM_FILE_INCLUDE_PASSWORD!$PAM_FILE_INCLUDE_PASSWORD$ac_delim + PAM_FILE_INCLUDE_SESSION!$PAM_FILE_INCLUDE_SESSION$ac_delim ++HAVE_INOTIFY_TRUE!$HAVE_INOTIFY_TRUE$ac_delim ++HAVE_INOTIFY_FALSE!$HAVE_INOTIFY_FALSE$ac_delim ++HAVE_KQUEUE_TRUE!$HAVE_KQUEUE_TRUE$ac_delim ++HAVE_KQUEUE_FALSE!$HAVE_KQUEUE_FALSE$ac_delim + INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim + INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim + INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim +@@ -27022,12 +27494,6 @@ INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_de + INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim + INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim + INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim +-ALL_LINGUAS!$ALL_LINGUAS$ac_delim +-DATADIRNAME!$DATADIRNAME$ac_delim +-GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim +-USE_NLS!$USE_NLS$ac_delim +-MSGFMT!$MSGFMT$ac_delim +-MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -27069,6 +27535,12 @@ _ACEOF + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++ALL_LINGUAS!$ALL_LINGUAS$ac_delim ++DATADIRNAME!$DATADIRNAME$ac_delim ++GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim ++USE_NLS!$USE_NLS$ac_delim ++MSGFMT!$MSGFMT$ac_delim ++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim + GMSGFMT!$GMSGFMT$ac_delim + XGETTEXT!$XGETTEXT$ac_delim + CATALOGS!$CATALOGS$ac_delim +@@ -27085,7 +27557,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` = 14; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/sysutils/policykit/files/patch-configure.in b/sysutils/policykit/files/patch-configure.in new file mode 100644 index 000000000000..d54068c952b8 --- /dev/null +++ b/sysutils/policykit/files/patch-configure.in @@ -0,0 +1,57 @@ +--- configure.in.orig 2007-11-25 15:43:40.000000000 -0500 ++++ configure.in 2007-12-23 00:34:37.000000000 -0500 +@@ -169,7 +169,7 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib- + AC_SUBST(DBUS_GLIB_CFLAGS) + AC_SUBST(DBUS_GLIB_LIBS) + +-AC_CHECK_FUNCS(getgrouplist) ++AC_CHECK_FUNCS(getgrouplist clearenv strndup getline readdir64) + + EXPAT_LIB="" + AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here], +@@ -406,6 +406,7 @@ AM_CONDITIONAL(OS_TYPE_RED_HAT, test x$w + AM_CONDITIONAL(OS_TYPE_SUSE, test x$with_os_type = xsuse, [Running on SUSE OS'es]) + AM_CONDITIONAL(OS_TYPE_GENTOO, test x$with_os_type = xgentoo, [Running on Gentoo OS'es]) + AM_CONDITIONAL(OS_TYPE_PARDUS, test x$with_os_type = xpardus, [Running on Pardus OS'es]) ++AM_CONDITIONAL(OS_TYPE_FREEBSD, test x$with_os_type = xfreebsd, [Running on FreeBSD OS'es]) + + AC_ARG_WITH(pam-include, [ --with-pam-include=<file> pam file to include]) + +@@ -425,6 +426,11 @@ elif test x$with_os_type = xsuse ; then + PAM_FILE_INCLUDE_ACCOUNT=common-account + PAM_FILE_INCLUDE_PASSWORD=common-password + PAM_FILE_INCLUDE_SESSION=common-session ++elif test x$with_os_type = xfreebsd ; then ++ PAM_FILE_INCLUDE_AUTH=system ++ PAM_FILE_INCLUDE_ACCOUNT=system ++ PAM_FILE_INCLUDE_PASSWORD=system ++ PAM_FILE_INCLUDE_SESSION=system + else + PAM_FILE_INCLUDE_AUTH=system-auth + PAM_FILE_INCLUDE_ACCOUNT=system-auth +@@ -441,6 +447,25 @@ AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_ACCO + AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_PASSWORD, "$PAM_FILE_INCLUDE_PASSWORD", [pam file password]) + AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_SESSION, "$PAM_FILE_INCLUDE_SESSION", [pam file session]) + ++have_inotify=no ++AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes]) ++AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes]) ++ ++AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes") ++ ++if test "x$have_inotify" = "xyes" ; then ++ AC_DEFINE([HAVE_INOTIFY], 1, [Enable Linux inotify() usage]) ++fi ++ ++have_kqueue=yes ++AC_CHECK_FUNCS([kqueue],,have_kqueue=no) ++ ++AM_CONDITIONAL(HAVE_KQUEUE, test "x$have_kqueue" = "xyes") ++ ++if test "x$have_kqueue" = "xyes" ; then ++ AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) ++fi ++ + # ******************** + # Internationalisation + # ******************** diff --git a/sysutils/policykit/files/patch-data_Makefile.in b/sysutils/policykit/files/patch-data_Makefile.in new file mode 100644 index 000000000000..f32ab19c0983 --- /dev/null +++ b/sysutils/policykit/files/patch-data_Makefile.in @@ -0,0 +1,25 @@ +--- data/Makefile.in.orig 2008-01-07 23:51:57.000000000 -0500 ++++ data/Makefile.in 2008-01-07 23:52:15.000000000 -0500 +@@ -305,14 +305,14 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + install-confDATA: $(conf_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)" +- @list='$(conf_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \ +- $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \ +- done ++# @$(NORMAL_INSTALL) ++# test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)" ++# @list='$(conf_DATA)'; for p in $$list; do \ ++# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++# f=$(am__strip_dir) \ ++# echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \ ++# $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \ ++# done + + uninstall-confDATA: + @$(NORMAL_UNINSTALL) diff --git a/sysutils/policykit/files/patch-polkitd_policy.c b/sysutils/policykit/files/patch-polkitd_policy.c deleted file mode 100644 index c633366a2b60..000000000000 --- a/sysutils/policykit/files/patch-polkitd_policy.c +++ /dev/null @@ -1,118 +0,0 @@ ---- polkitd/policy.c.orig Tue Mar 14 07:14:33 2006 -+++ polkitd/policy.c Tue May 2 01:53:06 2006 -@@ -537,13 +537,15 @@ - int rc; - char *res; - char *buf = NULL; -- unsigned int bufsize; -+ long bufsize; - struct passwd pwd; - struct passwd *pwdp; - - res = NULL; - - bufsize = sysconf (_SC_GETPW_R_SIZE_MAX); -+ if (bufsize < 0) -+ bufsize = 1024; - buf = g_new0 (char, bufsize); - - rc = getpwuid_r (uid, &pwd, buf, bufsize, &pwdp); -@@ -567,13 +569,15 @@ - int rc; - char *res; - char *buf = NULL; -- unsigned int bufsize; -+ long bufsize; - struct group gbuf; - struct group *gbufp; - - res = NULL; - - bufsize = sysconf (_SC_GETGR_R_SIZE_MAX); -+ if (bufsize < 0) -+ bufsize = 1024; - buf = g_new0 (char, bufsize); - - rc = getgrgid_r (gid, &gbuf, buf, bufsize, &gbufp); -@@ -597,13 +601,15 @@ - int rc; - uid_t res; - char *buf = NULL; -- unsigned int bufsize; -+ long bufsize; - struct passwd pwd; - struct passwd *pwdp; - - res = (uid_t) -1; - - bufsize = sysconf (_SC_GETPW_R_SIZE_MAX); -+ if (bufsize < 0) -+ bufsize = 1024; - buf = g_new0 (char, bufsize); - - rc = getpwnam_r (username, &pwd, buf, bufsize, &pwdp); -@@ -627,13 +633,15 @@ - int rc; - gid_t res; - char *buf = NULL; -- unsigned int bufsize; -+ long bufsize; - struct group gbuf; - struct group *gbufp; - - res = (gid_t) -1; - - bufsize = sysconf (_SC_GETGR_R_SIZE_MAX); -+ if (bufsize < 0) -+ bufsize = 1024; - buf = g_new0 (char, bufsize); - - rc = getgrnam_r (groupname, &gbuf, buf, bufsize, &gbufp); -@@ -649,6 +657,23 @@ - return res; - } - -+static int -+getgrouplist_ala_linux (const char *name, -+ gid_t basegid, -+ gid_t *groups, -+ int *ngroups) -+{ -+ if (groups) -+ return getgrouplist (name, basegid, groups, ngroups); -+ else { -+ for (*ngroups = 1;; (*ngroups)++) { -+ gid_t _groups[*ngroups]; -+ if (getgrouplist (name, basegid, _groups, ngroups) != -1) -+ return 0; -+ } -+ } -+} -+ - PolicyResult - policy_get_allowed_resources_for_policy_for_uid (uid_t uid, - const char *policy, -@@ -665,9 +690,9 @@ - if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL) - goto out; - -- if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) { -+ if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) { - groups = (gid_t *) g_new0 (gid_t, num_groups); -- if (getgrouplist(username, default_gid, groups, &num_groups) < 0) { -+ if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) { - g_warning ("getgrouplist() failed"); - goto out; - } -@@ -702,9 +727,9 @@ - if ((username = policy_util_uid_to_name (uid, &default_gid)) == NULL) - goto out; - -- if (getgrouplist(username, default_gid, NULL, &num_groups) < 0) { -+ if (getgrouplist_ala_linux(username, default_gid, NULL, &num_groups) < 0) { - groups = (gid_t *) g_new0 (gid_t, num_groups); -- if (getgrouplist(username, default_gid, groups, &num_groups) < 0) { -+ if (getgrouplist_ala_linux(username, default_gid, groups, &num_groups) < 0) { - g_warning ("getgrouplist() failed"); - goto out; - } diff --git a/sysutils/policykit/files/patch-src_kit_kit-file.c b/sysutils/policykit/files/patch-src_kit_kit-file.c new file mode 100644 index 000000000000..af3ffe0f4974 --- /dev/null +++ b/sysutils/policykit/files/patch-src_kit_kit-file.c @@ -0,0 +1,26 @@ +--- src/kit/kit-file.c.orig 2007-11-28 16:32:08.000000000 -0500 ++++ src/kit/kit-file.c 2007-12-24 14:48:35.000000000 -0500 +@@ -283,7 +283,11 @@ _kit_get_num_fd (void) + DIR *dir; + char buf[128]; + ssize_t num; ++#ifdef HAVE_READDIR64 + struct dirent64 *d; ++#else ++ struct dirent *d; ++#endif + + num = -1; + +@@ -296,7 +300,11 @@ _kit_get_num_fd (void) + } + + num = -2; ++#ifdef HAVE_READDIR64 + while ((d = readdir64 (dir)) != NULL) { ++#else ++ while ((d = readdir (dir)) != NULL) { ++#endif + if (d->d_name == NULL) + continue; + num++; diff --git a/sysutils/policykit/files/patch-src_kit_kit-file.h b/sysutils/policykit/files/patch-src_kit_kit-file.h new file mode 100644 index 000000000000..ae2a2ac7187a --- /dev/null +++ b/sysutils/policykit/files/patch-src_kit_kit-file.h @@ -0,0 +1,10 @@ +--- src/kit/kit-file.h.orig 2007-12-22 19:14:03.000000000 -0500 ++++ src/kit/kit-file.h 2007-12-22 19:14:13.000000000 -0500 +@@ -34,6 +34,7 @@ + #ifndef KIT_FILE_H + #define KIT_FILE_H + ++#include <sys/stat.h> + #include <kit/kit.h> + + KIT_BEGIN_DECLS diff --git a/sysutils/policykit/files/patch-src_kit_kit-spawn.c b/sysutils/policykit/files/patch-src_kit_kit-spawn.c new file mode 100644 index 000000000000..7fbee5ec794b --- /dev/null +++ b/sysutils/policykit/files/patch-src_kit_kit-spawn.c @@ -0,0 +1,10 @@ +--- src/kit/kit-spawn.c.orig 2007-12-23 00:22:49.000000000 -0500 ++++ src/kit/kit-spawn.c 2007-12-23 00:22:58.000000000 -0500 +@@ -40,6 +40,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <errno.h> ++#include <signal.h> + + #include <kit/kit.h> + #include "kit-test.h" diff --git a/sysutils/policykit/files/patch-src_kit_kit-string.c b/sysutils/policykit/files/patch-src_kit_kit-string.c new file mode 100644 index 000000000000..e7b375e05bdd --- /dev/null +++ b/sysutils/policykit/files/patch-src_kit_kit-string.c @@ -0,0 +1,42 @@ +--- src/kit/kit-string.c.orig 2007-12-23 00:42:03.000000000 -0500 ++++ src/kit/kit-string.c 2007-12-23 00:41:26.000000000 -0500 +@@ -77,7 +77,15 @@ kit_strdup (const char *s) + out: + return p; + } ++#else /* !KIT_BUILD_TESTS */ ++char * ++kit_strdup (const char *s) ++{ ++ return strdup (s); ++} ++#endif /* KIT_BUILD_TESTS */ + ++#if defined(KIT_BUILD_TESTS) || !defined(HAVE_STRNDUP) + /** + * kit_strndup: + * @s: string +@@ -111,13 +119,7 @@ out: + return p; + } + +-#else +- +-char * +-kit_strdup (const char *s) +-{ +- return strdup (s); +-} ++#else /* !KIT_BUILD_TESTS || HAVE_STRNDUP */ + + char * + kit_strndup (const char *s, size_t n) +@@ -125,7 +127,7 @@ kit_strndup (const char *s, size_t n) + return strndup (s, n); + } + +-#endif /* KIT_BUILD_TESTS */ ++#endif /* KIT_BUILD_TESTS || !HAVE_STRNDUP */ + + /** + * kit_strdup_printf: diff --git a/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c new file mode 100644 index 000000000000..d9351cea6771 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c @@ -0,0 +1,43 @@ +--- src/polkit-dbus/polkit-read-auth-helper.c.orig 2007-11-28 23:33:10.000000000 -0500 ++++ src/polkit-dbus/polkit-read-auth-helper.c 2007-12-24 14:53:38.000000000 -0500 +@@ -39,6 +39,7 @@ + #include <string.h> + #include <unistd.h> + #include <sys/types.h> ++#include <sys/param.h> + #include <sys/stat.h> + #include <security/pam_appl.h> + #include <grp.h> +@@ -156,7 +157,11 @@ dump_auths_all (const char *root) + { + DIR *dir; + int dfd; ++#ifdef HAVE_READDIR64 + struct dirent64 *d; ++#else ++ struct dirent *d; ++#endif + polkit_bool_t ret; + + ret = FALSE; +@@ -173,7 +178,11 @@ dump_auths_all (const char *root) + goto out; + } + ++#ifdef HAVE_READDIR64 + while ((d = readdir64(dir)) != NULL) { ++#else ++ while ((d = readdir(dir)) != NULL) { ++#endif + unsigned int n, m; + uid_t uid; + size_t name_len; +@@ -282,7 +291,7 @@ main (int argc, char *argv[]) + + #ifndef POLKIT_BUILD_TESTS + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c new file mode 100644 index 000000000000..8361f7c0bef2 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c @@ -0,0 +1,11 @@ +--- src/polkit-dbus/polkit-set-default-helper.c.orig 2007-12-23 01:21:04.000000000 -0500 ++++ src/polkit-dbus/polkit-set-default-helper.c 2007-12-23 01:21:11.000000000 -0500 +@@ -127,7 +127,7 @@ main (int argc, char *argv[]) + + ret = 1; + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am new file mode 100644 index 000000000000..73f38d381015 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am @@ -0,0 +1,11 @@ +--- src/polkit-grant/Makefile.am.orig 2007-12-23 01:40:02.000000000 -0500 ++++ src/polkit-grant/Makefile.am 2007-12-23 01:40:27.000000000 -0500 +@@ -47,7 +47,7 @@ polkit_grant_helper_SOURCES = polkit-gra + polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la + + polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c +-polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ ++polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ $(top_builddir)/src/polkit/libpolkit.la + + polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c + polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@ diff --git a/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in new file mode 100644 index 000000000000..6723a3a127ad --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in @@ -0,0 +1,11 @@ +--- src/polkit-grant/Makefile.in.orig 2007-12-23 01:40:49.000000000 -0500 ++++ src/polkit-grant/Makefile.in 2007-12-23 01:41:16.000000000 -0500 +@@ -351,7 +351,7 @@ libpolkit_grant_la_LDFLAGS = -version-in + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_SOURCES = polkit-grant-helper.c + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c +-@POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ ++@POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ $(top_builddir)/src/polkit/libpolkit.la + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@ + @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_LDADD = $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c new file mode 100644 index 000000000000..cf9689c67396 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c @@ -0,0 +1,11 @@ +--- src/polkit-grant/polkit-explicit-grant-helper.c.orig 2007-12-23 01:24:19.000000000 -0500 ++++ src/polkit-grant/polkit-explicit-grant-helper.c 2007-12-23 01:24:24.000000000 -0500 +@@ -67,7 +67,7 @@ main (int argc, char *argv[]) + ret = 1; + + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c new file mode 100644 index 000000000000..bb957f167e69 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c @@ -0,0 +1,20 @@ +--- src/polkit-grant/polkit-grant-helper-pam.c.orig 2007-11-28 16:28:31.000000000 -0500 ++++ src/polkit-grant/polkit-grant-helper-pam.c 2007-12-23 02:01:46.000000000 -0500 +@@ -38,6 +38,8 @@ + #include <syslog.h> + #include <security/pam_appl.h> + ++#include <polkit/polkit.h> ++ + /* Development aid: define PGH_DEBUG to get debugging output. Do _NOT_ + * enable this in production builds; it may leak passwords and other + * sensitive information. +@@ -60,7 +62,7 @@ main (int argc, char *argv[]) + pam_h = NULL; + + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto error; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c new file mode 100644 index 000000000000..0cab8899cf02 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c @@ -0,0 +1,11 @@ +--- src/polkit-grant/polkit-grant-helper.c.orig 2007-12-23 01:23:13.000000000 -0500 ++++ src/polkit-grant/polkit-grant-helper.c 2007-12-23 01:23:19.000000000 -0500 +@@ -546,7 +546,7 @@ main (int argc, char *argv[]) + ret = 3; + + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c new file mode 100644 index 000000000000..c377b9614635 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c @@ -0,0 +1,19 @@ +--- src/polkit-grant/polkit-grant.c.orig 2007-11-28 16:29:25.000000000 -0500 ++++ src/polkit-grant/polkit-grant.c 2007-12-23 01:25:08.000000000 -0500 +@@ -38,6 +38,7 @@ + #include <sys/types.h> + #include <unistd.h> + #include <sys/wait.h> ++#include <signal.h> + + #include <glib.h> + #include "polkit-grant.h" +@@ -301,7 +302,7 @@ polkit_grant_io_func (PolKitGrant *polki + g_return_if_fail (polkit_grant != NULL); + g_return_if_fail (polkit_grant->helper_is_running); + +- while (getline (&line, &line_len, polkit_grant->child_stdout_f) != -1) { ++ while (polkit_sysdeps_getline (&line, &line_len, polkit_grant->child_stdout_f) != -1) { + if (strlen (line) > 0 && + line[strlen (line) - 1] == '\n') + line[strlen (line) - 1] = '\0'; diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c new file mode 100644 index 000000000000..c0ff4b64aaa7 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c @@ -0,0 +1,11 @@ +--- src/polkit-grant/polkit-revoke-helper.c.orig 2007-12-23 01:22:38.000000000 -0500 ++++ src/polkit-grant/polkit-revoke-helper.c 2007-12-23 01:22:47.000000000 -0500 +@@ -109,7 +109,7 @@ main (int argc, char *argv[]) + + #ifndef POLKIT_BUILD_TESTS + /* clear the entire environment to avoid attacks using with libraries honoring environment variables */ +- if (clearenv () != 0) ++ if (polkit_sysdeps_clearenv () != 0) + goto out; + /* set a minimal environment */ + setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1); diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-config.c b/sysutils/policykit/files/patch-src_polkit_polkit-config.c new file mode 100644 index 000000000000..f5b2e008222a --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-config.c @@ -0,0 +1,10 @@ +--- src/polkit/polkit-config.c.orig 2007-12-23 00:25:46.000000000 -0500 ++++ src/polkit/polkit-config.c 2007-12-23 00:25:51.000000000 -0500 +@@ -39,7 +39,6 @@ + #include <grp.h> + #include <unistd.h> + #include <errno.h> +-#include <sys/inotify.h> + #include <regex.h> + #include <syslog.h> + #include <regex.h> diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-context.c b/sysutils/policykit/files/patch-src_polkit_polkit-context.c new file mode 100644 index 000000000000..b27cd8edd727 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-context.c @@ -0,0 +1,189 @@ +--- src/polkit/polkit-context.c.orig 2007-12-04 20:22:41.000000000 -0500 ++++ src/polkit/polkit-context.c 2007-12-23 00:24:45.000000000 -0500 +@@ -39,7 +39,13 @@ + #include <grp.h> + #include <unistd.h> + #include <errno.h> ++#ifdef HAVE_INOTIFY + #include <sys/inotify.h> ++#elif HAVE_KQUEUE ++#include <sys/event.h> ++#include <sys/time.h> ++#include <fcntl.h> ++#endif + #include <syslog.h> + + #include "polkit-config.h" +@@ -106,11 +112,19 @@ struct _PolKitContext + + polkit_bool_t load_descriptions; + ++#ifdef HAVE_INOTIFY + int inotify_fd; + int inotify_fd_watch_id; + int inotify_config_wd; + int inotify_policy_wd; + int inotify_grant_perm_wd; ++#elif HAVE_KQUEUE ++ int kqueue_fd; ++ int kqueue_fd_watch_id; ++ int kqueue_config_fd; ++ int kqueue_policy_fd; ++ int kqueue_grant_perm_fd; ++#endif + }; + + /** +@@ -144,6 +158,10 @@ polkit_context_new (void) + polkit_bool_t + polkit_context_init (PolKitContext *pk_context, PolKitError **error) + { ++#ifdef HAVE_KQUEUE ++ struct kevent ev; ++#endif ++ + kit_return_val_if_fail (pk_context != NULL, FALSE); + + pk_context->policy_dir = kit_strdup (PACKAGE_DATA_DIR "/PolicyKit/policy"); +@@ -153,6 +171,7 @@ polkit_context_init (PolKitContext *pk_c + + /* NOTE: we don't load the configuration file until it's needed */ + ++#ifdef HAVE_INOTIFY + if (pk_context->io_add_watch_func != NULL) { + pk_context->inotify_fd = inotify_init (); + if (pk_context->inotify_fd < 0) { +@@ -203,6 +222,88 @@ polkit_context_init (PolKitContext *pk_c + goto error; + } + } ++#elif HAVE_KQUEUE ++ if (pk_context->io_add_watch_func != NULL) { ++ pk_context->kqueue_fd = kqueue (); ++ if (pk_context->kqueue_fd < 0) { ++ _pk_debug ("failed to initialize kqueue: %s", strerror (errno)); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ /* Watch the /etc/PolicyKit/PolicyKit.conf file */ ++ pk_context->kqueue_config_fd = open (PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf", O_RDONLY); ++ if (pk_context->kqueue_config_fd < 0) { ++ _pk_debug ("failed '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf' for reading: %s", ++ strerror (errno)); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ EV_SET (&ev, pk_context->kqueue_config_fd, EVFILT_VNODE, ++ EV_ADD | EV_ENABLE | EV_CLEAR, ++ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, ++ 0, 0); ++ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) { ++ _pk_debug ("failed to add watch on file '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf': %s", ++ strerror (errno)); ++ close (pk_context->kqueue_config_fd); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ /* Watch the /usr/share/PolicyKit/policy directory */ ++ pk_context->kqueue_policy_fd = open (PACKAGE_DATA_DIR "/PolicyKit/policy", O_RDONLY); ++ if (pk_context->kqueue_policy_fd < 0) { ++ _pk_debug ("failed to open '" PACKAGE_DATA_DIR "/PolicyKit/policy for reading: %s", ++ strerror (errno)); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ EV_SET (&ev, pk_context->kqueue_policy_fd, EVFILT_VNODE, ++ EV_ADD | EV_ENABLE | EV_CLEAR, ++ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, ++ 0, 0); ++ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) { ++ _pk_debug ("failed to add watch on directory '" PACKAGE_DATA_DIR "/PolicyKit/policy': %s", ++ strerror (errno)); ++ close (pk_context->kqueue_policy_fd); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++#ifdef POLKIT_AUTHDB_DEFAULT ++ /* Watch the /var/lib/misc/PolicyKit.reload file */ ++ pk_context->kqueue_grant_perm_fd = open (PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload", O_RDONLY); ++ if (pk_context->kqueue_grant_perm_fd < 0) { ++ _pk_debug ("failed to open '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload' for reading: %s", ++ strerror (errno)); ++ /* TODO: set error */ ++ goto error; ++ } ++ ++ EV_SET (&ev, pk_context->kqueue_grant_perm_fd, EVFILT_VNODE, ++ EV_ADD | EV_ENABLE | EV_CLEAR, ++ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, ++ 0, 0); ++ if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) { ++ _pk_debug ("failed to add watch on file '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload': %s", ++ strerror (errno)); ++ close (pk_context->kqueue_grant_perm_fd); ++ /* TODO: set error */ ++ goto error; ++ } ++#endif ++ ++ pk_context->kqueue_fd_watch_id = pk_context->io_add_watch_func (pk_context, pk_context->kqueue_fd); ++ if (pk_context->kqueue_fd_watch_id == 0) { ++ _pk_debug ("failed to add io watch"); ++ /* TODO: set error */ ++ goto error; ++ } ++ } ++#endif + + return TRUE; + error: +@@ -296,6 +397,7 @@ polkit_context_io_func (PolKitContext *p + + config_changed = FALSE; + ++#ifdef HAVE_INOTIFY + if (fd == pk_context->inotify_fd) { + /* size of the event structure, not counting name */ + #define EVENT_SIZE (sizeof (struct inotify_event)) +@@ -327,6 +429,36 @@ again: + i += EVENT_SIZE + event->len; + } + } ++#elif HAVE_KQUEUE ++ if (fd == pk_context->kqueue_fd) { ++ struct kevent ev[1024]; ++ struct timespec nullts = { 0, 0 }; ++ int res; ++ int i = 0; ++ ++ res = kevent (fd, NULL, 0, ev, 1024, &nullts); ++ ++ if (res > 0) { ++ /* Sleep for a half-second to avoid potential races ++ * during install/uninstall. */ ++ usleep (500000); ++ ++ while (i < res) { ++ struct kevent *evptr; ++ ++ evptr = &ev[i]; ++ _pk_debug ("ident=%d filter=%d flags=%u fflags=%u", ++ evptr->ident, evptr->filter, evptr->flags, evptr->fflags); ++ _pk_debug ("config changed!"); ++ config_changed = TRUE; ++ ++ i++; ++ } ++ } else { ++ _pk_debug ("failed to read kqueue event: %s", strerror (errno)); ++ } ++ } ++#endif + + if (config_changed) { + polkit_context_force_reload (pk_context); diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c b/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c new file mode 100644 index 000000000000..793b531106a4 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c @@ -0,0 +1,26 @@ +--- src/polkit/polkit-policy-cache.c.orig 2007-11-29 01:14:09.000000000 -0500 ++++ src/polkit/polkit-policy-cache.c 2007-12-24 14:51:04.000000000 -0500 +@@ -98,7 +98,11 @@ PolKitPolicyCache * + _polkit_policy_cache_new (const char *dirname, polkit_bool_t load_descriptions, PolKitError **error) + { + DIR *dir; ++#ifdef HAVE_READDIR64 + struct dirent64 *d; ++#else ++ struct dirent *d; ++#endif + PolKitPolicyCache *pc; + + dir = NULL; +@@ -119,7 +123,11 @@ _polkit_policy_cache_new (const char *di + goto out; + } + ++#ifdef HAVE_READDIR64 + while ((d = readdir64 (dir)) != NULL) { ++#else ++ while ((d = readdir (dir)) != NULL) { ++#endif + char *path; + PolKitPolicyFile *pf; + PolKitError *pk_error; diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c new file mode 100644 index 000000000000..c8e4935f105a --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c @@ -0,0 +1,187 @@ +--- src/polkit/polkit-sysdeps.c.orig 2007-11-28 16:26:14.000000000 -0500 ++++ src/polkit/polkit-sysdeps.c 2008-01-02 00:42:47.000000000 -0500 +@@ -39,7 +39,6 @@ + #include <grp.h> + #include <unistd.h> + #include <errno.h> +-#include <sys/inotify.h> + #include <syslog.h> + + #include "polkit-sysdeps.h" +@@ -82,7 +81,11 @@ polkit_sysdeps_get_start_time_for_pid (p + start_time = 0; + contents = NULL; + ++#ifdef __FreeBSD__ ++ filename = kit_strdup_printf ("/proc/%d/status", pid); ++#else + filename = kit_strdup_printf ("/proc/%d/stat", pid); ++#endif + if (filename == NULL) { + errno = ENOMEM; + goto out; +@@ -93,6 +96,35 @@ polkit_sysdeps_get_start_time_for_pid (p + goto out; + } + ++#ifdef __FreeBSD__ ++ tokens = kit_strsplit (contents, ' ', &num_tokens); ++ if (tokens == NULL) ++ goto out; ++ if (num_tokens < 8) { ++ kit_strfreev (tokens); ++ goto out; ++ } ++ ++ p = kit_strdup (tokens[7]); ++ kit_strfreev (tokens); ++ ++ tokens = kit_strsplit (p, ',', &num_tokens); ++ if (tokens == NULL) ++ goto out; ++ if (num_tokens >= 1) { ++ start_time = strtoll (tokens[0], &endp, 10); ++ if (endp == tokens[0]) { ++ kit_strfreev (tokens); ++ goto out; ++ } ++ } else { ++ kit_strfreev (tokens); ++ goto out; ++ } ++ ++ kit_strfreev (tokens); ++#else ++ + /* start time is the 19th token after the '(process name)' entry */ + + p = strchr (contents, ')'); +@@ -118,6 +150,7 @@ polkit_sysdeps_get_start_time_for_pid (p + } + + kit_strfreev (tokens); ++#endif + + out: + kit_free (filename); +@@ -153,7 +186,11 @@ polkit_sysdeps_get_exe_for_pid (pid_t pi + + ret = 0; + ++#ifdef __FreeBSD__ ++ snprintf (proc_name, sizeof (proc_name), "/proc/%d/file", pid); ++#else + snprintf (proc_name, sizeof (proc_name), "/proc/%d/exe", pid); ++#endif + ret = readlink (proc_name, out_buf, buf_size - 1); + if (ret == -1) { + strncpy (out_buf, "(unknown)", buf_size); +@@ -166,6 +203,108 @@ out: + return ret; + } + ++#ifndef HAVE_GETLINE ++/* Taken from GNU sed. */ ++/* Read up to (and including) a '\n' from STREAM into *LINEPTR ++ (and null-terminate it). *LINEPTR is a pointer returned from malloc (or ++ NULL), pointing to *N characters of space. It is realloc'd as ++ necessary. Returns the number of characters read (not including the ++ null terminator), or -1 on error or EOF. */ ++ ++ssize_t ++polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream) ++{ ++ char *line, *p; ++ long size, copy; ++ ++ if (lineptr == NULL || n == NULL) { ++ errno = EINVAL; ++ return (ssize_t) -1; ++ } ++ ++ if (ferror (stream)) ++ return (ssize_t) -1; ++ ++ /* Make sure we have a line buffer to start with. */ ++ if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars. */ { ++#ifndef MAX_CANON ++#define MAX_CANON 256 ++#endif ++ if (!*lineptr) ++ line = (char *) malloc (MAX_CANON); ++ else ++ line = (char *) realloc (*lineptr, MAX_CANON); ++ if (line == NULL) ++ return (ssize_t) -1; ++ *lineptr = line; ++ *n = MAX_CANON; ++ } ++ ++ line = *lineptr; ++ size = *n; ++ ++ copy = size; ++ p = line; ++ ++ while (1) { ++ long len; ++ ++ while (--copy > 0) { ++ int c = getc (stream); ++ ++ if (c == EOF) ++ goto lose; ++ else if ((*p++ = c) == '\n') ++ goto win; ++ } ++ ++ /* Need to enlarge the line buffer. */ ++ len = p - line; ++ size *= 2; ++ line = (char *) realloc (line, size); ++ if (line == NULL) ++ goto lose; ++ *lineptr = line; ++ *n = size; ++ p = line + len; ++ copy = size - len; ++ } ++ ++lose: ++ if (p == *lineptr) ++ return (ssize_t) -1; ++ ++ /* Return a partial line since we got an error in the middle. */ ++win: ++ *p = '\0'; ++ return p - *lineptr; ++} ++#else ++ssize_t ++polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream) ++{ ++ return getline (lineptr, n, stream); ++} ++#endif ++ ++#ifndef HAVE_CLEARENV ++extern char **environ; ++int ++polkit_sysdeps_clearenv (void) ++{ ++ if (environ != NULL) { ++ environ[0] = NULL; ++ } ++ return 0; ++} ++#else ++int ++polkit_sysdeps_clearenv (void) ++{ ++ return clearenv (); ++} ++#endif ++ + #ifdef POLKIT_BUILD_TESTS + + static polkit_bool_t diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h new file mode 100644 index 000000000000..da4be3497c55 --- /dev/null +++ b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h @@ -0,0 +1,20 @@ +--- src/polkit/polkit-sysdeps.h.orig 2007-12-23 01:46:49.000000000 -0500 ++++ src/polkit/polkit-sysdeps.h 2007-12-23 01:48:22.000000000 -0500 +@@ -35,6 +35,7 @@ + #define POLKIT_SYSDEPS_H + + #include <sys/types.h> ++#include <stdio.h> + #include <polkit/polkit-types.h> + + POLKIT_BEGIN_DECLS +@@ -43,6 +44,9 @@ polkit_uint64_t polkit_sysdeps_get_start + + int polkit_sysdeps_get_exe_for_pid (pid_t pid, char *out_buf, size_t buf_size); + ++ssize_t polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream); ++ ++int polkit_sysdeps_clearenv (void); + + POLKIT_END_DECLS + diff --git a/sysutils/policykit/files/patch-tools_Makefile.in b/sysutils/policykit/files/patch-tools_Makefile.in deleted file mode 100644 index 9308ff774f36..000000000000 --- a/sysutils/policykit/files/patch-tools_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/Makefile.in.orig Sun Oct 8 03:37:21 2006 -+++ tools/Makefile.in Sun Oct 8 03:37:37 2006 -@@ -252,9 +252,9 @@ INCLUDES = \ - @DBUS_CFLAGS@ - - polkit_is_privileged_SOURCES = polkit-is-privileged.c --polkit_is_privileged_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la -+polkit_is_privileged_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la - polkit_list_privileges_SOURCES = polkit-list-privileges.c --polkit_list_privileges_LDADD = @DBUS_CFLAGS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la -+polkit_list_privileges_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ $(top_builddir)/libpolkit/libpolkit.la - polkit_grant_privilege_SOURCES = \ - polkit-grant-privilege.c \ - polkit-interface-manager-glue.h \ diff --git a/sysutils/policykit/files/patch-tools_polkit-auth.c b/sysutils/policykit/files/patch-tools_polkit-auth.c new file mode 100644 index 000000000000..f3ee42d1f55d --- /dev/null +++ b/sysutils/policykit/files/patch-tools_polkit-auth.c @@ -0,0 +1,61 @@ +--- tools/polkit-auth.c.orig 2007-12-05 22:30:18.000000000 -0500 ++++ tools/polkit-auth.c 2007-12-23 01:43:36.000000000 -0500 +@@ -37,12 +37,13 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/wait.h> + #include <pwd.h> + #include <grp.h> + #include <unistd.h> + #include <errno.h> + #include <termios.h> + + #include <polkit-dbus/polkit-dbus.h> + #include <polkit-grant/polkit-grant.h> + +@@ -107,7 +109,7 @@ conversation_select_admin_user (PolKitGr + } + printf ("\n"); + printf ("Select user: "); +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + user = strdup (lineptr); + free (lineptr); + return user; +@@ -133,7 +135,7 @@ conversation_pam_prompt_echo_off (PolKit + exit (1); + } + +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + + /* Restore terminal. */ + tcsetattr (fileno (stdout), TCSAFLUSH, &old); +@@ -151,7 +153,7 @@ conversation_pam_prompt_echo_on (PolKitG + size_t linelen = 0; + char *result; + printf ("%s", request); +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + result = strdup (lineptr); + free (lineptr); + printf ("\n"); +@@ -189,7 +191,7 @@ conversation_override_grant_type (PolKit + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION: + printf ("Keep this privilege for the session? [no/session]?\n"); + again: +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + if (g_str_has_prefix (lineptr, "no")) { + ; + } else if (g_str_has_prefix (lineptr, "session")) { +@@ -204,7 +206,7 @@ conversation_override_grant_type (PolKit + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS: + printf ("Keep this privilege for the session or always? [no/session/always]?\n"); + again2: +- getline (&lineptr, &linelen, stdin); ++ polkit_sysdeps_getline (&lineptr, &linelen, stdin); + if (g_str_has_prefix (lineptr, "no")) { + ; + } else if (g_str_has_prefix (lineptr, "session")) { diff --git a/sysutils/policykit/files/polkitd.in b/sysutils/policykit/files/polkitd.in deleted file mode 100644 index 0e2a829c6f54..000000000000 --- a/sysutils/policykit/files/polkitd.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: polkitd -# REQUIRE: DAEMON dbus -# -# Add the following line to /etc/rc.conf to enable the PolicyKit daemon: -# -# polkitd_enable="YES" -# - -. %%RC_SUBR%% -. %%GNOME_SUBR%% - -polkitd_enable=${polkitd_enable-${gnome_enable}} - -name=polkitd -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/polkitd" -pidfile="/var/run/${name}/${name}.pid" - -start_precmd="polkitd_precmd" -stop_postcmd="polkitd_postcmd" - -local_force_depend() -{ - _depend="$1" - if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then - _depend="${_depend}.sh" - fi - - if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 && - ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then - return 1 - fi - return 0 -} - -polkitd_precmd() -{ - if ! checkyesno dbus_enable - then - local_force_depend dbus || return 1 - fi - - mkdir -p $(dirname $pidfile) -} - -polkitd_postcmd() -{ - rm -f $pidfile -} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/sysutils/policykit/pkg-install b/sysutils/policykit/pkg-install index 38383f8285ee..3d49ff2062ef 100644 --- a/sysutils/policykit/pkg-install +++ b/sysutils/policykit/pkg-install @@ -32,7 +32,16 @@ POST-INSTALL) fi fi - /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/polkitd + /usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/run/PolicyKit + /usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/lib/PolicyKit + /usr/bin/install -d -o root -m 0775 -g ${GROUP} /var/lib/PolicyKit-public + /bin/mkdir -p /var/lib/misc + /usr/bin/touch -f /var/lib/misc/PolicyKit.reload + /usr/bin/chgrp ${GROUP} /var/lib/misc/PolicyKit.reload + /bin/chmod 0775 /var/lib/misc/PolicyKit.reload + for i in ${PKG_PREFIX}/libexec/polkit-read-auth-helper ${PKG_PREFIX}/libexec/polkit-set-default-helper ${PKG_PREFIX}/libexec/polkit-grant-helper ${PKG_PREFIX}/libexec/polkit-grant-helper-pam ${PKG_PREFIX}/libexec/polkit-explicit-grant-helper ${PKG_PREFIX}/libexec/polkit-revoke-helper /var/lib/misc/PolicyKit.reload; do + /usr/bin/chgrp ${GROUP} ${i} + done exit 0 ;; esac diff --git a/sysutils/policykit/pkg-plist b/sysutils/policykit/pkg-plist index 66c27dc14847..1442b6c2b740 100644 --- a/sysutils/policykit/pkg-plist +++ b/sysutils/policykit/pkg-plist @@ -1,19 +1,71 @@ -bin/polkit-grant-privilege -bin/polkit-is-privileged -bin/polkit-list-privileges -bin/polkit-revoke-privilege -etc/PolicyKit/privilege.d/desktop-console.privilege -etc/dbus-1/system.d/PolicyKit.conf -etc/pam.d/policy-kit -include/libpolkit/libpolkit.h +bin/polkit-action +bin/polkit-auth +bin/polkit-config-file-validate +bin/polkit-policy-file-validate +@unexec if cmp -s %D/etc/PolicyKit/PolicyKit.conf %D/etc/PolicyKit/PolicyKit.conf.dist; then rm -f %D/etc/PolicyKit/PolicyKit.conf +etc/PolicyKit/PolicyKit.conf.dist +@exec [ -f %B/PolicyKit.conf ] || cp %B/%f %B/PolicyKit.conf +etc/PolicyKit/PolicyKit.conf +etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf +etc/pam.d/polkit +etc/profile.d/polkit-bash-completion.sh +include/PolicyKit/polkit-dbus/polkit-dbus.h +include/PolicyKit/polkit-dbus/polkit-simple.h +include/PolicyKit/polkit-grant/polkit-grant.h +include/PolicyKit/polkit/polkit-action.h +include/PolicyKit/polkit/polkit-authorization-constraint.h +include/PolicyKit/polkit/polkit-authorization-db.h +include/PolicyKit/polkit/polkit-authorization.h +include/PolicyKit/polkit/polkit-caller.h +include/PolicyKit/polkit/polkit-config.h +include/PolicyKit/polkit/polkit-context.h +include/PolicyKit/polkit/polkit-error.h +include/PolicyKit/polkit/polkit-policy-cache.h +include/PolicyKit/polkit/polkit-policy-default.h +include/PolicyKit/polkit/polkit-policy-file-entry.h +include/PolicyKit/polkit/polkit-policy-file.h +include/PolicyKit/polkit/polkit-result.h +include/PolicyKit/polkit/polkit-seat.h +include/PolicyKit/polkit/polkit-session.h +include/PolicyKit/polkit/polkit-sysdeps.h +include/PolicyKit/polkit/polkit-types.h +include/PolicyKit/polkit/polkit.h +lib/libpolkit-dbus.a +lib/libpolkit-dbus.la +lib/libpolkit-dbus.so +lib/libpolkit-dbus.so.2 +lib/libpolkit-grant.a +lib/libpolkit-grant.la +lib/libpolkit-grant.so +lib/libpolkit-grant.so.2 lib/libpolkit.a lib/libpolkit.la lib/libpolkit.so -lib/libpolkit.so.0 +lib/libpolkit.so.2 +libdata/pkgconfig/polkit-dbus.pc +libdata/pkgconfig/polkit-grant.pc libdata/pkgconfig/polkit.pc -sbin/polkitd -@dirrm include/libpolkit -@dirrm etc/PolicyKit/privilege.d +libexec/polkit-explicit-grant-helper +libexec/polkit-grant-helper +libexec/polkit-grant-helper-pam +libexec/polkit-read-auth-helper +libexec/polkit-revoke-helper +libexec/polkit-set-default-helper +libexec/polkitd +share/PolicyKit/config.dtd +share/PolicyKit/policy/org.freedesktop.policykit.policy +share/dbus-1/interfaces/org.freedesktop.PolicyKit.AuthenticationAgent.xml +share/dbus-1/system-services/org.freedesktop.PolicyKit.service +@dirrmtry share/PolicyKit/policy +@dirrmtry share/PolicyKit +@dirrm include/PolicyKit/polkit +@dirrm include/PolicyKit/polkit-grant +@dirrm include/PolicyKit/polkit-dbus +@dirrm include/PolicyKit +@dirrmtry etc/profile.d @dirrm etc/PolicyKit -@unexec rm -f /var/run/polkitd/polkitd.pid 2>/dev/null || true -@unexec rmdir /var/run/polkitd 2>/dev/null || true +@unexec rm -rf /var/run/PolicyKit 2>/dev/null || true +@unexec rmdir /var/lib/PolicyKit 2>/dev/null || true +@unexec rmdir /var/lib/PolicyKit-public 2>/dev/null || true +@unexec rm -f /var/lib/misc/PolicyKit.reload 2>/dev/null || true +@unexec rmdir /var/lib/misc 2>/dev/null || true diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 008b7aee13b7..d9d941992d35 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -3,21 +3,21 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.40 2007/10/04 11:32:48 ahze Exp $ +# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.51 2008/03/09 18:48:33 mezz Exp $ # PORTNAME= system-tools-backends -PORTVERSION= 2.4.1 +PORTVERSION= 2.6.0 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 COMMENT= Backend system admin scripts for gnome-system-tools BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + polkit-dbus.2:${PORTSDIR}/sysutils/policykit RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus USE_BZIP2= yes @@ -25,7 +25,6 @@ USE_GMAKE= yes USE_PERL5= yes USE_GNOME= gnomehack intlhack glib20 GNU_CONFIGURE= yes -USE_RC_SUBR= system-tools-backends USE_GNOME_SUBR= yes CONFIGURE_ARGS= --with-stb-group=wheel \ --localstatedir=/var diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo index ccad604a0755..3e804006bda3 100644 --- a/sysutils/system-tools-backends/distinfo +++ b/sysutils/system-tools-backends/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/system-tools-backends-2.4.1.tar.bz2) = 063f38e6014c8f7ba9b92b0f94255652 -SHA256 (gnome2/system-tools-backends-2.4.1.tar.bz2) = c0aea44c58d32870b429337751bf3f41cd471b8c8849a373c46999fd63d583e8 -SIZE (gnome2/system-tools-backends-2.4.1.tar.bz2) = 411012 +MD5 (gnome2/system-tools-backends-2.6.0.tar.bz2) = faf321012e92b72305878cd684547c54 +SHA256 (gnome2/system-tools-backends-2.6.0.tar.bz2) = 5c35820a7a3d7fc3af5c6e3ce7c7529359809e486fdafecb68601ac4d2bfa6f0 +SIZE (gnome2/system-tools-backends-2.6.0.tar.bz2) = 421806 diff --git a/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c b/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c deleted file mode 100644 index f1f49929e772..000000000000 --- a/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c +++ /dev/null @@ -1,11 +0,0 @@ ---- dispatcher/dispatcher.c.orig Thu Apr 12 23:55:38 2007 -+++ dispatcher/dispatcher.c Thu Apr 12 23:57:40 2007 -@@ -203,7 +203,7 @@ daemonize (void) - - setsid (); - -- if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1) -+ if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY, 0600)) != -1) - { - str = g_strdup_printf ("%d", getpid ()); - write (pidfile_fd, str, strlen (str)); diff --git a/sysutils/system-tools-backends/files/patch-dispatcher_main.c b/sysutils/system-tools-backends/files/patch-dispatcher_main.c new file mode 100644 index 000000000000..b575cbfd46fa --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-dispatcher_main.c @@ -0,0 +1,11 @@ +--- dispatcher/main.c.orig 2007-10-29 20:36:16.890317344 -0400 ++++ dispatcher/main.c 2007-10-29 20:37:02.584773483 -0400 +@@ -47,7 +47,7 @@ + + setsid (); + +- if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1) ++ if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY, 0600)) != -1) + { + str = g_strdup_printf ("%d", getpid ()); + write (pidfile_fd, str, strlen (str)); diff --git a/sysutils/system-tools-backends/files/system-tools-backends.in b/sysutils/system-tools-backends/files/system-tools-backends.in deleted file mode 100644 index b23f16bb2648..000000000000 --- a/sysutils/system-tools-backends/files/system-tools-backends.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# $MCom: ports/sysutils/system-tools-backends/files/system-tools-backends.in,v 1.5 2007/07/10 16:47:46 ahze Exp $ - -# PROVIDE: system-tools-backends -# REQUIRE: DAEMON dbus -# -# Add the following to /etc/rc.conf to start SystemToolsBackends at boot time: -# -# system_tools_backends_enable="YES" -# - -. %%RC_SUBR%% -. %%GNOME_SUBR%% - -export PATH=${PATH}:%%PREFIX%%/bin - -system_tools_backends_enable=${system_tools_backends_enable-${gnome_enable}} - -name=system_tools_backends -rcvar=`set_rcvar` -command="%%PREFIX%%/bin/system-tools-backends" -pidfile="/var/run/system-tools-backends.pid" - -load_rc_config ${name} -run_rc_command "$1" diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index 31f146f16b1f..c679607233eb 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -1,18 +1,22 @@ bin/system-tools-backends etc/dbus-1/system.d/system-tools-backends.conf libdata/pkgconfig/system-tools-backends-2.0.pc -share/dbus-1/services/org.freedesktop.SystemToolsBackends.GroupsConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.HostsConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.IfacesConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.NFSConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.NTPConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.Platform.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.SMBConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.ServicesConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.TimeConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.UsersConfig.service -share/dbus-1/services/org.freedesktop.SystemToolsBackends.service +share/PolicyKit/policy/system-tools-backends.policy +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.IfacesConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NFSConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NTPConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.Platform.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.SMBConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.ServicesConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service +share/system-tools-backends-2.0/files/general_gprs_chatscript share/system-tools-backends-2.0/files/general_isdn_ppp_options +share/system-tools-backends-2.0/files/general_pppoe_ppp_options share/system-tools-backends-2.0/scripts/GroupsConfig.pm share/system-tools-backends-2.0/scripts/HostsConfig.pm share/system-tools-backends-2.0/scripts/IfacesConfig.pm @@ -32,6 +36,7 @@ share/system-tools-backends-2.0/scripts/SystemToolsBackends.pl share/system-tools-backends-2.0/scripts/Time/NTP.pm share/system-tools-backends-2.0/scripts/Time/TimeDate.pm share/system-tools-backends-2.0/scripts/TimeConfig.pm +share/system-tools-backends-2.0/scripts/UserConfig.pm share/system-tools-backends-2.0/scripts/Users/Groups.pm share/system-tools-backends-2.0/scripts/Users/Shells.pm share/system-tools-backends-2.0/scripts/Users/Users.pm diff --git a/textproc/Makefile b/textproc/Makefile index 5715c586c658..973c7cddb13f 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -138,6 +138,7 @@ SUBDIR += et-aspell SUBDIR += etoile-lucenekit SUBDIR += etoile-ogrekit + SUBDIR += exempi SUBDIR += exml SUBDIR += expat2 SUBDIR += exslt @@ -176,6 +177,7 @@ SUBDIR += gpp SUBDIR += grap SUBDIR += gsed + SUBDIR += gstreamer-plugins-annodex SUBDIR += gtk-doc SUBDIR += gtkdiff SUBDIR += gtkspell diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile new file mode 100644 index 000000000000..b71435688511 --- /dev/null +++ b/textproc/exempi/Makefile @@ -0,0 +1,30 @@ +# New ports collection makefile for: exempi +# Date created: 2008-02-26 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/textproc/exempi/Makefile,v 1.1 2008/02/26 18:50:26 ahze Exp $ + +PORTNAME= exempi +PORTVERSION= 1.99.9 +CATEGORIES= textproc +MASTER_SITES= http://libopenraw.freedesktop.org/download/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A port of Adobe XMP SDK to work on UNIX + +LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 + +USE_AUTOTOOLS= libtool:15 +USE_GNOME= ltverhack gnomehack +CONFIGURE_ARGS= --enable-unittest=no +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ + LIBS="-liconv" +USE_ICONV= yes +USE_LDCONFIG= yes + +post-patch: + @${REINPLACE_CMD} -e 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/configure + +.include <bsd.port.mk> diff --git a/textproc/exempi/distinfo b/textproc/exempi/distinfo new file mode 100644 index 000000000000..045db78a114b --- /dev/null +++ b/textproc/exempi/distinfo @@ -0,0 +1,3 @@ +MD5 (exempi-1.99.9.tar.gz) = 8fb6c6230a4862b8c82b4b76be6ffb1e +SHA256 (exempi-1.99.9.tar.gz) = 10104ff8405604b32583fb8c8731c038525aeacf6c4a44f2845649964a3c9a7b +SIZE (exempi-1.99.9.tar.gz) = 3063146 diff --git a/textproc/exempi/files/patch-source_XMPFiles_FormatSupport_EndianUtils.hpp b/textproc/exempi/files/patch-source_XMPFiles_FormatSupport_EndianUtils.hpp new file mode 100644 index 000000000000..658138633b92 --- /dev/null +++ b/textproc/exempi/files/patch-source_XMPFiles_FormatSupport_EndianUtils.hpp @@ -0,0 +1,11 @@ +--- source/XMPFiles/FormatSupport/EndianUtils.hpp.orig 2008-02-26 11:51:10.000000000 -0500 ++++ source/XMPFiles/FormatSupport/EndianUtils.hpp 2008-02-26 11:51:17.000000000 -0500 +@@ -38,7 +38,7 @@ + #endif + #endif + #elif XMP_UNIXBuild +-#include <endian.h> ++#include <machine/endian.h> + #if BYTE_ORDER == BIG_ENDIAN + #define kBigEndianHost 1 + #elif BYTE_ORDER == LITTLE_ENDIAN diff --git a/textproc/exempi/files/patch-source_XMPFiles_FormatSupport_Reconcile_Impl.cpp b/textproc/exempi/files/patch-source_XMPFiles_FormatSupport_Reconcile_Impl.cpp new file mode 100644 index 000000000000..90e3f7c221e5 --- /dev/null +++ b/textproc/exempi/files/patch-source_XMPFiles_FormatSupport_Reconcile_Impl.cpp @@ -0,0 +1,20 @@ +--- source/XMPFiles/FormatSupport/Reconcile_Impl.cpp.orig 2008-02-26 11:56:56.000000000 -0500 ++++ source/XMPFiles/FormatSupport/Reconcile_Impl.cpp 2008-02-26 12:04:09.000000000 -0500 +@@ -249,7 +249,7 @@ + + iconv_t cd = iconv_open( "ISO8859-1", "UTF-8" ); + +- char * in = (char *)utf8Ptr; ++ const char * in = (char *)utf8Ptr; + size_t inLen = utf8Len; + size_t outLen = utf8Len * 4; + char * buf = (char *)calloc( outLen, 1 ); +@@ -406,7 +406,7 @@ + + iconv_t cd = iconv_open( "UTF-8", "ISO8859-1" ); + +- char * in = (char *)_latin1Ptr; ++ const char * in = (char *)_latin1Ptr; + size_t inLen = latin1Len; + size_t outLen = latin1Len * 4; + char * buf = (char *)calloc( outLen, 1 ); diff --git a/textproc/exempi/pkg-descr b/textproc/exempi/pkg-descr new file mode 100644 index 000000000000..543d5a0c3fea --- /dev/null +++ b/textproc/exempi/pkg-descr @@ -0,0 +1,3 @@ +Exempi is an implementation of XMP and is based on Adobe XMP SDK + +WWW: http://libopenraw.freedesktop.org/wiki/Exempi diff --git a/textproc/exempi/pkg-plist b/textproc/exempi/pkg-plist new file mode 100644 index 000000000000..2e039e9feda0 --- /dev/null +++ b/textproc/exempi/pkg-plist @@ -0,0 +1,10 @@ +include/exempi-2.0/exempi/xmp.h +include/exempi-2.0/exempi/xmpconsts.h +include/exempi-2.0/exempi/xmperrors.h +lib/libexempi.a +lib/libexempi.la +lib/libexempi.so +lib/libexempi.so.3 +libdata/pkgconfig/exempi-2.0.pc +@dirrm include/exempi-2.0/exempi +@dirrm include/exempi-2.0 diff --git a/textproc/gstreamer-plugins-annodex/Makefile b/textproc/gstreamer-plugins-annodex/Makefile new file mode 100644 index 000000000000..99a108019c2e --- /dev/null +++ b/textproc/gstreamer-plugins-annodex/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: gstreamer-plugins-annodex +# Date created: 14 Feb 2008 +# Whom: Koop Mast <kwm@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/textproc/gstreamer-plugins-annodex/Makefile,v 1.3 2008/03/19 14:05:38 ahze Exp $ +# + +PORTREVISION= 2 +CATEGORIES= textproc + +COMMENT= Gstreamer annodex xml plugin + +GST_PLUGIN= annodex + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 88a1e8fe3558..66c69477af04 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -3,10 +3,10 @@ # Whom: fenner # # $FreeBSD$ -# +# $MCom: ports/textproc/gtk-doc/Makefile,v 1.6 2008/03/19 21:35:45 ahze Exp $ PORTNAME= gtk-doc -PORTVERSION= 1.9 +PORTVERSION= 1.10 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo index 9fc10e82f9d1..07090c873a37 100644 --- a/textproc/gtk-doc/distinfo +++ b/textproc/gtk-doc/distinfo @@ -1,3 +1,3 @@ -MD5 (gtk-doc-1.9.tar.bz2) = bcd002f381385812737a05538eb8b21e -SHA256 (gtk-doc-1.9.tar.bz2) = d1be2fc7be880b912f871675baed4a9e28ee4c19eef7fd1299c9c5d11cc9a80d -SIZE (gtk-doc-1.9.tar.bz2) = 391957 +MD5 (gtk-doc-1.10.tar.bz2) = cbd4be396b0cf8b8ce1fc9b927cdf451 +SHA256 (gtk-doc-1.10.tar.bz2) = 5aeefd055c47d4e8b906e7f74b7769ebafbe3873d90cb9987b2ec503a9b558eb +SIZE (gtk-doc-1.10.tar.bz2) = 404379 diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist index 52438fd79b66..980a8451a8aa 100644 --- a/textproc/gtk-doc/pkg-plist +++ b/textproc/gtk-doc/pkg-plist @@ -1,4 +1,5 @@ bin/gtkdoc-check +bin/gtkdoc-depscan bin/gtkdoc-fixxref bin/gtkdoc-mkdb bin/gtkdoc-mkhtml diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index 0f6909e71656..08aab60d1035 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 $ PORTNAME= intltool -PORTVERSION= 0.36.3 +PORTVERSION= 0.37.1 CATEGORIES= textproc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo index 7cffabd10f18..a7fc9a8f6690 100644 --- a/textproc/intltool/distinfo +++ b/textproc/intltool/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/intltool-0.36.3.tar.bz2) = 4a4428eedf69ac2717f2353b742fe42e -SHA256 (gnome/intltool-0.36.3.tar.bz2) = ba1c9907de4b4e89f73e753bc7861334625366406b237846bf357787466aa05e -SIZE (gnome/intltool-0.36.3.tar.bz2) = 138644 +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 diff --git a/textproc/libtranslate/Makefile b/textproc/libtranslate/Makefile index d707c4bfcb91..f9c0db4fe289 100644 --- a/textproc/libtranslate/Makefile +++ b/textproc/libtranslate/Makefile @@ -37,7 +37,7 @@ PLIST_SUB+= GENERIC="@comment " .else PLIST_SUB+= GENERIC="" USE_GNOME+= libxml2 -LIB_DEPENDS+= soup-2.2:${PORTSDIR}/devel/libsoup +LIB_DEPENDS+= soup-2.2:${PORTSDIR}/devel/libsoup22 MAN5+= services.xml.5 .endif diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile index c2fe64402f72..665bee127469 100644 --- a/textproc/libxml++26/Makefile +++ b/textproc/libxml++26/Makefile @@ -4,11 +4,11 @@ # Whom: Ying-Chieh Liao <ijliao@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/textproc/libxml++26/Makefile,v 1.22 2007/09/18 16:36:01 marcus Exp $ +# $MCom: ports/textproc/libxml++26/Makefile,v 1.25 2008/03/11 04:21:47 mezz Exp $ # PORTNAME= libxml++ -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo index 7ae26a4ff694..53634aaaf134 100644 --- a/textproc/libxml++26/distinfo +++ b/textproc/libxml++26/distinfo @@ -1,3 +1,3 @@ -MD5 (libxml++-2.20.0.tar.gz) = 0f6a95220c7cd893e711f85ad4056a1c -SHA256 (libxml++-2.20.0.tar.gz) = 4b77156f6590a294aea179f2c42c2ced6b97368552be1298ee1ed072ca2e130e -SIZE (libxml++-2.20.0.tar.gz) = 2044144 +MD5 (libxml++-2.22.0.tar.gz) = 0ed7e73ba783839af8ddc0fb81a22526 +SHA256 (libxml++-2.22.0.tar.gz) = 4a874ae2b6608a989523cec96b08034f03e02ac6ec8a1aa271fc1eca141016ab +SIZE (libxml++-2.22.0.tar.gz) = 2067450 diff --git a/textproc/libxml++26/files/patch-libxml++::parsers::parser.cc b/textproc/libxml++26/files/patch-libxml++::parsers::parser.cc deleted file mode 100644 index c77f306e95b6..000000000000 --- a/textproc/libxml++26/files/patch-libxml++::parsers::parser.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- libxml++/parsers/parser.cc.orig Sat Feb 7 02:11:35 2004 -+++ libxml++/parsers/parser.cc Fri Feb 20 00:02:22 2004 -@@ -9,6 +9,7 @@ - #include <libxml/parser.h> - - #include <cstdarg> //For va_list. -+#include <memory> - - namespace xmlpp { - diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile index f8d0260c8988..5804e61789ae 100644 --- a/textproc/rarian/Makefile +++ b/textproc/rarian/Makefile @@ -3,15 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/textproc/rarian/Makefile,v 1.8 2007/10/11 04:04:18 mezz Exp $ +# $MCom: ports/textproc/rarian/Makefile,v 1.12 2008/03/09 21:41:22 mezz Exp $ # PORTNAME= rarian -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.8.0 CATEGORIES= textproc gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= An OMF help system based on the Freedesktop specification diff --git a/textproc/rarian/distinfo b/textproc/rarian/distinfo index c10840549f71..5994d6d55ed6 100644 --- a/textproc/rarian/distinfo +++ b/textproc/rarian/distinfo @@ -1,3 +1,3 @@ -MD5 (rarian-0.6.0.tar.bz2) = 23772a3b0f882d13c86dd9fa67bb21bf -SHA256 (rarian-0.6.0.tar.bz2) = 2f169f3c794b2602d8590b1fd16c0aa5b7ca77e993f74b89c4f42db74c1d2029 -SIZE (rarian-0.6.0.tar.bz2) = 312258 +MD5 (rarian-0.8.0.tar.bz2) = 67e2d3ab27edcebdae9b85733712805e +SHA256 (rarian-0.8.0.tar.bz2) = 93f97611ead9a5ed4aed468532c0543f0f8cdfed350f94ba8b0f789a10a1de9c +SIZE (rarian-0.8.0.tar.bz2) = 338724 diff --git a/textproc/rarian/pkg-plist b/textproc/rarian/pkg-plist index 1abb978331bc..bf7762d27b6b 100644 --- a/textproc/rarian/pkg-plist +++ b/textproc/rarian/pkg-plist @@ -26,6 +26,7 @@ bin/scrollkeeper-rebuilddb bin/scrollkeeper-uninstall bin/scrollkeeper-update include/rarian/rarian-info.h +include/rarian/rarian-main.h include/rarian/rarian-man.h include/rarian/rarian-reg-utils.h include/rarian/rarian.h @@ -34,7 +35,7 @@ lib/librarian.la lib/librarian.so lib/librarian.so.0 libdata/pkgconfig/rarian.pc -share/doc/rarian/rarian.document +%%DOCSDIR%%/rarian.document share/librarian/Templates/C/scrollkeeper_cl.xml share/librarian/manual/help-spec-0.2.xml share/librarian/manual/index.xhtml @@ -46,7 +47,7 @@ share/librarian/rarian-sk-cl.xml @dirrm share/librarian/Templates/C @dirrm share/librarian/Templates @dirrm share/librarian -@dirrm share/doc/rarian +@dirrm %%DOCSDIR%% @dirrm include/rarian @unexec rm -rf /var/db/scrollkeeper 2>/dev/null || true @exec mkdir -p /var/db/rarian diff --git a/www/Makefile b/www/Makefile index f8cb956ad92b..7376c51aafcd 100644 --- a/www/Makefile +++ b/www/Makefile @@ -168,6 +168,7 @@ SUBDIR += entrans SUBDIR += epiphany SUBDIR += epiphany-extensions + SUBDIR += epiphany-webkit SUBDIR += erwn SUBDIR += etoile-bookmarkkit SUBDIR += etoile-mollusk @@ -330,6 +331,7 @@ SUBDIR += mhonarc SUBDIR += micro_httpd SUBDIR += middleman + SUBDIR += midori SUBDIR += mimetex SUBDIR += mini_httpd SUBDIR += mkapachepw @@ -1319,6 +1321,7 @@ SUBDIR += webfs SUBDIR += webglimpse SUBDIR += webinject + SUBDIR += webkit-gtk2 SUBDIR += weblint SUBDIR += weblint++ SUBDIR += webredirect diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 4aca8285d20a..f4147b6f87aa 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.101 2007/10/15 22:00:17 mezz Exp $ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.105 2008/03/11 17:19:08 mezz Exp $ # PORTNAME= epiphany-extensions -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 CATEGORIES= www 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 @@ -35,9 +34,9 @@ CONFIGURE_ARGS= --with-mozilla=${GECKO} GCONF_SCHEMAS= smart-bookmarks.schemas EPHY_EXTENSIONS=all,rss -EPHY_VERSION= 2.20 +EPHY_VERSION= 2.22 -PLIST_SUB= VERSION="2.20" EPHY_VERSION=${EPHY_VERSION} +PLIST_SUB= VERSION="2.22" EPHY_VERSION=${EPHY_VERSION} OPTIONS= OPENSP "Enable OpenSP SGML support" off diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index 993d27d10568..3bbce21aae97 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 86563cb1e7cda31d45f220ae2e185fef -SHA256 (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 3b19652c6717d9f1dbfc2b855e9777e58623247765accbe8cfc7b86cb840aea2 -SIZE (gnome2/epiphany-extensions-2.20.3.tar.bz2) = 909040 +MD5 (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 05b131995c532f2689150c731b2f37c1 +SHA256 (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 8d9b57aa22bbb318650dcb6dd73bec1951e9cb5ae64f37d84e39749fdbdd0754 +SIZE (gnome2/epiphany-extensions-2.22.0.tar.bz2) = 926352 diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index f107dc0306ba..b1021240d76f 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -62,7 +62,6 @@ lib/epiphany/%%VERSION%%/extensions/smart-bookmarks.ephy-extension lib/epiphany/%%VERSION%%/extensions/tab-groups.ephy-extension lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension %%DATADIR%%/adblock-patterns -%%DATADIR%%/adblock-statusbar-icon.svg %%DATADIR%%/ephy-gestures.xml %%DATADIR%%/glade/action-properties.glade %%DATADIR%%/glade/actions-editor.glade @@ -73,8 +72,11 @@ lib/epiphany/%%VERSION%%/extensions/tab-states.ephy-extension %%DATADIR%%/glade/rss-ui.glade %%DATADIR%%/xml/epiphany-sidebar-ui.xml %%DATADIR%%/xml/page-info-context-ui.xml +share/epiphany/icons/hicolor/16x16/status/ad-blocked.png share/epiphany/icons/hicolor/16x16/status/feed-presence.png +share/epiphany/icons/hicolor/22x22/status/ad-blocked.png share/epiphany/icons/hicolor/22x22/status/feed-presence.png +share/epiphany/icons/hicolor/24x24/status/ad-blocked.png share/epiphany/icons/hicolor/24x24/status/feed-presence.png share/epiphany/icons/hicolor/32x32/status/feed-presence.png share/epiphany/icons/hicolor/scalable/status/feed-presence.svg @@ -99,6 +101,46 @@ share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/C/legal.xml +share/gnome/help/epiphany-extensions/es/epiphany-extensions.xml +share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-adblocker.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-back.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close-2.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-forward.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-fullscreen.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-homepage.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-new-tab.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-new-window.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-next-tab.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-prev-tab.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-reload.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-stop.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-up.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source-2.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-sidebar.png +share/gnome/help/epiphany-extensions/es/figures/epi-ext-tabgroups.png +share/gnome/help/epiphany-extensions/oc/epiphany-extensions.xml +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-create.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-adblocker.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-back.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close-2.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-forward.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-fullscreen.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-homepage.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-new-tab.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-new-window.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-next-tab.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-prev-tab.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-reload.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-stop.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-up.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-view-source-2.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-view-source.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-sidebar.png +share/gnome/help/epiphany-extensions/oc/figures/epi-ext-tabgroups.png share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png @@ -133,6 +175,7 @@ share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/fi/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/gl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/he/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @@ -163,10 +206,16 @@ share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/omf/epiphany-extensions/epiphany-extensions-C.omf +share/omf/epiphany-extensions/epiphany-extensions-es.omf +share/omf/epiphany-extensions/epiphany-extensions-oc.omf share/omf/epiphany-extensions/epiphany-extensions-sv.omf @dirrm share/omf/epiphany-extensions @dirrm share/gnome/help/epiphany-extensions/sv/figures @dirrm share/gnome/help/epiphany-extensions/sv +@dirrm share/gnome/help/epiphany-extensions/oc/figures +@dirrm share/gnome/help/epiphany-extensions/oc +@dirrm share/gnome/help/epiphany-extensions/es/figures +@dirrm share/gnome/help/epiphany-extensions/es @dirrm share/gnome/help/epiphany-extensions/C/figures @dirrm share/gnome/help/epiphany-extensions/C @dirrm share/gnome/help/epiphany-extensions diff --git a/www/epiphany-webkit/Makefile b/www/epiphany-webkit/Makefile new file mode 100644 index 000000000000..6df29de16439 --- /dev/null +++ b/www/epiphany-webkit/Makefile @@ -0,0 +1,17 @@ +# New ports collection makefile for: epiphany-webkit +# Date created: 2007-10-21 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/www/epiphany-webkit/Makefile,v 1.2 2008/02/24 22:10:56 ahze Exp $ + +PORTVERSION= 1 +PKGNAMESUFFIX= -webkit + +COMMENT= An extremely lightweight GNOME browser using the WebKit engine + +EPHY_SLAVE= webkit +MASTERDIR= ${.CURDIR}/../../www/epiphany +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile" diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index a8fac99902e6..56940c94f261 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,20 +3,22 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/epiphany/Makefile,v 1.8 2007/12/01 19:54:36 marcus Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.168 2008/03/17 05:00:09 marcus Exp $ # PORTNAME= epiphany -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -COMMENT= An extremely lightweight and simple web browser for GNOME 2 +COMMENT?= An extremely lightweight and simple web browser for GNOME 2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + notify.1:${PORTSDIR}/devel/libnotify RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/themes/LowContrast/index.theme:${PORTSDIR}/x11-themes/gnome-themes @@ -27,21 +29,18 @@ USE_BZIP2= yes USE_XLIB= yes USE_PYTHON= yes GNOME_DESKTOP_VERSION=2 -USE_GECKO= firefox seamonkey firefox15<->firefox xulrunner USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS= --with-gecko=${GECKO} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}" GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \ epiphany-fonts.schemas epiphany-pango.schemas -PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" \ - EPHY_PREFIX="${PREFIX}" +PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}" MAN1= epiphany.1 @@ -53,8 +52,20 @@ WITH_GNOME= yes .endif .include <bsd.port.pre.mk> + +.if defined(EPHY_SLAVE) && ${EPHY_SLAVE}=="webkit" +LIB_DEPENDS+= WebKitGtk.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` +CONFLICTS= epiphany-[1-9]* +.else +USE_GECKO+= firefox seamonkey firefox15<->firefox xulrunner +CONFIGURE_ARGS+= --with-gecko=${GECKO} \ + --with-engine=mozilla .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" -#.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" +CONFLICTS= epiphany-webkit-[1-9]* +.endif NO_WERROR= yes # allow build with more warnings enabled @@ -79,6 +90,7 @@ CONFIGURE_ARGS+=--enable-spell-checker .endif post-patch: + @${REINPLACE_CMD} -e 's|WebKitGdk|WebKitGtk|' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS}|g' @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \ diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index e9e986d6f7be..20a0b5c1e39a 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/epiphany-2.20.3.tar.bz2) = df2861b3e91bef6d365f50187b6170cb -SHA256 (gnome2/epiphany-2.20.3.tar.bz2) = a76268f0b842b9f9f2545717273062aeba84351208110064da55f3fe5277a9ca -SIZE (gnome2/epiphany-2.20.3.tar.bz2) = 4945544 +MD5 (gnome2/epiphany-2.22.0.tar.bz2) = 81ad67d1ad706930a295a7ed9887bf5f +SHA256 (gnome2/epiphany-2.22.0.tar.bz2) = 692c642f99ea52ac86acf1c00c31f2567cba1e155e5d93462625bd208dca7122 +SIZE (gnome2/epiphany-2.22.0.tar.bz2) = 5163182 diff --git a/www/epiphany/files/patch-lib_ephy-spell-check.c b/www/epiphany/files/patch-lib_ephy-spell-check.c new file mode 100644 index 000000000000..bd68a07d94df --- /dev/null +++ b/www/epiphany/files/patch-lib_ephy-spell-check.c @@ -0,0 +1,20 @@ +--- lib/ephy-spell-check.c.orig 2008-03-17 00:41:47.000000000 -0400 ++++ lib/ephy-spell-check.c 2008-03-17 00:47:22.000000000 -0400 +@@ -69,8 +69,15 @@ ephy_spell_check_init (EphySpellCheck *s + priv->dict = enchant_broker_request_dict (priv->broker, *locale); + if (priv->dict != NULL) break; + } +- if (priv->dict == NULL) +- g_warning (enchant_broker_get_error (priv->broker)); ++ if (priv->dict == NULL) { ++ g_warning ("No dictionary found for current locale; trying 'en'"); ++ priv->dict = enchant_broker_request_dict (priv->broker, "en"); ++ ++ if (priv->dict == NULL) { ++ g_warning (enchant_broker_get_error (priv->broker)); ++ g_warning ("No dictionary found; expect a crash until LANG is properly set"); ++ } ++ } + } + + static void diff --git a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c index 146b9e594529..afe4f26f1a41 100644 --- a/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c +++ b/www/epiphany/files/patch-src_bookmarks_ephy-bookmarks.c @@ -1,14 +1,498 @@ ---- src/bookmarks/ephy-bookmarks.c.orig Sat Apr 15 04:11:39 2006 -+++ src/bookmarks/ephy-bookmarks.c Sat Apr 15 04:13:43 2006 -@@ -92,7 +92,10 @@ static const EphyBookmarksBookmarkInfo d - * For instance in .nl these should be - * "http://www.google.nl" and "http://www.google.nl/search?q=%s" - */ -- { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") } -+ { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }, -+ { N_("The FreeBSD Project"), N_("http://www.freebsd.org/") }, -+ { N_("Daemon News"), N_("http://daemonnews.org/") }, -+ { N_("BSD News"), N_("http://bsdnews.com/") } - }; - - static const char *default_topics [] = +--- src/bookmarks/ephy-bookmarks.c 2008/01/14 19:29:31 7863 ++++ src/bookmarks/ephy-bookmarks.c 2008/03/13 14:09:36 8102 +@@ -136,39 +136,10 @@ + static void ephy_bookmarks_finalize (GObject *object); + static char *impl_resolve_address (EphyBookmarks*, const char*, const char*); + +-static GObjectClass *parent_class = NULL; +- +-GType +-ephy_bookmarks_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) +- { +- const GTypeInfo our_info = +- { +- sizeof (EphyBookmarksClass), +- NULL, /* base_init */ +- NULL, /* base_finalize */ +- (GClassInitFunc) ephy_bookmarks_class_init, +- NULL, +- NULL, /* class_data */ +- sizeof (EphyBookmarks), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) ephy_bookmarks_init +- }; +- volatile GType flags_type; /* work around gcc's optimiser */ +- +- /* make sure the flags type is known */ +- flags_type = EPHY_TYPE_BOOKMARK_PROPERTY; +- +- type = g_type_register_static (G_TYPE_OBJECT, +- "EphyBookmarks", +- &our_info, 0); +- } +- +- return type; +-} ++G_DEFINE_TYPE_WITH_CODE (EphyBookmarks, ephy_bookmarks, G_TYPE_OBJECT, ++ volatile GType flags_type; /* work around gcc's optimiser */ ++ /* make sure the flags type is known */ ++ flags_type = EPHY_TYPE_BOOKMARK_PROPERTY;) + + static void + ephy_bookmarks_init_defaults (EphyBookmarks *eb) +@@ -194,8 +165,6 @@ + { + GObjectClass *object_class = G_OBJECT_CLASS (klass); + +- parent_class = g_type_class_peek_parent (klass); +- + object_class->finalize = ephy_bookmarks_finalize; + + klass->resolve_address = impl_resolve_address; +@@ -799,7 +768,10 @@ + char *key_dup, *value_dup; + char *raw_txt; + size_t raw_txt_len; +- ++ ++ if (!input_text) ++ return NULL; ++ + raw_txt_len = avahi_string_list_serialize (input_text, NULL, 0); + raw_txt = g_malloc (raw_txt_len); + raw_txt_len = avahi_string_list_serialize (input_text, raw_txt, raw_txt_len); +@@ -868,41 +840,14 @@ + name); + } + +-static EphyNode * +-get_node_for_id (EphyBookmarks *bookmarks, +- char *node_id) +-{ +- EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *kid, *node = NULL; +- GPtrArray *children; +- const char *id; +- guint i; +- +- children = ephy_node_get_children (priv->local); +- for (i = 0; i < children->len; i++) +- { +- kid = g_ptr_array_index (children, i); +- +- id = ephy_node_get_property_string (kid, +- EPHY_NODE_BMK_PROP_SERVICE_ID); +- +- if (g_str_equal (id, node_id)) +- { +- node = kid; +- break; +- } +- } +- +- g_free (node_id); +- +- return node; +-} +- + typedef struct + { + EphyBookmarks *bookmarks; ++ GaServiceResolver *resolver; + EphyNode *node; +- guint new_node : 1; ++ char *name; ++ char *type; ++ char *domain; + } ResolveData; + + static void +@@ -921,20 +866,20 @@ + { + EphyBookmarks *bookmarks = data->bookmarks; + EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *node = data->node; + GValue value = { 0, }; + const char *path = NULL; + char host[128]; + GHashTable *text_table; + char *url; + gboolean was_immutable; ++ gboolean is_new_node = FALSE; + guint i; + ++ LOG ("resolver_found_cb resolver %p\n", resolver); ++ + was_immutable = ephy_node_db_is_immutable (priv->db); + ephy_node_db_set_immutable (priv->db, FALSE); + +- g_hash_table_steal (priv->resolve_handles, node); +- + /* Find the protocol */ + for (i = 0; i < G_N_ELEMENTS (zeroconf_protos); ++i) + { +@@ -945,6 +890,12 @@ + } + if (i == G_N_ELEMENTS (zeroconf_protos)) return; + ++ if (address == NULL) ++ { ++ g_warning ("Zeroconf failed to resolve host %s", name); ++ return; ++ } ++ + text_table = decode_txt_record (txt); + + if (text_table != NULL) +@@ -956,32 +907,60 @@ + path = "/"; + } + +- if (address == NULL) +- { +- g_warning ("Zeroconf failed to resolve host %s", name); +- return; +- } + avahi_address_snprint (host, sizeof (host), address); + + LOG ("0conf RESOLVED type=%s domain=%s name=%s => proto=%s host=%s port=%d path=%s\n", + type, domain, name, + zeroconf_protos[i], host, port, path); + ++ was_immutable = ephy_node_db_is_immutable (priv->db); ++ ephy_node_db_set_immutable (priv->db, FALSE); ++ ++ if (data->node == NULL) ++ { ++ is_new_node = TRUE; ++ ++ data->node = ephy_node_new (priv->db); ++ g_assert (data->node != NULL); ++ ++ /* don't allow dragging this node */ ++ ephy_node_set_is_drag_source (data->node, FALSE); ++ ++ g_value_init (&value, G_TYPE_STRING); ++ g_value_take_string (&value, ++ get_id_for_response (data->type, ++ data->domain, ++ data->name)); ++ ephy_node_set_property (data->node, EPHY_NODE_BMK_PROP_SERVICE_ID, &value); ++ g_value_unset (&value); ++ ++ /* FIXME: limit length! */ ++ ephy_node_set_property_string (data->node, ++ EPHY_NODE_BMK_PROP_TITLE, ++ name); ++ ++ ephy_node_set_property_boolean (data->node, ++ EPHY_NODE_BMK_PROP_IMMUTABLE, ++ TRUE); ++ } ++ + /* FIXME: limit length! */ + url = g_strdup_printf ("%s://%s:%d%s", zeroconf_protos[i], host, port, path); + + g_value_init (&value, G_TYPE_STRING); + g_value_take_string (&value, url); +- ephy_node_set_property (node, EPHY_NODE_BMK_PROP_LOCATION, &value); ++ ephy_node_set_property (data->node, EPHY_NODE_BMK_PROP_LOCATION, &value); + g_value_unset (&value); + +- if (data->new_node) ++ if (is_new_node) + { +- ephy_node_add_child (priv->bookmarks, node); +- ephy_node_add_child (priv->local, node); ++ ephy_node_add_child (priv->bookmarks, data->node); ++ ephy_node_add_child (priv->local, data->node); + } + + ephy_node_db_set_immutable (priv->db, was_immutable); ++ ++ g_hash_table_unref (text_table); + } + + static void +@@ -989,53 +968,33 @@ + GError *error, + ResolveData *data) + { +- EphyBookmarks *bookmarks = data->bookmarks; +- EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *node = data->node; +- gboolean was_immutable; ++ LOG ("resolver_failure_cb resolver %p: %s\n", resolver, error?error->message:"(null)"); + +- was_immutable = ephy_node_db_is_immutable (priv->db); +- ephy_node_db_set_immutable (priv->db, FALSE); +- +- g_hash_table_steal (priv->resolve_handles, node); +- +- /* Error, don't add the service */ +- ephy_node_unref (node); +- ephy_node_db_set_immutable (priv->db, was_immutable); +- +- return; +-} ++ /* Remove the node, if present */ ++ if (data->node != NULL) ++ { ++ EphyBookmarks *bookmarks = data->bookmarks; ++ EphyBookmarksPrivate *priv = bookmarks->priv; ++ gboolean was_immutable; + +-static void +-free_resolve_cb_data (gpointer data) +-{ +- g_slice_free (ResolveData, data); ++ was_immutable = ephy_node_db_is_immutable (priv->db); ++ ephy_node_db_set_immutable (priv->db, FALSE); ++ ephy_node_unref (data->node); ++ data->node = NULL; ++ ephy_node_db_set_immutable (priv->db, was_immutable); ++ } + } + + static void +-browser_removed_service_cb (GaServiceBrowser *browser, +- int interface, +- GaProtocol protocol, +- const char *name, +- const char *type, +- const char *domain, +- glong flags, +- EphyBookmarks *bookmarks) ++resolve_data_free (ResolveData* data) + { +- EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *node; +- char *node_id; +- +- node_id = get_id_for_response (type, domain, name); +- node = get_node_for_id (bookmarks, node_id); ++ if (data->resolver) ++ g_object_unref (data->resolver); + +- if (node != NULL) +- { +- g_hash_table_remove (priv->resolve_handles, node); +- ephy_node_unref (node); +- } +- +- return; ++ g_free (data->type); ++ g_free (data->name); ++ g_free (data->domain); ++ g_slice_free (ResolveData, data); + } + + static void +@@ -1049,81 +1008,88 @@ + EphyBookmarks *bookmarks) + { + EphyBookmarksPrivate *priv = bookmarks->priv; +- EphyNode *node; +- GValue value = { 0, }; +- gboolean new_node = FALSE; +- GaServiceResolver *resolver = NULL; + ResolveData *data; + char *node_id; ++ GError *error = NULL; + + node_id = get_id_for_response (type, domain, name); +- node = get_node_for_id (bookmarks, node_id); + + LOG ("0conf ADD: type=%s domain=%s name=%s\n", + type, domain, name); + +- if (node != NULL && +- g_hash_table_lookup (priv->resolve_handles, node) != NULL) return; +- +- if (node == NULL) ++ if (g_hash_table_lookup (priv->resolve_handles, node_id) != NULL) + { +- gboolean was_immutable; +- +- was_immutable = ephy_node_db_is_immutable (priv->db); +- ephy_node_db_set_immutable (priv->db, FALSE); +- +- node = ephy_node_new (priv->db); +- g_assert (node != NULL); +- +- new_node = TRUE; +- +- /* don't allow dragging this node */ +- ephy_node_set_is_drag_source (node, FALSE); +- +- g_value_init (&value, G_TYPE_STRING); +- g_value_take_string (&value, get_id_for_response (type, domain, name)); +- ephy_node_set_property (node, EPHY_NODE_BMK_PROP_SERVICE_ID, &value); +- g_value_unset (&value); +- +- /* FIXME: limit length! */ +- ephy_node_set_property_string (node, +- EPHY_NODE_BMK_PROP_TITLE, +- name); +- +- ephy_node_set_property_boolean (node, +- EPHY_NODE_BMK_PROP_IMMUTABLE, +- TRUE); +- +- ephy_node_db_set_immutable (priv->db, was_immutable); ++ g_free (node_id); ++ return; + } + + data = g_slice_new0 (ResolveData); + data->bookmarks = bookmarks; +- data->node = node; +- data->new_node = new_node; +- +- resolver = ga_service_resolver_new (AVAHI_IF_UNSPEC, +- AVAHI_PROTO_UNSPEC, +- name, type, domain, +- AVAHI_PROTO_UNSPEC, +- GA_LOOKUP_USE_MULTICAST); +- g_signal_connect_data (resolver, "found", +- G_CALLBACK (resolver_found_cb), data, +- (GClosureNotify) free_resolve_cb_data, 0); +- g_signal_connect_data (resolver, "failure", +- G_CALLBACK (resolver_failure_cb), data, +- (GClosureNotify) free_resolve_cb_data, 0); +- if (!ga_service_resolver_attach (resolver, ++ data->node = NULL; ++ data->type = g_strdup (type); ++ data->name = g_strdup (name); ++ data->domain = g_strdup (domain); ++ ++ data->resolver = ga_service_resolver_new (AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ name, type, domain, ++ AVAHI_PROTO_UNSPEC, ++ GA_LOOKUP_USE_MULTICAST); ++ g_signal_connect (data->resolver, "found", ++ G_CALLBACK (resolver_found_cb), data); ++ g_signal_connect (data->resolver, "failure", ++ G_CALLBACK (resolver_failure_cb), data); ++ if (!ga_service_resolver_attach (data->resolver, + priv->ga_client, +- NULL)) ++ &error)) + { +- g_warning ("Unable to resolve Zeroconf service %s", name); +- ephy_node_unref (node); +- free_resolve_cb_data (data); ++ g_warning ("Unable to resolve Zeroconf service %s: %s", name, error ? error->message : "(null)"); ++ g_clear_error (&error); ++ resolve_data_free (data); ++ g_free (node_id); + return; + } ++ + g_hash_table_insert (priv->resolve_handles, +- node, resolver); ++ node_id /* transfer ownership */, data); ++} ++ ++static void ++browser_removed_service_cb (GaServiceBrowser *browser, ++ int interface, ++ GaProtocol protocol, ++ const char *name, ++ const char *type, ++ const char *domain, ++ glong flags, ++ EphyBookmarks *bookmarks) ++{ ++ EphyBookmarksPrivate *priv = bookmarks->priv; ++ char *node_id; ++ ResolveData *data; ++ ++ node_id = get_id_for_response (type, domain, name); ++ data = g_hash_table_lookup (priv->resolve_handles, node_id); ++ /* shouldn't really happen, but let's play safe */ ++ if (!data) ++ { ++ g_free (node_id); ++ return; ++ } ++ ++ if (data->node != NULL) ++ { ++ gboolean was_immutable; ++ ++ was_immutable = ephy_node_db_is_immutable (priv->db); ++ ephy_node_db_set_immutable (priv->db, FALSE); ++ ephy_node_unref (data->node); ++ data->node = NULL; ++ ephy_node_db_set_immutable (priv->db, was_immutable); ++ } ++ ++ g_hash_table_remove (priv->resolve_handles, node_id); ++ g_free (node_id); + } + + static void +@@ -1150,9 +1116,10 @@ + NULL)) + { + g_warning ("Unable to start Zeroconf subsystem"); ++ g_object_unref (browser); + return; + } +- ++ + priv->browse_handles[i] = browser; + } + } +@@ -1166,6 +1133,7 @@ + { + if (avahi_client_errno (ga_client->avahi_client) == AVAHI_ERR_DISCONNECTED) + { ++ /* FIXMEchpe: is this correct */ + /* Destroy and reconnect */ + avahi_client_free (ga_client->avahi_client); + ga_client->avahi_client = NULL; +@@ -1197,7 +1165,9 @@ + return; + } + priv->ga_client = ga_client; +- priv->resolve_handles = g_hash_table_new (g_direct_hash, g_direct_equal); ++ priv->resolve_handles = g_hash_table_new_full (g_str_hash, g_str_equal, ++ g_free, ++ (GDestroyNotify) resolve_data_free); + } + + static void +@@ -1210,6 +1180,7 @@ + { + if (priv->browse_handles[i] != NULL) + { ++ g_object_unref (priv->browse_handles[i]); + priv->browse_handles[i] = NULL; + } + } +@@ -1222,7 +1193,8 @@ + + if (priv->local != NULL) + { +- ephy_node_remove_child (priv->keywords, priv->local); ++ ephy_node_unref (priv->local); ++ priv->local = NULL; + } + + if (priv->ga_client != NULL) +@@ -1431,7 +1403,7 @@ + + LOG ("Bookmarks finalized"); + +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (ephy_bookmarks_parent_class)->finalize (object); + } + + EphyBookmarks * diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index d6d6bdc1e198..bfa3c00ccd56 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -1,12 +1,14 @@ bin/epiphany include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock-manager.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-adblock.h +include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-base-embed.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-command-manager.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dbus.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-dialog.h +include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-container.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-event.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-factory.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h @@ -14,9 +16,11 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-single.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-type-builtins.h +include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed-utils.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-embed.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extension.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h +include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history-item.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-history.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-link.h @@ -30,8 +34,8 @@ include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-session.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-shell.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-state.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-statusbar.h -include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-tab.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h +include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-version.h include/epiphany/%%EPHY_VERSION%%/epiphany/ephy-window.h lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so @@ -43,7 +47,6 @@ share/dbus-1/services/org.gnome.Epiphany.service %%DOCSDIR%%/EphyCommandManager.html %%DOCSDIR%%/EphyEmbed.html %%DOCSDIR%%/EphyNodeDb.html -%%DOCSDIR%%/EphyTab.html %%DOCSDIR%%/EphyWindow.html %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html @@ -220,6 +223,7 @@ share/icons/hicolor/48x48/apps/epiphany-bookmarks.png 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/az/LC_MESSAGES/epiphany.mo share/locale/be/LC_MESSAGES/epiphany.mo share/locale/be@latin/LC_MESSAGES/epiphany.mo @@ -254,6 +258,7 @@ share/locale/is/LC_MESSAGES/epiphany.mo share/locale/it/LC_MESSAGES/epiphany.mo share/locale/ja/LC_MESSAGES/epiphany.mo share/locale/ka/LC_MESSAGES/epiphany.mo +share/locale/kn/LC_MESSAGES/epiphany.mo share/locale/ko/LC_MESSAGES/epiphany.mo share/locale/ku/LC_MESSAGES/epiphany.mo share/locale/li/LC_MESSAGES/epiphany.mo @@ -292,8 +297,6 @@ share/locale/th/LC_MESSAGES/epiphany.mo share/locale/tk/LC_MESSAGES/epiphany.mo share/locale/tr/LC_MESSAGES/epiphany.mo share/locale/uk/LC_MESSAGES/epiphany.mo -share/locale/uz/LC_MESSAGES/epiphany.mo -share/locale/uz@cyrillic/LC_MESSAGES/epiphany.mo share/locale/vi/LC_MESSAGES/epiphany.mo share/locale/wa/LC_MESSAGES/epiphany.mo share/locale/zh_CN/LC_MESSAGES/epiphany.mo @@ -318,6 +321,9 @@ share/omf/epiphany/epiphany-sv.omf share/omf/epiphany/epiphany-uk.omf share/pygtk/2.0/defs/epiphany.defs @dirrm share/omf/epiphany +@dirrmtry share/icons/LowContrastLargePrint/48x48/apps +@dirrmtry share/icons/LowContrastLargePrint/48x48 +@dirrmtry share/icons/LowContrastLargePrint @dirrm share/gnome/help/epiphany/uk/figures @dirrm share/gnome/help/epiphany/uk @dirrm share/gnome/help/epiphany/sv/figures @@ -353,38 +359,39 @@ share/pygtk/2.0/defs/epiphany.defs @dirrm share/gnome/help/epiphany/C/figures @dirrm share/gnome/help/epiphany/C @dirrm share/gnome/help/epiphany -@dirrm %%DATADIR%%/icons/hicolor/scalable/status -@dirrm %%DATADIR%%/icons/hicolor/scalable/actions -@dirrm %%DATADIR%%/icons/hicolor/scalable -@dirrm %%DATADIR%%/icons/hicolor/48x48/status -@dirrm %%DATADIR%%/icons/hicolor/48x48 -@dirrm %%DATADIR%%/icons/hicolor/32x32/status -@dirrm %%DATADIR%%/icons/hicolor/32x32/actions -@dirrm %%DATADIR%%/icons/hicolor/32x32 -@dirrm %%DATADIR%%/icons/hicolor/24x24/status -@dirrm %%DATADIR%%/icons/hicolor/24x24/places -@dirrm %%DATADIR%%/icons/hicolor/24x24/actions -@dirrm %%DATADIR%%/icons/hicolor/24x24 -@dirrm %%DATADIR%%/icons/hicolor/22x22/status -@dirrm %%DATADIR%%/icons/hicolor/22x22/places -@dirrm %%DATADIR%%/icons/hicolor/22x22/actions -@dirrm %%DATADIR%%/icons/hicolor/22x22 -@dirrm %%DATADIR%%/icons/hicolor/16x16/status -@dirrm %%DATADIR%%/icons/hicolor/16x16/places -@dirrm %%DATADIR%%/icons/hicolor/16x16/actions -@dirrm %%DATADIR%%/icons/hicolor/16x16 -@dirrm %%DATADIR%%/icons/hicolor -@dirrm %%DATADIR%%/icons +@dirrmtry %%DATADIR%%/icons/hicolor/scalable/status +@dirrmtry %%DATADIR%%/icons/hicolor/scalable/actions +@dirrmtry %%DATADIR%%/icons/hicolor/scalable +@dirrmtry %%DATADIR%%/icons/hicolor/48x48/status +@dirrmtry %%DATADIR%%/icons/hicolor/48x48 +@dirrmtry %%DATADIR%%/icons/hicolor/32x32/status +@dirrmtry %%DATADIR%%/icons/hicolor/32x32/actions +@dirrmtry %%DATADIR%%/icons/hicolor/32x32 +@dirrmtry %%DATADIR%%/icons/hicolor/24x24/status +@dirrmtry %%DATADIR%%/icons/hicolor/24x24/places +@dirrmtry %%DATADIR%%/icons/hicolor/24x24/actions +@dirrmtry %%DATADIR%%/icons/hicolor/24x24 +@dirrmtry %%DATADIR%%/icons/hicolor/22x22/status +@dirrmtry %%DATADIR%%/icons/hicolor/22x22/places +@dirrmtry %%DATADIR%%/icons/hicolor/22x22/actions +@dirrmtry %%DATADIR%%/icons/hicolor/22x22 +@dirrmtry %%DATADIR%%/icons/hicolor/16x16/status +@dirrmtry %%DATADIR%%/icons/hicolor/16x16/places +@dirrmtry %%DATADIR%%/icons/hicolor/16x16/actions +@dirrmtry %%DATADIR%%/icons/hicolor/16x16 +@dirrmtry %%DATADIR%%/icons/hicolor +@dirrmtry %%DATADIR%%/icons @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%%/chrome/global @dirrm %%DATADIR%%/chrome/branding @dirrm %%DATADIR%%/chrome @dirrm %%DATADIR%%/art -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%% @dirrm %%DOCSDIR%% -@dirrm lib/epiphany/%%EPHY_VERSION%%/plugins -@dirrm lib/epiphany/%%EPHY_VERSION%% -@dirrm lib/epiphany +@dirrmtry share/applications +@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins +@dirrmtry lib/epiphany/%%EPHY_VERSION%% +@dirrmtry lib/epiphany @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany @dirrm include/epiphany/%%EPHY_VERSION%% @dirrm include/epiphany @@ -392,8 +399,6 @@ share/pygtk/2.0/defs/epiphany.defs @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/uz@cyrillic/LC_MESSAGES -@dirrmtry share/locale/uz@cyrillic @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/si/LC_MESSAGES @@ -416,4 +421,5 @@ 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/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index 105f4fc1eadf..0289aacac6f2 100644 --- a/www/evolution-webcal/Makefile +++ b/www/evolution-webcal/Makefile @@ -3,15 +3,14 @@ # Whom: Koop Mast <kwm@rainbow-runner.nl> # # $FreeBSD$ -# $MCom: ports/www/evolution-webcal/Makefile,v 1.50 2007/09/16 16:52:22 ahze Exp $ +# $MCom: ports/www/evolution-webcal/Makefile,v 1.54 2008/02/25 10:46:40 kwm Exp $ # -PORTNAME= webcal -PORTVERSION= 2.12.0 +PORTNAME= evolution-webcal +PORTVERSION= 2.21.92 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PKGNAMEPREFIX= evolution- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo index 882d3aec8b85..d5c1ae16d141 100644 --- a/www/evolution-webcal/distinfo +++ b/www/evolution-webcal/distinfo @@ -1,3 +1,3 @@ -MD5 (evolution-webcal-2.12.0.tar.bz2) = 21e77fa081decb87ce641f3a77245864 -SHA256 (evolution-webcal-2.12.0.tar.bz2) = f8445c3d93af4f8f4f325c5eb3fa94093f9eb299171a0983056d069e9658fc00 -SIZE (evolution-webcal-2.12.0.tar.bz2) = 193553 +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 diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index 82f6d353b2fe..a7beaebff5b2 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -41,6 +41,7 @@ share/locale/ms/LC_MESSAGES/evolution-webcal.mo share/locale/nb/LC_MESSAGES/evolution-webcal.mo share/locale/ne/LC_MESSAGES/evolution-webcal.mo share/locale/nl/LC_MESSAGES/evolution-webcal.mo +share/locale/nn/LC_MESSAGES/evolution-webcal.mo share/locale/oc/LC_MESSAGES/evolution-webcal.mo share/locale/or/LC_MESSAGES/evolution-webcal.mo share/locale/pa/LC_MESSAGES/evolution-webcal.mo diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile index 6e03fb823668..37be80fdd31b 100644 --- a/www/gnome-user-share/Makefile +++ b/www/gnome-user-share/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gnome-user-share/Makefile,v 1.5 2007/05/19 21:36:26 marcus Exp $ +# $MCom: ports/www/gnome-user-share/Makefile,v 1.8 2008/02/24 20:36:08 marcus Exp $ # PORTNAME= gnome-user-share -PORTVERSION= 0.11 -PORTREVISION= 2 +PORTVERSION= 0.22 CATEGORIES= www deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,10 +21,11 @@ LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_APACHE= 2.0+ USE_GNOME= gnomeprefix gnomehack intlhack libglade2 gconf2 GNU_CONFIGURE= yes +INSTALLS_ICONS= yes CONFIGURE_ARGS= --disable-howl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/gnome-user-share/distinfo b/www/gnome-user-share/distinfo index 1e5e4656b74b..a82e337bcfe4 100644 --- a/www/gnome-user-share/distinfo +++ b/www/gnome-user-share/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-user-share-0.11.tar.bz2) = 4961e49c858fbb7d6050c62a73286d74 -SHA256 (gnome2/gnome-user-share-0.11.tar.bz2) = f9f1afd1e5d827367f7868080285803ab70cc929702ab5ef44fb896dfcaf1d64 -SIZE (gnome2/gnome-user-share-0.11.tar.bz2) = 299313 +MD5 (gnome2/gnome-user-share-0.22.tar.bz2) = 88722b281a49050d2333eb5c001459e6 +SHA256 (gnome2/gnome-user-share-0.22.tar.bz2) = 71641c7b0dfb13a59288b9e0a9975cf294e810e859c74d5cc121d1f5eaffbe46 +SIZE (gnome2/gnome-user-share-0.22.tar.bz2) = 337564 diff --git a/www/gnome-user-share/pkg-plist b/www/gnome-user-share/pkg-plist index f2908b82a8fc..d4e97fa77a0b 100644 --- a/www/gnome-user-share/pkg-plist +++ b/www/gnome-user-share/pkg-plist @@ -6,6 +6,11 @@ share/gnome-user-share/dav_user.conf share/gnome-user-share/dav_user_2.0.conf share/gnome-user-share/dav_user_2.2.conf share/gnome-user-share/file-share-properties.glade +share/gnome/autostart/gnome-user-share.desktop +share/icons/hicolor/16x16/apps/gnome-obex-server.png +share/icons/hicolor/22x22/apps/gnome-obex-server.png +share/icons/hicolor/32x32/apps/gnome-obex-server.png +share/icons/hicolor/48x48/apps/gnome-obex-server.png share/locale/ar/LC_MESSAGES/gnome-user-share.mo share/locale/bg/LC_MESSAGES/gnome-user-share.mo share/locale/ca/LC_MESSAGES/gnome-user-share.mo @@ -16,6 +21,7 @@ share/locale/dz/LC_MESSAGES/gnome-user-share.mo share/locale/el/LC_MESSAGES/gnome-user-share.mo share/locale/en_CA/LC_MESSAGES/gnome-user-share.mo share/locale/en_GB/LC_MESSAGES/gnome-user-share.mo +share/locale/es/LC_MESSAGES/gnome-user-share.mo share/locale/fi/LC_MESSAGES/gnome-user-share.mo share/locale/fr/LC_MESSAGES/gnome-user-share.mo share/locale/gl/LC_MESSAGES/gnome-user-share.mo @@ -25,22 +31,31 @@ share/locale/it/LC_MESSAGES/gnome-user-share.mo share/locale/ja/LC_MESSAGES/gnome-user-share.mo share/locale/ko/LC_MESSAGES/gnome-user-share.mo share/locale/lt/LC_MESSAGES/gnome-user-share.mo +share/locale/mk/LC_MESSAGES/gnome-user-share.mo share/locale/nb/LC_MESSAGES/gnome-user-share.mo share/locale/ne/LC_MESSAGES/gnome-user-share.mo share/locale/nl/LC_MESSAGES/gnome-user-share.mo +share/locale/oc/LC_MESSAGES/gnome-user-share.mo share/locale/pa/LC_MESSAGES/gnome-user-share.mo +share/locale/pl/LC_MESSAGES/gnome-user-share.mo +share/locale/pt/LC_MESSAGES/gnome-user-share.mo share/locale/pt_BR/LC_MESSAGES/gnome-user-share.mo share/locale/ru/LC_MESSAGES/gnome-user-share.mo share/locale/rw/LC_MESSAGES/gnome-user-share.mo share/locale/sk/LC_MESSAGES/gnome-user-share.mo +share/locale/sl/LC_MESSAGES/gnome-user-share.mo share/locale/sq/LC_MESSAGES/gnome-user-share.mo share/locale/sv/LC_MESSAGES/gnome-user-share.mo +share/locale/tr/LC_MESSAGES/gnome-user-share.mo share/locale/uk/LC_MESSAGES/gnome-user-share.mo share/locale/vi/LC_MESSAGES/gnome-user-share.mo +share/locale/zh_CN/LC_MESSAGES/gnome-user-share.mo share/locale/zh_TW/LC_MESSAGES/gnome-user-share.mo @dirrm share/gnome-user-share +@dirrmtry share/applications @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 -@dirrmtry share/applications diff --git a/www/gstreamer-plugins-neon/Makefile b/www/gstreamer-plugins-neon/Makefile index 1e73a85abada..8c6dffda79f8 100644 --- a/www/gstreamer-plugins-neon/Makefile +++ b/www/gstreamer-plugins-neon/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gstreamer-plugins-neon/Makefile,v 1.1 2006/07/06 19:32:35 ahze Exp $ +# $MCom: ports/www/gstreamer-plugins-neon/Makefile,v 1.5 2008/03/19 14:05:38 ahze Exp $ # PORTREVISION= 2 diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 2dca8d803dea..2bfbba7c935a 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/gtkhtml3/Makefile,v 1.5 2007/11/30 19:38:35 marcus Exp $ +# $MCom: ports/www/gtkhtml3/Makefile,v 1.124 2008/03/10 20:10:34 mezz Exp $ # PORTNAME= gtkhtml3 -PORTVERSION= 3.16.3 +PORTVERSION= 3.18.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -17,11 +17,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gail libgnomeui ltverhack USE_LDCONFIG= yes diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index f9af553ae7b0..e6d7a4cc13bf 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtkhtml-3.16.3.tar.bz2) = bba94aecc723946e2a4e68e2dcf59722 -SHA256 (gnome2/gtkhtml-3.16.3.tar.bz2) = 00a313b7f56c235f3ac520dc1ebbb5c8245d76f8992a1187f165c0595a474850 -SIZE (gnome2/gtkhtml-3.16.3.tar.bz2) = 1302959 +MD5 (gnome2/gtkhtml-3.18.0.tar.bz2) = ec541b078ea9fbb1dd93f77075f77bd8 +SHA256 (gnome2/gtkhtml-3.18.0.tar.bz2) = 867036b10dd4b21f79bc0d8b303d348ff55cb4ded896c8cb384b2bb4bbf378d7 +SIZE (gnome2/gtkhtml-3.18.0.tar.bz2) = 1312369 diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index c34c002a4c56..efe5fdff5886 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gtkhtml38/Makefile,v 1.104 2007/05/30 19:19:29 mezz Exp $ +# $MCom: ports/www/gtkhtml38/Makefile,v 1.106 2008/01/29 01:43:06 marcus Exp $ # PORTNAME= gtkhtml3 PORTVERSION= 3.12.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,7 +18,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight HTML rendering/printing/editing engine -LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.8:${PORTSDIR}/devel/libsoup22 NO_LATEST_LINK= yes DEPRECATED= Older API; newer applications should use www/gtkhtml3 diff --git a/www/midori/Makefile b/www/midori/Makefile new file mode 100644 index 000000000000..264e0abc00f9 --- /dev/null +++ b/www/midori/Makefile @@ -0,0 +1,27 @@ +# New ports collection makefile for: midori +# Date created: 2007-10-21 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/www/midori/Makefile,v 1.3 2008/03/21 18:31:39 ahze Exp $ + +PORTNAME= midori +PORTVERSION= 0.0.17 +CATEGORIES= www +MASTER_SITES= http://software.twotoasts.de/media/${PORTNAME}/ + +MAINTAINER= ahze@FreeBSD.org +COMMENT= Lightweight web browser using WebKit browser engine + +LIB_DEPENDS= WebKitGtk.1:${PORTSDIR}/www/webkit-gtk2 \ + sexy.2:${PORTSDIR}/x11-toolkits/libsexy + +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/WebKit/webkit -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +GNU_CONFIGURE= yes +USE_GMAKE= yes + +pre-install: + ${CHMOD} +x ${WRKSRC}/install-sh + +.include <bsd.port.mk> diff --git a/www/midori/distinfo b/www/midori/distinfo new file mode 100644 index 000000000000..7cd5c3c5e15d --- /dev/null +++ b/www/midori/distinfo @@ -0,0 +1,3 @@ +MD5 (midori-0.0.17.tar.gz) = 58d1b7ed282540030eb1b5803b760865 +SHA256 (midori-0.0.17.tar.gz) = affeddb78d9342e961e868270872c166ac2eba7d43e5f629d91f03219d6e0df8 +SIZE (midori-0.0.17.tar.gz) = 385711 diff --git a/www/midori/pkg-descr b/www/midori/pkg-descr new file mode 100644 index 000000000000..fa4e7314b85f --- /dev/null +++ b/www/midori/pkg-descr @@ -0,0 +1,12 @@ +Midori is a lightweight web browser. + +* Full integration with GTK+2. +* Fast rendering with WebKit. +* Tabs, windows and session management. +* Bookmarks are stored with XBEL. +* Searchbox based on OpenSearch. +* Custom context menu actions. +* User scripts and user styles support. +* Extensible via Lua scripts. + +WWW: http://software.twotoasts.de/?page=midori diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist new file mode 100644 index 000000000000..6ec31b1d31b8 --- /dev/null +++ b/www/midori/pkg-plist @@ -0,0 +1,5 @@ +bin/midori +share/applications/midori.desktop +@dirrmtry share/applications +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile index f529775e0b4c..7e5a462ae628 100644 --- a/www/swfdec-plugin/Makefile +++ b/www/swfdec-plugin/Makefile @@ -6,15 +6,15 @@ # PORTNAME= swfdec-plugin -PORTVERSION= 0.5.5 +PORTVERSION= 0.6.0 CATEGORIES= www -MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.5/ +MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.6/ DISTNAME= swfdec-mozilla-${PORTVERSION} MAINTAINER= alexbl@FreeBSD.org COMMENT= Flash rendering plugin -LIB_DEPENDS= swfdec-0.5.5:${PORTSDIR}/graphics/swfdec +LIB_DEPENDS= swfdec-0.6:${PORTSDIR}/graphics/swfdec USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-plugin-dir="${PREFIX}/lib/browser_plugins" diff --git a/www/swfdec-plugin/distinfo b/www/swfdec-plugin/distinfo index f25e30c9a1c1..41b0a0096e9a 100644 --- a/www/swfdec-plugin/distinfo +++ b/www/swfdec-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (swfdec-mozilla-0.5.5.tar.gz) = 37d2b4235dd8c66de8f9ebd323aa6b1e -SHA256 (swfdec-mozilla-0.5.5.tar.gz) = 0a22cd22b115bdc89f974353dc3bf94ec7ab0ad97ce6fb1899ae7aad55921470 -SIZE (swfdec-mozilla-0.5.5.tar.gz) = 398937 +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 diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile new file mode 100644 index 000000000000..775cb413a8dc --- /dev/null +++ b/www/webkit-gtk2/Makefile @@ -0,0 +1,57 @@ +# New ports collection makefile for: webkit +# Date created: 2007-10-21 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/www/webkit-gtk2/Makefile,v 1.5 2008/03/24 01:51:52 mezz Exp $ +# + +PORTNAME= webkit +PORTVERSION= 0.0.30549 +CATEGORIES= www +MASTER_SITES= http://nightly.webkit.org/files/trunk/src/ +PKGNAMESUFFIX= -gtk2 +DISTNAME= WebKit-r${PORTVERSION:S/0.0.//} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= An opensource browser engine + +LIB_DEPENDS= icutu.38:${PORTSDIR}/devel/icu \ + curl.4:${PORTSDIR}/ftp/curl \ + sqlite3.8:${PORTSDIR}/databases/sqlite3 + +USE_BISON= build +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnometarget gtk20 libxslt +USE_PERL5= yes +USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf:261 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 +MAKEFILE= GNUmakefile + +post-patch: + @${REINPLACE_CMD} -e 's|autoconf|${AUTOCONF}|g ; \ + s|automake|${AUTOMAKE}|g ; s|aclocal|${ACLOCAL}|g ; \ + s|autoheader|${AUTOHEADER}|g ; \ + s|LIBTOOLIZE=libtoolize|LIBTOOLIZE=${LIBTOOLIZE}|g ; \ + s|$$srcdir/configure|#$$srcdir/configure|g' \ + ${WRKSRC}/autogen.sh + @${FIND} ${WRKSRC} -name GNUmakefile.am | ${XARGS} ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' + +pre-configure: + @(cd ${WRKSRC} && ${SH} autogen.sh) + +post-install: +# Install compat pkg-config file so we don't have to patch ports + ${CP} ${PREFIX}/libdata/pkgconfig/webkit-1.0.pc \ + ${PREFIX}/libdata/pkgconfig/WebKitGtk.pc + +.include <bsd.port.mk> diff --git a/www/webkit-gtk2/distinfo b/www/webkit-gtk2/distinfo new file mode 100644 index 000000000000..b91ff2311761 --- /dev/null +++ b/www/webkit-gtk2/distinfo @@ -0,0 +1,3 @@ +MD5 (WebKit-r30549.tar.bz2) = 081ce2cb23cf564454bfc5a3d627a4bb +SHA256 (WebKit-r30549.tar.bz2) = 7c9b9607fcb0909298c5d4c3ec47040082db139a28aca2547b2f657afe98b6cd +SIZE (WebKit-r30549.tar.bz2) = 8573000 diff --git a/www/webkit-gtk2/pkg-descr b/www/webkit-gtk2/pkg-descr new file mode 100644 index 000000000000..40ef1e3ef412 --- /dev/null +++ b/www/webkit-gtk2/pkg-descr @@ -0,0 +1,5 @@ +WebKit is an open source web browser engine. It is able to display content +such as HTML, SVG, XML, and others. It also supports DOM, XMLHttpRequest, +XSLT, CSS, Javascript/ECMAscript and more. + +WWW: http://webkit.org/ diff --git a/www/webkit-gtk2/pkg-plist b/www/webkit-gtk2/pkg-plist new file mode 100644 index 000000000000..71b65eff0f6a --- /dev/null +++ b/www/webkit-gtk2/pkg-plist @@ -0,0 +1,26 @@ +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 +libdata/pkgconfig/WebKitGtk.pc +libdata/pkgconfig/webkit-1.0.pc +@dirrm include/WebKit/webkit +@dirrm include/WebKit/JavaScriptCore +@dirrm include/WebKit diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 33dc04835929..0a67c478a32c 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -3,14 +3,14 @@ # Whom: ade, archie # # $FreeBSD$ -# $MCom: ports/x11-fm/nautilus/Makefile,v 1.142 2007/09/18 14:48:10 ahze Exp $ +# $MCom: ports/x11-fm/nautilus/Makefile,v 1.154 2008/03/15 19:29:34 ahze Exp $ # PORTNAME= nautilus -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 +PORTREVISION= 2 CATEGORIES= x11-fm 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,7 +24,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_XLIB= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \ - librsvg2 desktopfileutils ltverhack + librsvg2 desktopfileutils ltverhack gvfs ltasneededhack GNOME_DESKTOP_VERSION=2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 @@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--disable-tracker .endif post-install: - ${MKDIR} ${PREFIX}/lib/nautilus/extensions-1.0 + @${MKDIR} ${PREFIX}/lib/nautilus/extensions-2.0 @-update-desktop-database .include <bsd.port.post.mk> diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index 9a778b2a04e2..8ddc0669d355 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/nautilus-2.20.0.tar.bz2) = 3856ec2ffeba786d12f8f6622e398c33 -SHA256 (gnome2/nautilus-2.20.0.tar.bz2) = 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08 -SIZE (gnome2/nautilus-2.20.0.tar.bz2) = 4916284 +MD5 (gnome2/nautilus-2.22.0.tar.bz2) = 0fcc02e92cfad239af27e0b47438c44c +SHA256 (gnome2/nautilus-2.22.0.tar.bz2) = 43e2cfb22e97b7a67d9c02248e61f6529b2dafcf5ab29f13fd4d37bf696f50a1 +SIZE (gnome2/nautilus-2.22.0.tar.bz2) = 5116215 diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index 1e031e1ad977..bf3918949e33 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -1,4 +1,5 @@ bin/nautilus +bin/nautilus-autorun-software bin/nautilus-connect-server bin/nautilus-file-management-properties include/nautilus/libnautilus-extension/nautilus-column-provider.h @@ -18,6 +19,7 @@ lib/libnautilus-extension.so lib/libnautilus-extension.so.1 libdata/bonobo/servers/Nautilus_shell.server libdata/pkgconfig/libnautilus-extension.pc +share/applications/nautilus-autorun-software.desktop share/applications/nautilus-computer.desktop share/applications/nautilus-file-management-properties.desktop share/applications/nautilus-folder-handler.desktop @@ -82,6 +84,7 @@ share/locale/mi/LC_MESSAGES/nautilus.mo share/locale/mk/LC_MESSAGES/nautilus.mo share/locale/ml/LC_MESSAGES/nautilus.mo share/locale/mn/LC_MESSAGES/nautilus.mo +share/locale/mr/LC_MESSAGES/nautilus.mo share/locale/ms/LC_MESSAGES/nautilus.mo share/locale/nb/LC_MESSAGES/nautilus.mo share/locale/ne/LC_MESSAGES/nautilus.mo @@ -121,6 +124,21 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo share/locale/zu/LC_MESSAGES/nautilus.mo share/mime/application/x-gnome-saved-search.xml share/mime/packages/nautilus.xml +share/mime/x-content/audio-cdda.xml +share/mime/x-content/audio-dvd.xml +share/mime/x-content/audio-player.xml +share/mime/x-content/blank-bd.xml +share/mime/x-content/blank-cd.xml +share/mime/x-content/blank-dvd.xml +share/mime/x-content/blank-hddvd.xml +share/mime/x-content/image-dcf.xml +share/mime/x-content/image-picturecd.xml +share/mime/x-content/software.xml +share/mime/x-content/video-bluray.xml +share/mime/x-content/video-dvd.xml +share/mime/x-content/video-hddvd.xml +share/mime/x-content/video-svcd.xml +share/mime/x-content/video-vcd.xml %%DATADIR%%/browser.xml %%DATADIR%%/glade/nautilus-bookmarks-window.glade %%DATADIR%%/glade/nautilus-file-management-properties.glade @@ -178,8 +196,9 @@ share/pixmaps/nautilus/thumbnail_frame.png @dirrm %%DATADIR%%/patterns @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% -@exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0 -@dirrmtry lib/nautilus/extensions-1.0 +@dirrmtry share/applications +@exec /bin/mkdir -p %D/lib/nautilus/extensions-2.0 +@dirrmtry lib/nautilus/extensions-2.0 @dirrmtry lib/nautilus @dirrm include/nautilus/libnautilus-extension @dirrm include/nautilus @@ -207,6 +226,8 @@ share/pixmaps/nautilus/thumbnail_frame.png @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @@ -225,4 +246,3 @@ share/pixmaps/nautilus/thumbnail_frame.png @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile index 6f89cdffdd58..ff29165b8284 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.4 2005/10/02 23:53:38 marcus Exp $ +# $MCom: ports/x11-fm/py-nautilus/Makefile,v 1.6 2008/01/13 19:48:00 marcus Exp $ # PORTNAME= nautilus -PORTVERSION= 0.4.3 -PORTREVISION= 1 +PORTVERSION= 0.5.0 CATEGORIES= x11-fm gnome 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 5a9d23c6adae..9483614d91ef 100644 --- a/x11-fm/py-nautilus/distinfo +++ b/x11-fm/py-nautilus/distinfo @@ -1,3 +1,3 @@ -MD5 (nautilus-python-0.4.3.tar.bz2) = d676ff598426fbcda3f103d41d60d520 -SHA256 (nautilus-python-0.4.3.tar.bz2) = f9620ecf1feb0e0922fce862e0631b23a95c5e845eeb2f646a78ee00ed6697b1 -SIZE (nautilus-python-0.4.3.tar.bz2) = 229799 +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 diff --git a/x11-fm/py-nautilus/files/patch-configure b/x11-fm/py-nautilus/files/patch-configure new file mode 100644 index 000000000000..d9196af60578 --- /dev/null +++ b/x11-fm/py-nautilus/files/patch-configure @@ -0,0 +1,15 @@ +--- configure.orig 2008-01-13 14:41:48.000000000 -0500 ++++ configure 2008-01-13 14:42:01.000000000 -0500 +@@ -19597,10 +19597,10 @@ CPPFLAGS="$save_CPPFLAGS" + { echo "$as_me:$LINENO: checking for libraries required to embed python" >&5 + echo $ECHO_N "checking for libraries required to embed python... $ECHO_C" >&6; } + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +-if test "x$PYTHON_LIBS" == x; then ++if test "x$PYTHON_LIBS" = x; then + PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" + fi +-if test "x$PYTHON_LIB_LOC" == x; then ++if test "x$PYTHON_LIB_LOC" = x; then + PYTHON_LIB_LOC="${py_prefix}/lib" + fi + diff --git a/x11-fm/py-nautilus/pkg-plist b/x11-fm/py-nautilus/pkg-plist index 04dcd21e8563..f4109e434e48 100644 --- a/x11-fm/py-nautilus/pkg-plist +++ b/x11-fm/py-nautilus/pkg-plist @@ -1,7 +1,7 @@ lib/nautilus-python/nautilus.la lib/nautilus-python/nautilus.so -lib/nautilus/extensions-1.0/libnautilus-python.la -lib/nautilus/extensions-1.0/libnautilus-python.so +lib/nautilus/extensions-2.0/libnautilus-python.la +lib/nautilus/extensions-2.0/libnautilus-python.so libdata/pkgconfig/nautilus-python.pc %%DOCSDIR%%/README %%DOCSDIR%%/documentation.py @@ -9,6 +9,7 @@ libdata/pkgconfig/nautilus-python.pc %%DOCSDIR%%/examples/block-size-column.py %%DOCSDIR%%/examples/md5sum-property-page.py %%DOCSDIR%%/examples/open-terminal.py +%%DOCSDIR%%/examples/submenu.py @dirrm %%DOCSDIR%%/examples @dirrm %%DOCSDIR%% @dirrm lib/nautilus-python diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index fd220265f2b4..124d2641e289 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.12 2007/02/02 19:49:43 mezz Exp $ +# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.14 2008/01/08 04:28:10 marcus Exp $ # PORTNAME= fontconfig -PORTVERSION= 2.4.2 -PORTREVISION?= 2 +PORTVERSION= 2.5.0 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/release/ diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo index 25c81d9673e9..0687fa08ca78 100644 --- a/x11-fonts/fontconfig/distinfo +++ b/x11-fonts/fontconfig/distinfo @@ -1,3 +1,3 @@ -MD5 (fontconfig-2.4.2.tar.gz) = f035852f521b54677f2b5c9e2f6d54a4 -SHA256 (fontconfig-2.4.2.tar.gz) = 63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363 -SIZE (fontconfig-2.4.2.tar.gz) = 1278340 +MD5 (fontconfig-2.5.0.tar.gz) = 21d14af8ecf645ef76211c782cdd7aeb +SHA256 (fontconfig-2.5.0.tar.gz) = 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe +SIZE (fontconfig-2.5.0.tar.gz) = 1385058 diff --git a/x11-fonts/fontconfig/files/patch-fc-git b/x11-fonts/fontconfig/files/patch-fc-git deleted file mode 100644 index d0be05b24e8a..000000000000 --- a/x11-fonts/fontconfig/files/patch-fc-git +++ /dev/null @@ -1,80 +0,0 @@ ---- src/fcfreetype.c.orig Sat Apr 14 01:46:21 2007 -+++ src/fcfreetype.c Sat Apr 14 01:48:33 2007 -@@ -2413,6 +2413,19 @@ FcGlyphNameToUcs4 (FcChar8 *name) - } - - /* -+* Work around a bug in some FreeType versions which fail -+* to correctly bounds check glyph name buffers and overwrite -+* the stack. As Postscript names have a limit of 127 characters, -+* this should be sufficient. -+*/ -+ -+#if FC_GLYPHNAME_MAXLEN < 127 -+# define FC_GLYPHNAME_BUFLEN 127 -+#else -+# define FC_GLYPHNAME_BUFLEN FC_GLYPHNAME_MAXLEN -+#endif -+ -+/* - * Search through a font for a glyph by name. This is - * currently a linear search as there doesn't appear to be - * any defined order within the font -@@ -2421,11 +2434,11 @@ static FT_UInt - FcFreeTypeGlyphNameIndex (FT_Face face, const FcChar8 *name) - { - FT_UInt gindex; -- FcChar8 name_buf[FC_GLYPHNAME_MAXLEN + 2]; -+ FcChar8 name_buf[FC_GLYPHNAME_BUFLEN + 2]; - - for (gindex = 0; gindex < (FT_UInt) face->num_glyphs; gindex++) - { -- if (FT_Get_Glyph_Name (face, gindex, name_buf, FC_GLYPHNAME_MAXLEN+1) == 0) -+ if (FT_Get_Glyph_Name (face, gindex, name_buf, FC_GLYPHNAME_BUFLEN+1) == 0) - if (!strcmp ((char *) name, (char *) name_buf)) - return gindex; - } -@@ -2715,11 +2728,11 @@ FcFreeTypeCharSetAndSpacing (FT_Face fac - */ - if (FcFreeTypeUseNames (face)) - { -- FcChar8 name_buf[FC_GLYPHNAME_MAXLEN + 2]; -+ FcChar8 name_buf[FC_GLYPHNAME_BUFLEN + 2]; - - for (glyph = 0; glyph < (FT_UInt) face->num_glyphs; glyph++) - { -- if (FT_Get_Glyph_Name (face, glyph, name_buf, FC_GLYPHNAME_MAXLEN+1) == 0) -+ if (FT_Get_Glyph_Name (face, glyph, name_buf, FC_GLYPHNAME_BUFLEN+1) == 0) - { - ucs4 = FcGlyphNameToUcs4 (name_buf); - if (ucs4 != 0xffff && ---- fc-glyphname/fc-glyphname.c.orig Sat Apr 14 01:49:42 2007 -+++ fc-glyphname/fc-glyphname.c Sat Apr 14 01:49:55 2007 -@@ -206,7 +206,7 @@ insert (FcGlyphName *gn, FcGlyphName **t - i = (int) (h % hash); - while (table[i]) - { -- if (!r) r = (int) (h % rehash); -+ if (!r) r = (int) (h % rehash + 1); - i += r; - if (i >= hash) - i -= hash; ---- src/fcpat.c.orig Sat Apr 14 01:51:00 2007 -+++ src/fcpat.c Sat Apr 14 01:52:23 2007 -@@ -925,10 +925,13 @@ FcPatternDuplicate (const FcPattern *ori - for (i = 0; i < orig->num; i++) - { - for (l = FcPatternEltValues(e + i); l; l = FcValueListNext(l)) -- if (!FcPatternObjectAdd (new, e[i].object, -- FcValueCanonicalize(&l->value), -- FcTrue)) -+ { -+ if (!FcPatternObjectAddWithBinding (new, e[i].object, -+ FcValueCanonicalize(&l->value), -+ l->binding, -+ FcTrue)) - goto bail1; -+ } - } - - return new; diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist index 05f221ba92eb..46bba932d100 100644 --- a/x11-fonts/fontconfig/pkg-plist +++ b/x11-fonts/fontconfig/pkg-plist @@ -10,11 +10,12 @@ etc/fonts/conf.avail/10-sub-pixel-vbgr.conf etc/fonts/conf.avail/10-sub-pixel-vrgb.conf etc/fonts/conf.avail/10-unhinted.conf etc/fonts/conf.avail/20-fix-globaladvance.conf -etc/fonts/conf.avail/20-lohit-gujarati.conf etc/fonts/conf.avail/20-unhint-small-vera.conf -etc/fonts/conf.avail/30-amt-aliases.conf +etc/fonts/conf.avail/25-unhint-nonlatin.conf +etc/fonts/conf.avail/30-metric-aliases.conf etc/fonts/conf.avail/30-urw-aliases.conf -etc/fonts/conf.avail/40-generic.conf +etc/fonts/conf.avail/40-nonlatin.conf +etc/fonts/conf.avail/45-latin.conf etc/fonts/conf.avail/49-sansserif.conf etc/fonts/conf.avail/50-user.conf etc/fonts/conf.avail/51-local.conf @@ -28,11 +29,11 @@ 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-lohit-gujarati.conf etc/fonts/conf.d/20-unhint-small-vera.conf -etc/fonts/conf.d/30-amt-aliases.conf +etc/fonts/conf.d/30-metric-aliases.conf etc/fonts/conf.d/30-urw-aliases.conf -etc/fonts/conf.d/40-generic.conf +etc/fonts/conf.d/40-nonlatin.conf +etc/fonts/conf.d/45-latin.conf etc/fonts/conf.d/49-sansserif.conf etc/fonts/conf.d/50-user.conf etc/fonts/conf.d/51-local.conf diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile index ff066859e27c..82c6f6e751fe 100644 --- a/x11-themes/gnome-backgrounds/Makefile +++ b/x11-themes/gnome-backgrounds/Makefile @@ -3,21 +3,19 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.31 2007/09/18 16:40:37 mezz Exp $ +# $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.33 2008/03/10 01:12:43 mezz Exp $ # PORTNAME= gnome-backgrounds -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= x11-themes graphics 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 COMMENT= A collection of backgrounds for GNOME 2 USE_BZIP2= yes -USE_XLIB= yes USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo index 8041d3135574..ed14248f4670 100644 --- a/x11-themes/gnome-backgrounds/distinfo +++ b/x11-themes/gnome-backgrounds/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-backgrounds-2.20.0.tar.bz2) = 391c0c64407c5bd2a52207b0298beac4 -SHA256 (gnome2/gnome-backgrounds-2.20.0.tar.bz2) = ca8058d515db7ba7bc0dd9083149b5b64fc5bb0b8729d65367af4ef93dae000a -SIZE (gnome2/gnome-backgrounds-2.20.0.tar.bz2) = 1208607 +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 diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist index c87551f73f1f..c7042e027f2d 100644 --- a/x11-themes/gnome-backgrounds/pkg-plist +++ b/x11-themes/gnome-backgrounds/pkg-plist @@ -2,6 +2,7 @@ share/gnome-background-properties/gnome-branded.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 share/locale/be/LC_MESSAGES/gnome-backgrounds.mo @@ -24,6 +25,8 @@ share/locale/eu/LC_MESSAGES/gnome-backgrounds.mo share/locale/fa/LC_MESSAGES/gnome-backgrounds.mo share/locale/fi/LC_MESSAGES/gnome-backgrounds.mo share/locale/fr/LC_MESSAGES/gnome-backgrounds.mo +share/locale/fur/LC_MESSAGES/gnome-backgrounds.mo +share/locale/ga/LC_MESSAGES/gnome-backgrounds.mo share/locale/gl/LC_MESSAGES/gnome-backgrounds.mo share/locale/gu/LC_MESSAGES/gnome-backgrounds.mo share/locale/he/LC_MESSAGES/gnome-backgrounds.mo @@ -70,6 +73,8 @@ share/locale/te/LC_MESSAGES/gnome-backgrounds.mo share/locale/th/LC_MESSAGES/gnome-backgrounds.mo share/locale/tr/LC_MESSAGES/gnome-backgrounds.mo share/locale/uk/LC_MESSAGES/gnome-backgrounds.mo +share/locale/uz/LC_MESSAGES/gnome-backgrounds.mo +share/locale/uz@cyrillic/LC_MESSAGES/gnome-backgrounds.mo 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 @@ -87,11 +92,13 @@ share/pixmaps/backgrounds/gnome/translucent/tentacles.svg @dirrm share/pixmaps/backgrounds/gnome/tiles @dirrm share/pixmaps/backgrounds/gnome/nature @dirrm share/pixmaps/backgrounds/gnome/branded -@dirrm share/pixmaps/backgrounds/gnome -@dirrm share/pixmaps/backgrounds +@dirrmtry share/pixmaps/backgrounds/gnome +@dirrmtry share/pixmaps/backgrounds @dirrmtry share/gnome-background-properties @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/si/LC_MESSAGES @@ -112,6 +119,8 @@ share/pixmaps/backgrounds/gnome/translucent/tentacles.svg @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-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index 85e3d8e4c3e6..b7f2ff9dd8d3 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11-themes/gnome-themes/Makefile,v 1.1 2007/11/30 21:45:27 marcus Exp $ +# $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.138 2008/03/10 21:02:15 mezz Exp $ # PORTNAME= gnome-themes -PORTVERSION= 2.20.2 +PORTVERSION= 2.22.0 CATEGORIES= x11-themes 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-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 30318517d419..7ed73d8c52bf 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-themes-2.20.2.tar.bz2) = 52d018251ef8164deaf9343cbfb7af16 -SHA256 (gnome2/gnome-themes-2.20.2.tar.bz2) = 14ecc315eeb58e6d7fad676ad39f9da3a4938bfabf1a01540232fc5a1a8c433c -SIZE (gnome2/gnome-themes-2.20.2.tar.bz2) = 2403213 +MD5 (gnome2/gnome-themes-2.22.0.tar.bz2) = e902194175c6f7298bd53e5aa7eef56b +SHA256 (gnome2/gnome-themes-2.22.0.tar.bz2) = 743e302cd42535a52332c3eba1cf137d0f923ad908f78854328bcb62486636aa +SIZE (gnome2/gnome-themes-2.22.0.tar.bz2) = 1495495 diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 5004f4763432..4dc6753d0ac6 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -684,11 +684,13 @@ share/icons/HighContrast-SVG/scalable/apps/accessories-text-editor.svg share/icons/HighContrast-SVG/scalable/apps/arts.svg share/icons/HighContrast-SVG/scalable/apps/background.svg share/icons/HighContrast-SVG/scalable/apps/browser.svg +share/icons/HighContrast-SVG/scalable/apps/bug-buddy.svg share/icons/HighContrast-SVG/scalable/apps/calc.svg share/icons/HighContrast-SVG/scalable/apps/config-language.svg share/icons/HighContrast-SVG/scalable/apps/email.svg share/icons/HighContrast-SVG/scalable/apps/file-manager.svg share/icons/HighContrast-SVG/scalable/apps/fonts.svg +share/icons/HighContrast-SVG/scalable/apps/glchess.svg share/icons/HighContrast-SVG/scalable/apps/gnome-calculator.svg share/icons/HighContrast-SVG/scalable/apps/gnome-character-map.svg share/icons/HighContrast-SVG/scalable/apps/gnome-help.svg @@ -751,6 +753,7 @@ share/icons/HighContrast-SVG/scalable/apps/system-file-manager.svg share/icons/HighContrast-SVG/scalable/apps/system-software-update.svg share/icons/HighContrast-SVG/scalable/apps/terminal.svg share/icons/HighContrast-SVG/scalable/apps/text-editor.svg +share/icons/HighContrast-SVG/scalable/apps/tomboy.svg share/icons/HighContrast-SVG/scalable/apps/update-manager.svg share/icons/HighContrast-SVG/scalable/apps/utilities-system-monitor.svg share/icons/HighContrast-SVG/scalable/apps/utilities-terminal.svg @@ -1667,7 +1670,6 @@ 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/star.png -share/icons/HighContrastLargePrintInverse/48x48/apps/start-here.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 @@ -1676,92 +1678,102 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/sun_java.png share/icons/HighContrastLargePrintInverse/48x48/apps/web-browser.png share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png share/icons/HighContrastLargePrintInverse/48x48/apps/xsane.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 +share/icons/HighContrastLargePrintInverse/48x48/devices/computer.png +share/icons/HighContrastLargePrintInverse/48x48/devices/drive-cdrom.png +share/icons/HighContrastLargePrintInverse/48x48/devices/drive-harddisk.png +share/icons/HighContrastLargePrintInverse/48x48/devices/drive-optical.png +share/icons/HighContrastLargePrintInverse/48x48/devices/drive-removable-media.png +share/icons/HighContrastLargePrintInverse/48x48/devices/dvd_unmount.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom-audio.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-computer.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-cdr.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-cdrw.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdr-plus.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdr.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdram.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdrom.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdrw.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-dvd.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-floppy.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-harddisk-1394.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-harddisk-usb.png share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-harddisk.png -share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-jazdisk.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 share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable.png -share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-zipdisk.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-fs-client.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gtk-cdrom.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gtk-floppy.png +share/icons/HighContrastLargePrintInverse/48x48/devices/gtk-harddisk.png +share/icons/HighContrastLargePrintInverse/48x48/devices/harddrive.png +share/icons/HighContrastLargePrintInverse/48x48/devices/hdd_unmount.png +share/icons/HighContrastLargePrintInverse/48x48/devices/input-keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/devices/input-mouse.png +share/icons/HighContrastLargePrintInverse/48x48/devices/keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/devices/kjobviewer.png +share/icons/HighContrastLargePrintInverse/48x48/devices/kxkb.png +share/icons/HighContrastLargePrintInverse/48x48/devices/media-cdrom.png +share/icons/HighContrastLargePrintInverse/48x48/devices/media-floppy.png +share/icons/HighContrastLargePrintInverse/48x48/devices/media-optical.png +share/icons/HighContrastLargePrintInverse/48x48/devices/mouse.png +share/icons/HighContrastLargePrintInverse/48x48/devices/printer-remote.png +share/icons/HighContrastLargePrintInverse/48x48/devices/printer.png +share/icons/HighContrastLargePrintInverse/48x48/devices/printer1.png +share/icons/HighContrastLargePrintInverse/48x48/devices/printmgr.png +share/icons/HighContrastLargePrintInverse/48x48/devices/stock_printers.png +share/icons/HighContrastLargePrintInverse/48x48/devices/system-floppy.png +share/icons/HighContrastLargePrintInverse/48x48/devices/system.png +share/icons/HighContrastLargePrintInverse/48x48/devices/usbpendrive_unmount.png +share/icons/HighContrastLargePrintInverse/48x48/devices/xfce-printer.png +share/icons/HighContrastLargePrintInverse/48x48/devices/xfce4-keyboard.png +share/icons/HighContrastLargePrintInverse/48x48/devices/xfce4-mouse.png +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-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/filesystems/gnome-fs-client.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-desktop.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.icon -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-accept.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory-visiting.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.icon -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-directory.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-executable.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-ftp.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-home.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-loading-icon.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-network.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-nfs.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-regular.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-share.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-smb.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-ssh.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-trash-empty.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-trash-full.png -share/icons/HighContrastLargePrintInverse/48x48/filesystems/gnome-fs-web.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-compressed.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-library.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-lhz.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-msword.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 +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/binary.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/contents2.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/deb.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/empty.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/exec.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/folder_tar.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font-x-generic.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font_bitmap.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font_truetype.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font_type1.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-fs-executable.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-fs-regular.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-ogg.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-pdf.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-pgp-encrypted.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-pgp-keys.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-pgp.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-postscript.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-qif.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-rhythmbox-effect.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-rhythmbox-playlist.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-rtf.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-smil.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-abiword.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-applix-word.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-7z-compressed.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-archive.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-arj.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-backup.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-blender.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-bzip.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-cd-image.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-class-file.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-compress.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-core-file.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-core.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-cpio.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-dc-rom.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-deb.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-dia-diagram.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-dvi.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-e-theme.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-executable.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-afm.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-bdf.png @@ -1769,401 +1781,105 @@ share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-pcf.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-ttf.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gameboy-rom.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-genesis-rom.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-glade.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gnome-app-info.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gnucash.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gnumeric.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gtktalog.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gzip.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-ipod-firmware.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-jar.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-java-byte-code.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-kde-app-info.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-killustrator.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-kpresenter.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-kspread.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-kword.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lha.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-mrproject.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-msx-rom.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-n64-rom.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-nes-rom.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-object-file.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-object.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-ogg.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-php.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-python.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-qw.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 -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-reject.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-rpm.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-scheme.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-sharedlib.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-shellscript.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-smil.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-sms-rom.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-sql.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-stuffit.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tar.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tex.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-trash.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tarz.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-zip.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-ac3.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-basic.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-midi.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-aiff.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-it.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-midi.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-mod.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-mp3.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-pn-realaudio.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-s3m.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-stm.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-ulaw.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-voc.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-wav.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-xi.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio-x-xm.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-bmp.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-gif.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-ief.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-jpeg.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-png.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-svg+xml.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-svg.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-tiff.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-3ds.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-applix-graphic.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-cmu-raster.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-lwo.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-lws.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-portable-anymap.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-portable-bitmap.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-portable-graymap.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-portable-pixmap.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-psd.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-rgb.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-tga.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-xbitmap.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-xcf.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-xfig.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-xpixmap.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image-x-xwindowdump.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-css.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-html.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-authors.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-c++.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-c++src.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-c-header.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-c.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-chdr.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-copying.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-credits.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-csh.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-csharp.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-csrc.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-haskell.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-install.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-java.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-literate-haskell.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-lyx.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-makefile.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-patch.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-perl.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-python.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-readme.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-scheme.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-sh.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-sql.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-tex.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-troff-man.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-vcalendar.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-vcard.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-zsh.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-xml.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-video-mpeg.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-video-quicktime.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-video-x-ms-asf.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-video-x-ms-wmv.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-video-x-msvideo.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-video.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-x-font-afm.png -share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-x-font.png share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-package.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gtk-file.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/image-x-generic.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/image.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/mime_ascii.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/misc.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package-x-generic.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package_editors.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/rpm.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/sound.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/stock_addressbook.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/tar.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/text-x-preview.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/tgz.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/txt.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/txt2.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/unknown.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/vcard.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/video-x-generic.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/video.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-address-book.png +share/icons/HighContrastLargePrintInverse/48x48/mimetypes/zip.png +share/icons/HighContrastLargePrintInverse/48x48/places/desktop.png +share/icons/HighContrastLargePrintInverse/48x48/places/distributor-logo.png +share/icons/HighContrastLargePrintInverse/48x48/places/emptytrash.png +share/icons/HighContrastLargePrintInverse/48x48/places/folder-remote.png +share/icons/HighContrastLargePrintInverse/48x48/places/folder.icon +share/icons/HighContrastLargePrintInverse/48x48/places/folder.png +share/icons/HighContrastLargePrintInverse/48x48/places/folder_home.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-desktop.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-directory.icon +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-directory.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-ftp.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-home.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-network.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-nfs.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-server.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-share.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-smb.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-ssh.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-trash-empty.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-main-menu.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-mime-x-directory-nfs-server.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-mime-x-directory-smb-server.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-mime-x-directory-smb-share.png +share/icons/HighContrastLargePrintInverse/48x48/places/gnome-mime-x-directory-smb-workgroup.png +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/network-server.png +share/icons/HighContrastLargePrintInverse/48x48/places/network-workgroup.png +share/icons/HighContrastLargePrintInverse/48x48/places/network.png +share/icons/HighContrastLargePrintInverse/48x48/places/network_local.png +share/icons/HighContrastLargePrintInverse/48x48/places/novell-button.png +share/icons/HighContrastLargePrintInverse/48x48/places/redhat-network-server.png +share/icons/HighContrastLargePrintInverse/48x48/places/server.png +share/icons/HighContrastLargePrintInverse/48x48/places/start-here.png +share/icons/HighContrastLargePrintInverse/48x48/places/stock_folder.icon +share/icons/HighContrastLargePrintInverse/48x48/places/stock_folder.png +share/icons/HighContrastLargePrintInverse/48x48/places/trashcan_empty.png +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/edittrash.png +share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.icon +share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.png +share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept.icon +share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept.png +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/trashcan_full.png +share/icons/HighContrastLargePrintInverse/48x48/status/user-trash-full.png +share/icons/HighContrastLargePrintInverse/48x48/status/xfce-trash_full.png share/icons/HighContrastLargePrintInverse/index.theme share/icons/LargePrint/index.theme -share/icons/LowContrast/index.theme -share/icons/LowContrastLargePrint/36x36/apps/gnome-spinner-rest.png -share/icons/LowContrastLargePrint/36x36/apps/gnome-spinner.png -share/icons/LowContrastLargePrint/48x48/apps/accessibility-directory.png -share/icons/LowContrastLargePrint/48x48/apps/advanced-directory.png -share/icons/LowContrastLargePrint/48x48/apps/ax-applet.png -share/icons/LowContrastLargePrint/48x48/apps/charpick.png -share/icons/LowContrastLargePrint/48x48/apps/clock.png -share/icons/LowContrastLargePrint/48x48/apps/display-capplet.png -share/icons/LowContrastLargePrint/48x48/apps/file-manager.png -share/icons/LowContrastLargePrint/48x48/apps/file-roller.png -share/icons/LowContrastLargePrint/48x48/apps/gcalctool.png -share/icons/LowContrastLargePrint/48x48/apps/gdict.png -share/icons/LowContrastLargePrint/48x48/apps/gedit-icon.png -share/icons/LowContrastLargePrint/48x48/apps/gkb.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-applications.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-audio2.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-calc3.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-ccmime.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-ccscreensaver.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-cd.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-character-map.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-devel.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-eog.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-ghex.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-ghostview.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-globe.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-graphics.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-grecord.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-help.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-home.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-joystick.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-log.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-logo-icon-transparent.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-logout.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-mailcheck.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-mini-commander.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-remote-desktop.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-run.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-screenshot.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-background.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-default-applications.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-font.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-keybindings.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-sound.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-theme.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-ui-behavior.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-settings.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-starthere.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-system.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-terminal.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-util.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-window-manager.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-windows.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-workspace.png -share/icons/LowContrastLargePrint/48x48/apps/gucharmap.png -share/icons/LowContrastLargePrint/48x48/apps/launcher-program.png -share/icons/LowContrastLargePrint/48x48/apps/orca.png -share/icons/LowContrastLargePrint/48x48/apps/panel-drawer.png -share/icons/LowContrastLargePrint/48x48/apps/panel-force-quit.png -share/icons/LowContrastLargePrint/48x48/apps/perfmeter.png -share/icons/LowContrastLargePrint/48x48/apps/start-here.png -share/icons/LowContrastLargePrint/48x48/apps/window-capplet.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom-audio.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-cdrom.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-dvd.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-floppy.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-harddisk.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-keyboard.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-memory.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer-network.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer-new.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer.png -share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-art.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-camera.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-documents.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-mail.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-multimedia.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-noread.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-package.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-pictures.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-sound.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-symbolic-link.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-trash.png -share/icons/LowContrastLargePrint/48x48/emblems/emblem-web.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-blockdev.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark-missing.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-bookmark.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-chardev.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-client.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.icon -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory-accept.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory.icon -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-directory.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-executable.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-fifo.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-ftp.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-home.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-loading-icon.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-network.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-nfs.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.icon -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-regular.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-share.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-smb.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-socket.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-trash-empty.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-trash-full.png -share/icons/LowContrastLargePrint/48x48/filesystems/gnome-fs-web.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-compressed.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-library.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-msword.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-pdf.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-encrypted.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-keys.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-postscript.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-qif.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-rtf.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-abiword.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-applix-word.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-arj.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-backup.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-bzip.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-compress.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-core-file.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-core.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-dc-rom.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-deb.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-dia-diagram.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-e-theme.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-afm.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-bdf.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-linux-psf.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-pcf.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-font-ttf.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gameboy-rom.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-genesis-rom.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gnome-app-info.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gnumeric.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gtktalog.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-gzip.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-java-byte-code.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-kde-app-info.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-killustrator.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-kpresenter.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-kspread.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-kword.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-mrproject.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-msx-rom.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-n64-rom.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-nes-rom.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-object-file.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-ogg.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-php.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-reject.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-rpm.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-scheme.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-smil.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-sms-rom.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-sql.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-stuffit.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-application-x-tex.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-ac3.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-basic.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-aiff.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-it.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-midi.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-mod.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-mp3.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-pn-realaudio.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-s3m.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-stm.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-ulaw.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-voc.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-wav.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-xi.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio-x-xm.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-audio.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-bmp.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-gif.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-ief.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-jpeg.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-png.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-svg.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-tiff.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-3ds.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-applix-graphic.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-cmu-raster.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-lwo.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-lws.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-portable-anymap.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-portable-bitmap.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-portable-graymap.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-portable-pixmap.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-psd.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-rgb.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-tga.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xbitmap.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xcf.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xfig.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xpixmap.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image-x-xwindowdump.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-image.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-css.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-html.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-authors.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-c++.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-c-header.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-c.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-copying.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-credits.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-csh.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-haskell.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-install.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-java.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-literate-haskell.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-lyx.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-makefile.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-patch.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-perl.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-python.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-readme.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-sh.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-sql.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-troff-man.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-x-zsh.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text-xml.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-text.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-mpeg.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-quicktime.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-ms-asf.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-ms-wmv.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-msvideo.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png -share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-package.png -share/icons/LowContrastLargePrint/index.theme share/icons/Mist/16x16/actions/document-open.png share/icons/Mist/16x16/actions/fileopen.png share/icons/Mist/16x16/actions/gtk-open.png @@ -2329,6 +2045,7 @@ share/locale/eu/LC_MESSAGES/gnome-themes.mo share/locale/fa/LC_MESSAGES/gnome-themes.mo share/locale/fi/LC_MESSAGES/gnome-themes.mo share/locale/fr/LC_MESSAGES/gnome-themes.mo +share/locale/fur/LC_MESSAGES/gnome-themes.mo share/locale/ga/LC_MESSAGES/gnome-themes.mo share/locale/gl/LC_MESSAGES/gnome-themes.mo share/locale/gu/LC_MESSAGES/gnome-themes.mo @@ -2663,134 +2380,6 @@ share/themes/Inverted/gtk-2.0/gtkrc share/themes/Inverted/metacity-1/metacity-theme-1.xml share/themes/LargePrint/gtk-2.0/gtkrc share/themes/LargePrint/index.theme.disabled -share/themes/LargePrint/pixmaps/double-click-maybe.png -share/themes/LargePrint/pixmaps/double-click-off.png -share/themes/LargePrint/pixmaps/double-click-on.png -share/themes/LargePrint/pixmaps/media-backward.png -share/themes/LargePrint/pixmaps/media-eject.png -share/themes/LargePrint/pixmaps/media-forward.png -share/themes/LargePrint/pixmaps/media-next.png -share/themes/LargePrint/pixmaps/media-pause.png -share/themes/LargePrint/pixmaps/media-play.png -share/themes/LargePrint/pixmaps/media-prev.png -share/themes/LargePrint/pixmaps/media-record.png -share/themes/LargePrint/pixmaps/media-stop.png -share/themes/LargePrint/pixmaps/metacity-delete.png -share/themes/LargePrint/pixmaps/metacity-maximize.png -share/themes/LargePrint/pixmaps/metacity-minimize.png -share/themes/LargePrint/pixmaps/printer-broken.png -share/themes/LargePrint/pixmaps/printer-default.png -share/themes/LargePrint/pixmaps/printer-inkjet.png -share/themes/LargePrint/pixmaps/printer-personal-laser.png -share/themes/LargePrint/pixmaps/printer-workgroup-laser.png -share/themes/LargePrint/pixmaps/stock_about.png -share/themes/LargePrint/pixmaps/stock_accessories.png -share/themes/LargePrint/pixmaps/stock_add.png -share/themes/LargePrint/pixmaps/stock_amusements.png -share/themes/LargePrint/pixmaps/stock_apply.png -share/themes/LargePrint/pixmaps/stock_attach.png -share/themes/LargePrint/pixmaps/stock_bold.png -share/themes/LargePrint/pixmaps/stock_book.png -share/themes/LargePrint/pixmaps/stock_cancel.png -share/themes/LargePrint/pixmaps/stock_cde-menu.png -share/themes/LargePrint/pixmaps/stock_cdrom.png -share/themes/LargePrint/pixmaps/stock_clear.png -share/themes/LargePrint/pixmaps/stock_close.png -share/themes/LargePrint/pixmaps/stock_commandline-browser.xpm -share/themes/LargePrint/pixmaps/stock_commandline-history.xpm -share/themes/LargePrint/pixmaps/stock_connect.png -share/themes/LargePrint/pixmaps/stock_convert.png -share/themes/LargePrint/pixmaps/stock_copy.png -share/themes/LargePrint/pixmaps/stock_cut.png -share/themes/LargePrint/pixmaps/stock_delete.png -share/themes/LargePrint/pixmaps/stock_dialog_error.png -share/themes/LargePrint/pixmaps/stock_dialog_info.png -share/themes/LargePrint/pixmaps/stock_dialog_question.png -share/themes/LargePrint/pixmaps/stock_dialog_warning.png -share/themes/LargePrint/pixmaps/stock_disconnect.png -share/themes/LargePrint/pixmaps/stock_dnd.png -share/themes/LargePrint/pixmaps/stock_dnd_multiple.png -share/themes/LargePrint/pixmaps/stock_drawer.png -share/themes/LargePrint/pixmaps/stock_edit.png -share/themes/LargePrint/pixmaps/stock_empty.png -share/themes/LargePrint/pixmaps/stock_execute.png -share/themes/LargePrint/pixmaps/stock_export.png -share/themes/LargePrint/pixmaps/stock_find-and-replace.png -share/themes/LargePrint/pixmaps/stock_find.png -share/themes/LargePrint/pixmaps/stock_floppy.png -share/themes/LargePrint/pixmaps/stock_gnome-logo.png -share/themes/LargePrint/pixmaps/stock_gnome-util.png -share/themes/LargePrint/pixmaps/stock_go-back.png -share/themes/LargePrint/pixmaps/stock_go-down.png -share/themes/LargePrint/pixmaps/stock_go-forward.png -share/themes/LargePrint/pixmaps/stock_go-up.png -share/themes/LargePrint/pixmaps/stock_goto-bottom.png -share/themes/LargePrint/pixmaps/stock_goto-first.png -share/themes/LargePrint/pixmaps/stock_goto-last.png -share/themes/LargePrint/pixmaps/stock_goto-top.png -share/themes/LargePrint/pixmaps/stock_harddisk.png -share/themes/LargePrint/pixmaps/stock_help.png -share/themes/LargePrint/pixmaps/stock_home.png -share/themes/LargePrint/pixmaps/stock_import.png -share/themes/LargePrint/pixmaps/stock_index.png -share/themes/LargePrint/pixmaps/stock_info.png -share/themes/LargePrint/pixmaps/stock_insert-image.png -share/themes/LargePrint/pixmaps/stock_insert-object.png -share/themes/LargePrint/pixmaps/stock_insert-table.png -share/themes/LargePrint/pixmaps/stock_internet.png -share/themes/LargePrint/pixmaps/stock_italic.png -share/themes/LargePrint/pixmaps/stock_jump-to.png -share/themes/LargePrint/pixmaps/stock_justify-center.png -share/themes/LargePrint/pixmaps/stock_justify-fill.png -share/themes/LargePrint/pixmaps/stock_justify-left.png -share/themes/LargePrint/pixmaps/stock_justify-right.png -share/themes/LargePrint/pixmaps/stock_launcher-program.png -share/themes/LargePrint/pixmaps/stock_line-in.png -share/themes/LargePrint/pixmaps/stock_lockscreen.png -share/themes/LargePrint/pixmaps/stock_logout.png -share/themes/LargePrint/pixmaps/stock_mic.png -share/themes/LargePrint/pixmaps/stock_missing-image.png -share/themes/LargePrint/pixmaps/stock_multimedia.png -share/themes/LargePrint/pixmaps/stock_new.png -share/themes/LargePrint/pixmaps/stock_no.png -share/themes/LargePrint/pixmaps/stock_ok.png -share/themes/LargePrint/pixmaps/stock_open.png -share/themes/LargePrint/pixmaps/stock_paste.png -share/themes/LargePrint/pixmaps/stock_preferences.png -share/themes/LargePrint/pixmaps/stock_print-preview.png -share/themes/LargePrint/pixmaps/stock_print.png -share/themes/LargePrint/pixmaps/stock_properties.png -share/themes/LargePrint/pixmaps/stock_quit.png -share/themes/LargePrint/pixmaps/stock_redo.png -share/themes/LargePrint/pixmaps/stock_refresh.png -share/themes/LargePrint/pixmaps/stock_remove.png -share/themes/LargePrint/pixmaps/stock_revert-to-saved.png -share/themes/LargePrint/pixmaps/stock_run.png -share/themes/LargePrint/pixmaps/stock_save-as.png -share/themes/LargePrint/pixmaps/stock_save.png -share/themes/LargePrint/pixmaps/stock_screenshot.png -share/themes/LargePrint/pixmaps/stock_searchtool.png -share/themes/LargePrint/pixmaps/stock_select-color.png -share/themes/LargePrint/pixmaps/stock_select-font.png -share/themes/LargePrint/pixmaps/stock_sort-ascending.png -share/themes/LargePrint/pixmaps/stock_sort-descending.png -share/themes/LargePrint/pixmaps/stock_spell-check.png -share/themes/LargePrint/pixmaps/stock_stop.png -share/themes/LargePrint/pixmaps/stock_strikethrough.png -share/themes/LargePrint/pixmaps/stock_undelete.png -share/themes/LargePrint/pixmaps/stock_underline.png -share/themes/LargePrint/pixmaps/stock_undo.png -share/themes/LargePrint/pixmaps/stock_volume.png -share/themes/LargePrint/pixmaps/stock_yes.png -share/themes/LargePrint/pixmaps/stock_zoom-100.png -share/themes/LargePrint/pixmaps/stock_zoom-fit.png -share/themes/LargePrint/pixmaps/stock_zoom-in.png -share/themes/LargePrint/pixmaps/stock_zoom-out.png -share/themes/LargePrint/pixmaps/volume-max.png -share/themes/LargePrint/pixmaps/volume-medium.png -share/themes/LargePrint/pixmaps/volume-min.png -share/themes/LargePrint/pixmaps/volume-mute.png -share/themes/LargePrint/pixmaps/volume-zero.png share/themes/LowContrast/gtk-2.0/gtkrc share/themes/LowContrast/index.theme share/themes/LowContrastLargePrint/gtk-2.0/gtkrc @@ -2935,7 +2524,6 @@ share/themes/Simple/gtk-2.0/gtkrc @dirrm share/themes/LowContrastLargePrint @dirrm share/themes/LowContrast/gtk-2.0 @dirrm share/themes/LowContrast -@dirrm share/themes/LargePrint/pixmaps @dirrm share/themes/LargePrint/gtk-2.0 @dirrm share/themes/LargePrint @dirrm share/themes/Inverted/metacity-1 @@ -2985,19 +2573,10 @@ share/themes/Simple/gtk-2.0/gtkrc @dirrm share/icons/Mist/16x16/actions @dirrm share/icons/Mist/16x16 @dirrm share/icons/Mist -@dirrm share/icons/LowContrastLargePrint/48x48/mimetypes -@dirrm share/icons/LowContrastLargePrint/48x48/filesystems -@dirrm share/icons/LowContrastLargePrint/48x48/emblems -@dirrm share/icons/LowContrastLargePrint/48x48/devices -@dirrm share/icons/LowContrastLargePrint/48x48/apps -@dirrm share/icons/LowContrastLargePrint/48x48 -@dirrm share/icons/LowContrastLargePrint/36x36/apps -@dirrm share/icons/LowContrastLargePrint/36x36 -@dirrm share/icons/LowContrastLargePrint -@dirrm share/icons/LowContrast @dirrm share/icons/LargePrint +@dirrm share/icons/HighContrastLargePrintInverse/48x48/status +@dirrm share/icons/HighContrastLargePrintInverse/48x48/places @dirrm share/icons/HighContrastLargePrintInverse/48x48/mimetypes -@dirrm share/icons/HighContrastLargePrintInverse/48x48/filesystems @dirrm share/icons/HighContrastLargePrintInverse/48x48/emblems @dirrm share/icons/HighContrastLargePrintInverse/48x48/devices @dirrm share/icons/HighContrastLargePrintInverse/48x48/apps @@ -3071,6 +2650,8 @@ share/themes/Simple/gtk-2.0/gtkrc @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@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-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index 6f518ba41a89..9feb4fd8a512 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.50 2007/10/16 03:21:53 mezz Exp $ +# $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.59 2008/03/18 12:15:18 ahze Exp $ # PORTNAME= gtk-engines2 -PORTVERSION= 2.12.2 +PORTVERSION= 2.14.0 +PORTREVISION= 1 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,10 +22,10 @@ CONFLICTS= gtk-smooth-engine-[0-9]* clearlooks-[0-9]* USE_GMAKE= yes USE_BZIP2= yes -USE_GNOME= gnomehack gtk20 +USE_GNOME= gnomehack gtk20 intlhack ltasneededhack USE_GETTEXT= yes USE_LDCONFIG= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" .if defined(WITH_ANIMATION) @@ -40,9 +41,4 @@ pre-everything:: @${ECHO_MSG} "" .endif -# Disable the gtk1 theme. -post-patch: - @${REINPLACE_CMD} -e 's|gtk gtk-2.0|gtk-2.0|g' \ - ${WRKSRC}/themes/Redmond/Makefile.in - .include <bsd.port.mk> diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index 295c83ff44ed..aa258b14ab70 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk-engines-2.12.2.tar.bz2) = a73506d8262eb52e0e4bd8e04517ea4e -SHA256 (gnome2/gtk-engines-2.12.2.tar.bz2) = d227dfa35520af1ffb19a5d9c423a5d65b2071b9b43a0351ca2f4a4e1c836dba -SIZE (gnome2/gtk-engines-2.12.2.tar.bz2) = 653441 +MD5 (gnome2/gtk-engines-2.14.0.tar.bz2) = c4784ceacddbf818c22ce36b13f6c7a1 +SHA256 (gnome2/gtk-engines-2.14.0.tar.bz2) = 15aa3a926307b4b3e40f3a9b05c604df6811eb48814b1534db32aed414aefb0c +SIZE (gnome2/gtk-engines-2.14.0.tar.bz2) = 665156 diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index c97e50ca8646..b0efd0d2c43c 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -1,19 +1,28 @@ +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcrux-engine.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcrux-engine.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcrux-engine.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libglide.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libglide.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libglide.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libhcengine.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libhcengine.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libhcengine.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libindustrial.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libindustrial.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libindustrial.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmist.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmist.la 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 libdata/pkgconfig/gtk-engines-2.pc @@ -31,6 +40,7 @@ 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 @@ -38,18 +48,24 @@ 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/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 @@ -58,14 +74,19 @@ 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@Latn/LC_MESSAGES/gtk-engines.mo share/locale/sv/LC_MESSAGES/gtk-engines.mo share/locale/ta/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 @@ -86,10 +107,14 @@ 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/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/x11-themes/nimbus/Makefile b/x11-themes/nimbus/Makefile index 1808ae22e729..76db15605816 100644 --- a/x11-themes/nimbus/Makefile +++ b/x11-themes/nimbus/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-themes/nimbus/Makefile,v 1.5 2007/10/23 12:51:24 ahze Exp $ +# $MCom: ports/x11-themes/nimbus/Makefile,v 1.7 2008/03/18 19:01:43 ahze Exp $ PORTNAME= nimbus -PORTVERSION= 0.0.11 +PORTVERSION= 0.0.12 CATEGORIES= x11-themes MASTER_SITES= http://dlc.sun.com/osol/jds/downloads/extras/ @@ -18,7 +18,7 @@ BUILD_DEPENDS= gnome-themes>0:${PORTSDIR}/x11-themes/gnome-themes \ RUN_DEPENDS= gnome-themes>0:${PORTSDIR}/x11-themes/gnome-themes USE_BZIP2= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes INSTALLS_ICONS= yes USE_GNOME= intltool diff --git a/x11-themes/nimbus/distinfo b/x11-themes/nimbus/distinfo index d1525ba124c4..787b69487ebf 100644 --- a/x11-themes/nimbus/distinfo +++ b/x11-themes/nimbus/distinfo @@ -1,3 +1,3 @@ -MD5 (nimbus-0.0.11.tar.bz2) = 1703fb610491a6a45bdbd2141ac42509 -SHA256 (nimbus-0.0.11.tar.bz2) = 09fc60dfaa72b1f1cb280c55d65f51ee07e43b60c08cc6ee4ce85c501fe9b725 -SIZE (nimbus-0.0.11.tar.bz2) = 9448676 +MD5 (nimbus-0.0.12.tar.bz2) = 936e3ef4caa12edfcad701fd7af59e15 +SHA256 (nimbus-0.0.12.tar.bz2) = 9f68271d04f4318637b316ca3a84f3a98e16a195c1cb13bbe507db60627fef8c +SIZE (nimbus-0.0.12.tar.bz2) = 9392687 diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile index e0597a556f97..edfbf0e4d959 100644 --- a/x11-toolkits/bakery/Makefile +++ b/x11-toolkits/bakery/Makefile @@ -3,11 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/bakery/Makefile,v 1.5 2007/12/02 07:02:19 marcus Exp $ +# $MCom: ports/x11-toolkits/bakery/Makefile,v 1.11 2008/03/23 06:57:57 marcus Exp $ # PORTNAME= bakery PORTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 diff --git a/x11-toolkits/bakery/files/patch-bakery::Makefile.in b/x11-toolkits/bakery/files/patch-bakery::Makefile.in index 1c28b5348fea..9d0fa0b3ee9b 100644 --- a/x11-toolkits/bakery/files/patch-bakery::Makefile.in +++ b/x11-toolkits/bakery/files/patch-bakery::Makefile.in @@ -1,6 +1,6 @@ ---- bakery/Makefile.in.orig 2007-12-02 01:51:18.000000000 -0500 -+++ bakery/Makefile.in 2007-12-02 01:55:39.000000000 -0500 -@@ -279,10 +279,10 @@ libbakery_2_4_la_LIBADD = App/libbakery_ +--- bakery/Makefile.in.orig 2008-03-17 21:46:07.000000000 +0100 ++++ bakery/Makefile.in 2008-03-17 21:47:37.000000000 +0100 +@@ -279,10 +279,10 @@ View/libbakery_view.la \ $(BAKERY_LIBS) @@ -9,7 +9,7 @@ # Install the headers: -library_configdir = $(libdir)/bakery-2.4/include -+library_configdir = $(library_includedir) ++library_configdir = $(includedir)/bakery-2.4 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 576d15e85667..5642da1da4c0 100644 --- a/x11-toolkits/bakery/pkg-plist +++ b/x11-toolkits/bakery/pkg-plist @@ -17,8 +17,8 @@ include/bakery-%%API_VERSION%%/bakery/View/View.h include/bakery-%%API_VERSION%%/bakery/View/ViewBase.h include/bakery-%%API_VERSION%%/bakery/View/View_Composite.h include/bakery-%%API_VERSION%%/bakery/bakery.h -include/bakery-%%API_VERSION%%/bakery/bakeryconfig.h include/bakery-%%API_VERSION%%/bakery/init.h +include/bakery-%%API_VERSION%%/bakeryconfig.h lib/libbakery-%%VERSION%%.a lib/libbakery-%%VERSION%%.la lib/libbakery-%%VERSION%%.so diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index 41f8f44c5f63..046b5293d833 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -3,14 +3,13 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/eel/Makefile,v 1.60 2007/09/18 14:12:45 ahze Exp $ +# $MCom: ports/x11-toolkits/eel/Makefile,v 1.67 2008/03/10 21:38:32 mezz Exp $ # PORTNAME= eel -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.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 @@ -19,18 +18,13 @@ COMMENT= Generally useful classes and extensions to GNOME USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes -USE_XLIB= yes +USE_XORG= xrender GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus ltverhack +USE_GNOME= gnomeprefix gnomehack gail gnomedesktop ltverhack intlhack USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-patch: - @${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/eel/eel-open-with-dialog.c - .include <bsd.port.mk> diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo index 24738bf2d84b..838be7cde287 100644 --- a/x11-toolkits/eel/distinfo +++ b/x11-toolkits/eel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/eel-2.20.0.tar.bz2) = 691734dc1078e05e726b4f5b8646dadf -SHA256 (gnome2/eel-2.20.0.tar.bz2) = ba35db646ce069ee66a92fa95d10aff583e00e6039b1b5bb0fa6036742fddd70 -SIZE (gnome2/eel-2.20.0.tar.bz2) = 647919 +MD5 (gnome2/eel-2.22.0.tar.bz2) = cd0db25194c154f07c39b45ca5943999 +SHA256 (gnome2/eel-2.22.0.tar.bz2) = 09258b129d1cf805b56bfbbfc19798d158fa8001594d0f807e23562805581331 +SIZE (gnome2/eel-2.22.0.tar.bz2) = 606502 diff --git a/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c b/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c deleted file mode 100644 index 09270d77cacc..000000000000 --- a/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c +++ /dev/null @@ -1,52 +0,0 @@ ---- eel/eel-open-with-dialog.c.orig Mon Mar 21 06:25:51 2005 -+++ eel/eel-open-with-dialog.c Mon Mar 21 06:39:29 2005 -@@ -422,7 +422,7 @@ - gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), - FALSE); - gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), -- "/usr/bin"); -+ "%%LOCALBASE%%/bin"); - - gtk_widget_show (chooser); - } -@@ -452,10 +452,13 @@ - char *file; - gboolean long_operation; - -+ GDK_THREADS_ENTER (); -+ - long_operation = FALSE; - do { - if (!dialog->details->add_icon_paths) { - dialog->details->add_icons_idle_id = 0; -+ GDK_THREADS_LEAVE (); - return FALSE; - } - -@@ -508,6 +511,8 @@ - /* don't go back into the main loop if this wasn't very hard to do */ - } while (!long_operation); - -+ GDK_THREADS_LEAVE (); -+ - return TRUE; - } - -@@ -575,6 +580,8 @@ - GSList *l; - const char *prev_name; - -+ GDK_THREADS_ENTER (); -+ - /* create list store */ - dialog->details->program_list_store = gtk_list_store_new (NUM_COLUMNS, - GDK_TYPE_PIXBUF, -@@ -633,6 +640,8 @@ - NULL); - - gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->details->program_list), column); -+ -+ GDK_THREADS_LEAVE (); - - dialog->details->add_icon_paths = g_slist_reverse (dialog->details->add_icon_paths); - diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index fac1807dce3c..8316a352c40a 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -1,5 +1,6 @@ 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 @@ -7,7 +8,6 @@ include/eel-2/eel/eel-background.h include/eel-2/eel/eel-canvas-rect-ellipse.h include/eel-2/eel/eel-canvas-util.h include/eel-2/eel/eel-canvas.h -include/eel-2/eel/eel-dateedit-extensions.h include/eel-2/eel/eel-debug-drawing.h include/eel-2/eel/eel-debug.h include/eel-2/eel/eel-editable-label.h @@ -26,15 +26,12 @@ include/eel-2/eel/eel-i18n.h include/eel-2/eel/eel-image-table.h include/eel-2/eel/eel-labeled-image.h include/eel-2/eel/eel-marshal.h -include/eel-2/eel/eel-mime-application-chooser.h -include/eel-2/eel/eel-mime-extensions.h -include/eel-2/eel/eel-open-with-dialog.h +include/eel-2/eel/eel-mount-operation.h include/eel-2/eel/eel-pango-extensions.h include/eel-2/eel/eel-preferences-glade.h include/eel-2/eel/eel-preferences.h include/eel-2/eel/eel-self-checks.h include/eel-2/eel/eel-stock-dialogs.h -include/eel-2/eel/eel-string-list.h include/eel-2/eel/eel-string.h include/eel-2/eel/eel-type-builtins.h include/eel-2/eel/eel-types.h @@ -50,6 +47,7 @@ libdata/pkgconfig/eel-2.0.pc share/locale/am/LC_MESSAGES/eel-2.0.mo share/locale/ang/LC_MESSAGES/eel-2.0.mo share/locale/ar/LC_MESSAGES/eel-2.0.mo +share/locale/as/LC_MESSAGES/eel-2.0.mo share/locale/az/LC_MESSAGES/eel-2.0.mo share/locale/be/LC_MESSAGES/eel-2.0.mo share/locale/bg/LC_MESSAGES/eel-2.0.mo @@ -151,5 +149,7 @@ share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo @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 diff --git a/x11-toolkits/gstreamer-plugins-pango/Makefile b/x11-toolkits/gstreamer-plugins-pango/Makefile index aca74a40196d..a06c6e5e4ba7 100644 --- a/x11-toolkits/gstreamer-plugins-pango/Makefile +++ b/x11-toolkits/gstreamer-plugins-pango/Makefile @@ -3,9 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11-toolkits/gstreamer-plugins-pango/Makefile,v 1.6 2008/03/21 04:01:32 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= x11-toolkits COMMENT= Gstreamer pango textoverlay plugin diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index 5e741c69f79a..7f8363b1cdb3 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-stable/x11-toolkits/gtksourceview2/Makefile,v 1.1 2007/12/01 06:20:10 marcus Exp $ +# $MCom: ports/x11-toolkits/gtksourceview2/Makefile,v 1.60 2008/03/10 13:49:44 ahze Exp $ # PORTNAME= gtksourceview2 -PORTVERSION= 2.0.2 +PORTVERSION= 2.2.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/x11-toolkits/gtksourceview2/distinfo b/x11-toolkits/gtksourceview2/distinfo index 7e14ac6e8368..40cee0a7a183 100644 --- a/x11-toolkits/gtksourceview2/distinfo +++ b/x11-toolkits/gtksourceview2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtksourceview-2.0.2.tar.bz2) = 8a9daf3fa9ddeed92c18572ee16cd1f5 -SHA256 (gnome2/gtksourceview-2.0.2.tar.bz2) = bd775a331aec8fe682e123773a0609fd673256437c950ced8415ab56eb292e39 -SIZE (gnome2/gtksourceview-2.0.2.tar.bz2) = 1020145 +MD5 (gnome2/gtksourceview-2.2.0.tar.bz2) = f794b2bfea6f56bbdb6da494b5335f74 +SHA256 (gnome2/gtksourceview-2.2.0.tar.bz2) = 05c53f6fe640a07c6f42f3c6fa5a0d6591b659764baaf3292430987f1a558857 +SIZE (gnome2/gtksourceview-2.2.0.tar.bz2) = 1127301 diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist index 69850a61fae5..3b30647c2285 100644 --- a/x11-toolkits/gtksourceview2/pkg-plist +++ b/x11-toolkits/gtksourceview2/pkg-plist @@ -2,6 +2,8 @@ include/gtksourceview-2.0/gtksourceview/gtksourcebuffer.h include/gtksourceview-2.0/gtksourceview/gtksourceiter.h include/gtksourceview-2.0/gtksourceview/gtksourcelanguage.h include/gtksourceview-2.0/gtksourceview/gtksourcelanguagemanager.h +include/gtksourceview-2.0/gtksourceview/gtksourcemark.h +include/gtksourceview-2.0/gtksourceview/gtksourceprintcompositor.h include/gtksourceview-2.0/gtksourceview/gtksourcestyle.h include/gtksourceview-2.0/gtksourceview/gtksourcestylescheme.h include/gtksourceview-2.0/gtksourceview/gtksourcestyleschememanager.h @@ -31,7 +33,9 @@ share/gtksourceview-2.0/language-specs/diff.lang share/gtksourceview-2.0/language-specs/docbook.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 share/gtksourceview-2.0/language-specs/erlang.lang +share/gtksourceview-2.0/language-specs/forth.lang share/gtksourceview-2.0/language-specs/fortran.lang share/gtksourceview-2.0/language-specs/gap.lang share/gtksourceview-2.0/language-specs/gtk-doc.lang diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 9c1966b82d42..66d0623c6786 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.61 2007/09/17 14:52:59 ahze Exp $ +# $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.64 2008/03/10 16:41:24 ahze Exp $ # PORTNAME= libbonoboui -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index 43cf32693b35..6ba8647ba852 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome/libbonoboui-2.20.0.tar.bz2) = 14427a459f6ca355de5f5e47ce95c1c4 -SHA256 (gnome/libbonoboui-2.20.0.tar.bz2) = e6958e88039a9ef409ad8e90f78d65c0171e22ee0927f07790eaf6ede722a838 -SIZE (gnome/libbonoboui-2.20.0.tar.bz2) = 991509 +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 diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index f7257bbe9e60..589cb347ceb7 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -50,6 +50,7 @@ share/gnome-2.0/ui/bonobo-browser.xml share/locale/af/LC_MESSAGES/libbonoboui-2.0.mo share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/as/LC_MESSAGES/libbonoboui-2.0.mo share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo @@ -109,6 +110,7 @@ share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ro/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ru/LC_MESSAGES/libbonoboui-2.0.mo share/locale/rw/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/si/LC_MESSAGES/libbonoboui-2.0.mo 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 @@ -132,6 +134,7 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo @dirrm lib/bonobo-2.0 @dirrm include/libbonoboui-2.0/bonobo @dirrm include/libbonoboui-2.0 +@dirrmtry share/applications @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -142,6 +145,8 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo @dirrmtry share/locale/xh @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/oc/LC_MESSAGES @@ -158,4 +163,5 @@ share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo @dirrmtry share/locale/dz @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 3bf8762aa97b..5f41b960278f 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.108 2007/10/17 22:37:05 mezz Exp $ +# $MCom: ports/x11-toolkits/libgnomeui/Makefile,v 1.116 2008/03/10 15:46:28 ahze Exp $ # PORTNAME= libgnomeui -PORTVERSION= 2.20.1.1 +PORTVERSION= 2.22.01 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -26,11 +26,10 @@ LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \ RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme USE_GETTEXT= yes -USE_XLIB= yes -USE_XPM= yes +USE_XORG= sm USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack \ - referencehack + referencehack gvfs USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_BISON= build diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index 36eb70bcf572..9bef1fe4c05e 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = d1f500c5d33ce93159b4952bb476fcf3 -SHA256 (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 133933c70234ecd4560cec165034c21c94598c24c34138ed1ee1770f52328cef -SIZE (gnome2/libgnomeui-2.20.1.1.tar.bz2) = 1445994 +MD5 (gnome2/libgnomeui-2.22.01.tar.bz2) = 7d2bb24361f90201bcbf1327e1498251 +SHA256 (gnome2/libgnomeui-2.22.01.tar.bz2) = 516d2c995fd0acff05be88f75952d7ca2fa68c270f5a60a8b00df823cba289cc +SIZE (gnome2/libgnomeui-2.22.01.tar.bz2) = 1512741 diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index acce03934cfd..8a8f7d0e4b26 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -49,6 +49,9 @@ 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 @@ -63,6 +66,7 @@ libdata/pkgconfig/libgnomeui-2.0.pc share/locale/af/LC_MESSAGES/libgnomeui-2.0.mo share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/as/LC_MESSAGES/libgnomeui-2.0.mo share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo share/locale/be@latin/LC_MESSAGES/libgnomeui-2.0.mo @@ -87,6 +91,7 @@ share/locale/eu/LC_MESSAGES/libgnomeui-2.0.mo share/locale/fa/LC_MESSAGES/libgnomeui-2.0.mo share/locale/fi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/fur/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ga/LC_MESSAGES/libgnomeui-2.0.mo share/locale/gl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/gu/LC_MESSAGES/libgnomeui-2.0.mo @@ -122,6 +127,7 @@ share/locale/oc/LC_MESSAGES/libgnomeui-2.0.mo share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/ps/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pt/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo @@ -172,6 +178,8 @@ share/pixmaps/gnome-about-logo.png @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 @@ -186,9 +194,13 @@ share/pixmaps/gnome-about-logo.png @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 @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/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile index 1a714ac77067..fd926d660f85 100644 --- a/x11-toolkits/libgnomeuimm26/Makefile +++ b/x11-toolkits/libgnomeuimm26/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.12 2007/09/17 17:05:03 marcus Exp $ +# $MCom: ports/x11-toolkits/libgnomeuimm26/Makefile,v 1.14 2008/03/08 16:56:56 marcus Exp $ # PORTNAME= libgnomeuimm -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.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 16f95ce7ae66..4692cdf98bc8 100644 --- a/x11-toolkits/libgnomeuimm26/distinfo +++ b/x11-toolkits/libgnomeuimm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomeuimm-2.20.0.tar.bz2) = 350d3424247611a009432395aff8619f -SHA256 (gnome2/libgnomeuimm-2.20.0.tar.bz2) = f8bb4f068b7b0fc65e026ca28a57f2109f643f537f050f8a2bd0bb019e8bca8f -SIZE (gnome2/libgnomeuimm-2.20.0.tar.bz2) = 326994 +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 diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile index 0c2d8eea8680..a9251b339c7d 100644 --- a/x11-toolkits/libpanelappletmm/Makefile +++ b/x11-toolkits/libpanelappletmm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libpanelappletmm -PORTVERSION= 2.6.0 -PORTREVISION= 5 +PORTVERSION= 2.22.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} diff --git a/x11-toolkits/libpanelappletmm/distinfo b/x11-toolkits/libpanelappletmm/distinfo index 963edd2e9379..b099d4dd234a 100644 --- a/x11-toolkits/libpanelappletmm/distinfo +++ b/x11-toolkits/libpanelappletmm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libpanelappletmm-2.6.0.tar.bz2) = 74368673013ca6fe470d2b3f4a06b1df -SHA256 (gnome2/libpanelappletmm-2.6.0.tar.bz2) = e201eca0b3f35d7fe00f00b7b6c848d2787b9e8172f703994db687ebe065b7b1 -SIZE (gnome2/libpanelappletmm-2.6.0.tar.bz2) = 246596 +MD5 (gnome2/libpanelappletmm-2.22.0.tar.bz2) = 9209dd219a3f4542753743f3c8666e79 +SHA256 (gnome2/libpanelappletmm-2.22.0.tar.bz2) = 74e88cf91f7c3c50e8a546ebc9ff1d011e76b9720644cdc07b613544bd2be33b +SIZE (gnome2/libpanelappletmm-2.22.0.tar.bz2) = 264581 diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 46d9f927d79e..d568db1649c9 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/libwnck/Makefile,v 1.1 2007/12/01 20:04:12 marcus Exp $ +# $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.106 2008/03/10 23:48:53 ahze Exp $ # PORTNAME= libwnck -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -24,9 +24,9 @@ USE_BZIP2= yes LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_GETTEXT= yes -USE_XLIB= yes +USE_XORG= xres USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 ltverhack referencehack +USE_GNOME= gnomehack gtk20 ltverhack referencehack intlhack USE_BISON= build USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index 898183405bb9..c50ebfcb474f 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libwnck-2.20.3.tar.bz2) = 0f0f54764993497ed02f34a44056efb2 -SHA256 (gnome2/libwnck-2.20.3.tar.bz2) = d5fc1d8b0202ad169052dcd50b283ed4fb30a4a7da9bbf0be462d2879535dd6a -SIZE (gnome2/libwnck-2.20.3.tar.bz2) = 637507 +MD5 (gnome2/libwnck-2.22.0.tar.bz2) = db7b86ef93ed08ee1562cd08206f9c66 +SHA256 (gnome2/libwnck-2.22.0.tar.bz2) = 481dbf1ac490eb1a83abbb218a8191a0b7ae378a8d31e353a1abf96dc11f442a +SIZE (gnome2/libwnck-2.22.0.tar.bz2) = 725210 diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index b59fd91fd3a8..91af411df713 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.111 2007/10/15 21:40:26 mezz Exp $ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.118 2008/03/10 17:44:38 ahze Exp $ # PORTNAME= pango -PORTVERSION= 1.18.4 +PORTVERSION= 1.20.0 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ @@ -21,7 +21,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 5087ec0930fa..9bf649719b69 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/pango-1.18.4.tar.bz2) = 5f4a24eb03789746a13e41beb7044776 -SHA256 (gnome2/pango-1.18.4.tar.bz2) = 6fd3c82eb7aa1fd410cde21189b005095e882d8ab381a5b85bb7483ab7e7efdd -SIZE (gnome2/pango-1.18.4.tar.bz2) = 1406821 +MD5 (gnome2/pango-1.20.0.tar.bz2) = f0959c4b9b058ba9e4d13fc9086b7e7d +SHA256 (gnome2/pango-1.20.0.tar.bz2) = 3933d8fbfbc890ae29081a23e76be8da32024dd2a1bfe63c4cc77d607492e23b +SIZE (gnome2/pango-1.20.0.tar.bz2) = 1412843 diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index c7fad2d56cb1..7ffddc166a34 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.65 2007/09/16 17:47:04 ahze Exp $ +# $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.72 2008/03/09 21:58:25 mezz Exp $ # PORTNAME= gnome -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -21,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.7:${PORTSDIR}/multimedia/totem \ + totem-plparser.10:${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 @@ -30,7 +30,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_PYTHON= yes USE_GNOME= gnomehack libgnomeprintui gnomepanel gnomedesktop \ - gtksourceview libwnck nautiluscdburner pygnome2 metacity + gtksourceview libwnck nautiluscdburner pygnome2 metacity \ + evolutiondataserver GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-metacity CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/py-gnome-desktop/distinfo b/x11-toolkits/py-gnome-desktop/distinfo index 244fc7d5468b..ccb42e48dd79 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.20.0.tar.bz2) = 02b177f488091d27bf0648ec4660d8f7 -SHA256 (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 32e2f5f4d3e79157a83cb7a1c6c409bc2fef75178f9626b2d83a1fd1c2ee4a8d -SIZE (gnome2/gnome-python-desktop-2.20.0.tar.bz2) = 440199 +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 diff --git a/x11-toolkits/py-gnome-desktop/pkg-plist b/x11-toolkits/py-gnome-desktop/pkg-plist index 7fd7db4d9b0a..cdc0b502be3b 100644 --- a/x11-toolkits/py-gnome-desktop/pkg-plist +++ b/x11-toolkits/py-gnome-desktop/pkg-plist @@ -1,6 +1,11 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.py %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/bugbuddy.pyo +%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/__init__.py +%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ebook.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ebook.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ecal.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/evolution/ecal.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.py %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/applet.pyo @@ -71,7 +76,7 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagstyle.html %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourcetagtable.html %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/class-gtksourceview.html -%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourcesview-class-reference.html +%%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/gtksourceview-class-reference.html %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.html %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/index.sgml %%PORTDOCS%%%%DOCSDIR%%/pygtksourceview/pygtksourceview.devhelp @@ -104,6 +109,7 @@ libdata/pkgconfig/gnome-python-desktop-2.0.pc share/pygtk/2.0/defs/_gnomedesktop.defs share/pygtk/2.0/defs/applet.defs share/pygtk/2.0/defs/art.defs +share/pygtk/2.0/defs/ebook.defs share/pygtk/2.0/defs/gnomekeyring.defs share/pygtk/2.0/defs/gtksourceview.defs share/pygtk/2.0/defs/mediaprofiles.defs @@ -126,3 +132,4 @@ share/pygtk/2.0/defs/wnck.defs @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/totem @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomeprint @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomedesktop +@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/evolution diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index 8bb79f1fe771..ff3c9b301074 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.41 2007/07/28 18:23:53 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.43 2008/02/05 13:25:18 kwm Exp $ # PORTNAME= gnome PORTVERSION= 2.19.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits python gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//} @@ -29,7 +29,7 @@ USE_GECKO= firefox seamonkey xulrunner mozilla USE_BZIP2= yes USE_GMAKE= yes USE_PYTHON= yes -USE_GNOME= gnomehack libgtkhtml pygnome2 +USE_GNOME= gnomehack libgtkhtml pygnome2 libgda3 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtkmozembed=${GECKO} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist index 9a0550865cec..e3d9e16306b7 100644 --- a/x11-toolkits/py-gnome-extras/pkg-plist +++ b/x11-toolkits/py-gnome-extras/pkg-plist @@ -1,3 +1,4 @@ +include/pygda-3.0/pygdavalue_conversions.h %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo @@ -5,6 +6,8 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.la %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so +%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la +%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py @@ -21,6 +24,7 @@ %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so libdata/pkgconfig/gnome-python-extras-2.0.pc +libdata/pkgconfig/pygda-3.0.pc %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html %%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html @@ -43,6 +47,10 @@ libdata/pkgconfig/gnome-python-extras-2.0.pc %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py %%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py +share/pygtk/2.0/argtypes/gda-arg-types.py +share/pygtk/2.0/argtypes/gda-arg-types.pyc +share/pygtk/2.0/argtypes/gda-arg-types.pyo +share/pygtk/2.0/defs/gda.defs share/pygtk/2.0/defs/gtkhtml2.defs share/pygtk/2.0/defs/gtkmozembed.defs share/pygtk/2.0/defs/trayicon.defs diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 068d1f92f43d..5bcc4067636d 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-stable/x11-toolkits/py-gnome2/Makefile,v 1.4 2007/11/30 18:56:55 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.49 2008/03/09 21:47:30 mezz Exp $ # PORTNAME= gnome -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.0 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 8734b64c2526..89fe66a34a5f 100644 --- a/x11-toolkits/py-gnome2/distinfo +++ b/x11-toolkits/py-gnome2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-2.20.1.tar.bz2) = f05d67b0f288728e703faa8f74995358 -SHA256 (gnome2/gnome-python-2.20.1.tar.bz2) = ab790703c899168ed609b558e011795efdbe4112f8a04f2d605abbfb2190fd2f -SIZE (gnome2/gnome-python-2.20.1.tar.bz2) = 416845 +MD5 (gnome2/gnome-python-2.22.0.tar.bz2) = ff84c54314adec195149c59365e35a13 +SHA256 (gnome2/gnome-python-2.22.0.tar.bz2) = 13dd15da0b330e32d9798788c0d1a67feaa1ed877698bc9e5bb6acd135cfdf94 +SIZE (gnome2/gnome-python-2.22.0.tar.bz2) = 539423 diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure index 21db26c6c54e..0f477bfeff7f 100644 --- a/x11-toolkits/py-gnome2/files/patch-configure +++ b/x11-toolkits/py-gnome2/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Mon Nov 6 02:40:04 2006 -+++ configure Mon Nov 6 02:40:26 2006 -@@ -19038,7 +19038,7 @@ - +--- configure.orig 2007-12-26 11:53:20.000000000 +0100 ++++ configure 2007-12-26 11:56:25.000000000 +0100 +@@ -19694,7 +19694,7 @@ + save_CC="$CC" save_LIBS="$LIBS" -PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}" +PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION} ${PTHREAD_LIBS}" + CC="$PYTHON_CC" LIBS="$LIBS $PYTHON_EMBED_LIBS" - cat >conftest.$ac_ext <<_ACEOF diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist index 913242687d92..54bab3102807 100644 --- a/x11-toolkits/py-gnome2/pkg-plist +++ b/x11-toolkits/py-gnome2/pkg-plist @@ -57,6 +57,19 @@ libdata/pkgconfig/gnome-python-2.0.pc %%PORTDOCS%%share/examples/py-gnome/vfs/pygvfsmethod/pyfs.py %%PORTDOCS%%share/examples/py-gnome/vfs/shell.py %%PORTDOCS%%share/examples/py-gnome/vfs/sync-xfer.py +share/gtk-doc/html/pygnomevfs/class-gnomevfs-context.html +share/gtk-doc/html/pygnomevfs/class-gnomevfs-directoryhandle.html +share/gtk-doc/html/pygnomevfs/class-gnomevfs-drive.html +share/gtk-doc/html/pygnomevfs/class-gnomevfs-fileinfo.html +share/gtk-doc/html/pygnomevfs/class-gnomevfs-handle.html +share/gtk-doc/html/pygnomevfs/class-gnomevfs-uri.html +share/gtk-doc/html/pygnomevfs/class-gnomevfs-volume.html +share/gtk-doc/html/pygnomevfs/gnomevfs-class-reference.html +share/gtk-doc/html/pygnomevfs/gnomevfs-constants.html +share/gtk-doc/html/pygnomevfs/gnomevfs-functions.html +share/gtk-doc/html/pygnomevfs/index.html +share/gtk-doc/html/pygnomevfs/index.sgml +share/gtk-doc/html/pygnomevfs/pygnomevfs.devhelp share/pygtk/2.0/argtypes/bonobo-arg-types.py share/pygtk/2.0/argtypes/bonobo-arg-types.pyc share/pygtk/2.0/argtypes/bonobo-arg-types.pyo @@ -73,6 +86,9 @@ share/pygtk/2.0/defs/gnome-types.defs share/pygtk/2.0/defs/gnome.defs share/pygtk/2.0/defs/ui.defs @dirrmtry share/pygtk/2.0/argtypes +@dirrm share/gtk-doc/html/pygnomevfs +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc %%PORTDOCS%%@dirrm share/examples/py-gnome/vfs/pygvfsmethod %%PORTDOCS%%@dirrm share/examples/py-gnome/vfs %%PORTDOCS%%@dirrm share/examples/py-gnome/popt diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile index 533c315e3516..ddadb95bf245 100644 --- a/x11-toolkits/py-gtksourceview/Makefile +++ b/x11-toolkits/py-gtksourceview/Makefile @@ -3,11 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.6 2007/09/17 13:46:28 ahze Exp $ +# $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.10 2008/03/10 15:18:35 ahze Exp $ # PORTNAME= gtksourceview -PORTVERSION= 2.0.0 +PORTVERSION= 2.2.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11-toolkits/py-gtksourceview/distinfo b/x11-toolkits/py-gtksourceview/distinfo index ed287d31e15f..f96d4b90fe41 100644 --- a/x11-toolkits/py-gtksourceview/distinfo +++ b/x11-toolkits/py-gtksourceview/distinfo @@ -1,3 +1,3 @@ -MD5 (pygtksourceview-2.0.0.tar.bz2) = a4947108e7a669b67ff0ff157a132728 -SHA256 (pygtksourceview-2.0.0.tar.bz2) = 749075c118a029efc51c58f4a49afbf0ec969a1c1f9ee8c25782ea08b3f9c649 -SIZE (pygtksourceview-2.0.0.tar.bz2) = 255507 +MD5 (pygtksourceview-2.2.0.tar.bz2) = 5dd0a9aa99168f989ed04123a65077e4 +SHA256 (pygtksourceview-2.2.0.tar.bz2) = 457484cf4b6c5c18ba4bcd9d35d5879f3a85e6dbf37f07ba4cfa6c20e6271963 +SIZE (pygtksourceview-2.2.0.tar.bz2) = 267402 diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 0cb85727af92..8c18795ef389 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11-toolkits/vte/Makefile,v 1.9 2007/12/04 17:23:37 mezz Exp $ +# $MCom: ports/x11-toolkits/vte/Makefile,v 1.86 2008/03/10 23:44:02 ahze Exp $ # PORTNAME= vte -PORTVERSION= 0.16.12 +PORTVERSION= 0.16.13 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index 5ae867b6871c..8ef8e670085f 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/vte-0.16.12.tar.bz2) = 9816c35be2ff1b0cf57bd831e1344d1d -SHA256 (gnome2/vte-0.16.12.tar.bz2) = 7f0865c5cf5a433052bc6e67ce90f479df6322e37ebbc6f4462f8d947f18978f -SIZE (gnome2/vte-0.16.12.tar.bz2) = 1113860 +MD5 (gnome2/vte-0.16.13.tar.bz2) = 40480f20f6b7664f3d364e4f2ed27889 +SHA256 (gnome2/vte-0.16.13.tar.bz2) = edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d +SIZE (gnome2/vte-0.16.13.tar.bz2) = 1114585 diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 49328678402d..28669172fa31 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,11 +3,11 @@ # Whom: Garrett Rooney <rooneg@electricjellyfish.net> # # $FreeBSD$ -# $MCom: ports-stable/x11-wm/metacity/Makefile,v 1.1 2007/12/02 03:21:33 mezz Exp $ +# $MCom: ports/x11-wm/metacity/Makefile,v 1.124 2008/03/09 23:56:13 marcus Exp $ # PORTNAME= metacity -PORTVERSION= 2.20.2 +PORTVERSION= 2.22.0 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -24,7 +24,7 @@ USE_XLIB= yes USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack +USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-render CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index fce962ad5ac7..06c7549488cf 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/metacity-2.20.2.tar.bz2) = 3b986030629860674b219fc35c226b1b -SHA256 (gnome2/metacity-2.20.2.tar.bz2) = 69f292f92895bb4f915a0547e44b7682577f9c168aea3638ccfc4bba8bb6aabe -SIZE (gnome2/metacity-2.20.2.tar.bz2) = 2035610 +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 diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure index f38f1ce514c1..bbb9c5e9b0a5 100644 --- a/x11-wm/metacity/files/patch-configure +++ b/x11-wm/metacity/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2007-09-16 11:47:50.000000000 -0400 -+++ configure 2007-09-16 11:48:17.000000000 -0400 -@@ -28087,7 +28087,6 @@ +--- 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" @@ -8,10 +8,10 @@ fi fi ## have_composite -@@ -33175,7 +33174,7 @@ +@@ -31011,7 +31010,7 @@ metacity-$VERSION: " - METACITY_MINOR_VERSION=20 + METACITY_MINOR_VERSION=22 -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_window-props.c b/x11-wm/metacity/files/patch-src_window-props.c deleted file mode 100644 index e32aacf7ffa7..000000000000 --- a/x11-wm/metacity/files/patch-src_window-props.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/window-props.c.orig Wed Dec 14 09:27:03 2005 -+++ src/window-props.c Wed Dec 14 09:28:57 2005 -@@ -20,6 +20,7 @@ - * 02111-1307, USA. - */ - -+#include <sys/param.h> - #include <config.h> - #include "window-props.h" - #include "xprops.h" -@@ -194,6 +195,7 @@ reload_net_wm_user_time (MetaWindow * - } - - #define MAX_TITLE_LENGTH 512 -+#define HOST_NAME_MAX MAXHOSTNAMELEN - - /** - * Called by set_window_title and set_icon_title to set the value of diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index bfd30f331423..0b66d8b5ab3f 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -20,6 +20,7 @@ share/gnome-control-center/keybindings/50-metacity-key.xml share/gnome/wm-properties/metacity.desktop share/locale/am/LC_MESSAGES/metacity.mo share/locale/ar/LC_MESSAGES/metacity.mo +share/locale/as/LC_MESSAGES/metacity.mo share/locale/az/LC_MESSAGES/metacity.mo share/locale/be/LC_MESSAGES/metacity.mo share/locale/be@latin/LC_MESSAGES/metacity.mo @@ -200,19 +201,19 @@ share/themes/Simple/metacity-1/maximized.png share/themes/Simple/metacity-1/metacity-theme-1.xml share/themes/Simple/metacity-1/minimize.png @dirrm share/themes/Simple/metacity-1 -@dirrm share/themes/Simple +@dirrmtry share/themes/Simple @dirrm share/themes/Metabox/metacity-1 -@dirrm share/themes/Metabox +@dirrmtry share/themes/Metabox @dirrm share/themes/Esco/metacity-1 -@dirrm share/themes/Esco +@dirrmtry share/themes/Esco @dirrm share/themes/Crux/metacity-1 -@dirrm share/themes/Crux +@dirrmtry share/themes/Crux @dirrm share/themes/Bright/metacity-1 -@dirrm share/themes/Bright +@dirrmtry share/themes/Bright @dirrm share/themes/Atlanta/metacity-1 -@dirrm share/themes/Atlanta +@dirrmtry share/themes/Atlanta @dirrm share/themes/AgingGorilla/metacity-1 -@dirrm share/themes/AgingGorilla +@dirrmtry share/themes/AgingGorilla @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% @dirrm include/metacity-1/metacity-private @@ -241,3 +242,5 @@ share/themes/Simple/metacity-1/minimize.png @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/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index 8cc82c3b54b4..9c96e26c8e4c 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -3,13 +3,13 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.28 2007/09/18 15:01:12 ahze Exp $ +# $MCom: ports/x11/fast-user-switch-applet/Makefile,v 1.31 2008/03/10 01:00:42 mezz Exp $ +# PORTNAME= fast-user-switch-applet -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= x11 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/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo index 1a39f7b9e781..f4a6dbe0642d 100644 --- a/x11/fast-user-switch-applet/distinfo +++ b/x11/fast-user-switch-applet/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = 1d1fd25b5599f7656e3fa89aa913137c -SHA256 (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = c7123f132aff47978e754d83cd5e449a4e02e215466fc3fc2f3bc81fb5cec5fd -SIZE (gnome2/fast-user-switch-applet-2.20.0.tar.bz2) = 777118 +MD5 (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 540f2567582e77cdd673dde3546b61db +SHA256 (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 8278823d988de6fc0b2d89ec3ad245c464e549d44f032f468fc6f2bdaf02c0d4 +SIZE (gnome2/fast-user-switch-applet-2.22.0.tar.bz2) = 763401 diff --git a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c index cd89dc462d8a..34f8423a3157 100644 --- a/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c +++ b/x11/fast-user-switch-applet/files/patch-src_gdm-queue.c @@ -1,19 +1,10 @@ ---- src/gdm-queue.c.orig 2007-04-09 12:01:03.000000000 -0400 -+++ src/gdm-queue.c 2007-08-08 15:18:12.000000000 -0400 +--- src/gdm-queue.c.orig 2008-02-09 11:06:43.000000000 -0500 ++++ src/gdm-queue.c 2008-02-09 11:06:53.000000000 -0500 @@ -32,6 +32,7 @@ - #include <sys/stat.h> #include <sys/un.h> #include <errno.h> -+#include <signal.h> #include <stdio.h> ++#include <signal.h> #include "gdm-queue.h" -@@ -237,7 +238,7 @@ gboolean gdm_run_queue (void *dummy) - if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0) - strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME); -- if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0) -+ else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0) - strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME); - else - g_error ("Can't find gdm socket!"); diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist index 6c9de7ec4923..ae4718935047 100644 --- a/x11/fast-user-switch-applet/pkg-plist +++ b/x11/fast-user-switch-applet/pkg-plist @@ -60,6 +60,7 @@ share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-text share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet-username.png share/gnome/help/fast-user-switch-applet/sv/figures/fast_user_switch_applet.png share/locale/ar/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/be@latin/LC_MESSAGES/fast-user-switch-applet.mo share/locale/bg/LC_MESSAGES/fast-user-switch-applet.mo share/locale/bn/LC_MESSAGES/fast-user-switch-applet.mo share/locale/bn_IN/LC_MESSAGES/fast-user-switch-applet.mo @@ -99,13 +100,16 @@ share/locale/mr/LC_MESSAGES/fast-user-switch-applet.mo share/locale/nb/LC_MESSAGES/fast-user-switch-applet.mo share/locale/ne/LC_MESSAGES/fast-user-switch-applet.mo share/locale/nl/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/nn/LC_MESSAGES/fast-user-switch-applet.mo share/locale/oc/LC_MESSAGES/fast-user-switch-applet.mo share/locale/or/LC_MESSAGES/fast-user-switch-applet.mo share/locale/pa/LC_MESSAGES/fast-user-switch-applet.mo share/locale/pl/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/ps/LC_MESSAGES/fast-user-switch-applet.mo share/locale/pt/LC_MESSAGES/fast-user-switch-applet.mo share/locale/pt_BR/LC_MESSAGES/fast-user-switch-applet.mo share/locale/ru/LC_MESSAGES/fast-user-switch-applet.mo +share/locale/si/LC_MESSAGES/fast-user-switch-applet.mo share/locale/sk/LC_MESSAGES/fast-user-switch-applet.mo share/locale/sl/LC_MESSAGES/fast-user-switch-applet.mo share/locale/sq/LC_MESSAGES/fast-user-switch-applet.mo @@ -149,6 +153,10 @@ share/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf @dirrm %%DATADIR%% @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/ps/LC_MESSAGES +@dirrmtry share/locale/ps @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @@ -161,3 +169,5 @@ share/omf/fast-user-switch-applet/fast-user-switch-applet-sv.omf @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/gdm/Makefile b/x11/gdm/Makefile index dc38e97a1d69..ba3c67339180 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,38 +3,41 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gdm/Makefile,v 1.6 2007/12/02 01:41:20 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.117 2008/03/22 04:21:52 mezz Exp $ # PORTNAME= gdm -PORTVERSION= 2.20.3 +PORTVERSION= 2.20.4 +PORTREVISION= 4 CATEGORIES= x11 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 COMMENT= GNOME 2 version of xdm display manager BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity -RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity +LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ + ck-connector.0:${PORTSDIR}/sysutils/consolekit +RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ + xrdb:${PORTSDIR}/x11/xrdb USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_XLIB= 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 libgnomeui librsvg2 gnomedocutils \ +USE_GNOME= gnomehack intlhack gnomehier librsvg2 gnomedocutils \ gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" +CONFIGURE_ARGS=--with-console-kit=yes GDMDIR?= ${PREFIX}/etc/gdm PKGMESSAGE= ${WRKDIR}/pkg-message @@ -44,8 +47,7 @@ GNOME_LOCALSTATEDIR= /var MAN1= gdm.1 OPTIONS= IPV6 "Enable IPv6 support" on \ - LOG_LIMIT "Limit ~/.xsession-errors size" on \ - CONSOLEKIT "Enable ConsoleKit support" off + LOG_LIMIT "Limit ~/.xsession-errors size" on .include <bsd.port.pre.mk> @@ -65,13 +67,6 @@ CONFIGURE_ARGS+= --disable-ipv6 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-daemon_slave.c .endif -.if defined(WITH_CONSOLEKIT) -CONFIGURE_ARGS+=--with-console-kit=yes -LIB_DEPENDS+= ck-connector.0:${PORTSDIR}/sysutils/consolekit -.else -CONFIGURE_ARGS+=--with-console-kit=no -.endif - post-patch: .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index bda84c0948a5..d72e4a4bf86a 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.20.3.tar.bz2) = 0074b163986cfe48d3998518084c4d00 -SHA256 (gnome2/gdm-2.20.3.tar.bz2) = 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500 -SIZE (gnome2/gdm-2.20.3.tar.bz2) = 3891861 +MD5 (gnome2/gdm-2.20.4.tar.bz2) = 53a75133cadf1de5fea2be49483b9ce3 +SHA256 (gnome2/gdm-2.20.4.tar.bz2) = adb64d70d9c2bf87a2f67520f40bba29bd76726baee21440f8b24cf3f6336061 +SIZE (gnome2/gdm-2.20.4.tar.bz2) = 3906797 diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index d938b64f4dad..272deae4b017 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,6 +1,6 @@ #!/bin/sh # $FreeBSD$ -# $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.1 2007/12/02 01:41:21 marcus Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.28 2008/03/11 04:21:47 mezz Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias index 8f264dbe4812..3b159499d3a5 100644 --- a/x11/gdm/files/patch-config_locale.alias +++ b/x11/gdm/files/patch-config_locale.alias @@ -1,6 +1,6 @@ ---- config/locale.alias.orig Sat Jun 11 02:01:45 2005 -+++ config/locale.alias Sat Jun 11 03:34:22 2005 -@@ -14,132 +14,57 @@ +--- config/locale.alias.orig 2008-03-10 21:53:02.000000000 -0500 ++++ config/locale.alias 2008-03-10 21:53:37.000000000 -0500 +@@ -14,133 +14,57 @@ # # - George @@ -16,6 +16,7 @@ -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 diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index c0790daa476f..1d9b4eddd8ec 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -238,7 +238,6 @@ share/xsessions/gnome.desktop @dirrm 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 diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index fb058ac8755e..3fd7606c00a4 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-applets/Makefile,v 1.165 2007/09/16 17:19:03 ahze Exp $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.175 2008/03/10 20:03:41 mezz Exp $ # PORTNAME= gnome-applets -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.0 CATEGORIES= x11 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 @@ -19,7 +18,8 @@ COMMENT= Applets components for the GNOME 2 Desktop Environment BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \ ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ - xklavier.11:${PORTSDIR}/x11/libxklavier \ + gweather.0:${PORTSDIR}/net/libgweather \ + xklavier.12:${PORTSDIR}/x11/libxklavier \ gucharmap.6:${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-control-center @@ -44,8 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ OS_SYS="/usr/include" GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \ - gweather.schemas mixer.schemas multiload.schemas \ - stickynotes.schemas + mixer.schemas multiload.schemas stickynotes.schemas OPTIONS= MINI_COMMANDER "Enable mini-commander applet" off @@ -95,8 +94,6 @@ PLIST_SUB+= PYTHON="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ - ${WRKSRC}/libgweather/weather-met.c @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|" == "|" = "|g' .if !defined(USE_PYTHON) diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 18d30dc2af8c..1615f44453d4 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-applets-2.20.1.tar.bz2) = e49402e7323bdd9595dc5cbfdba6ba5b -SHA256 (gnome2/gnome-applets-2.20.1.tar.bz2) = d9ac9c48c007aa1444a60e947bd95359ac3e4998b074d8613082755aa22c87a8 -SIZE (gnome2/gnome-applets-2.20.1.tar.bz2) = 7490737 +MD5 (gnome2/gnome-applets-2.22.0.tar.bz2) = cd31cc9171cc350e7d0074b1a8092fbd +SHA256 (gnome2/gnome-applets-2.22.0.tar.bz2) = d63979ad23873a2ba0f9e36a399c1fedf8311da7f7dd65d4288f5da99e4c150b +SIZE (gnome2/gnome-applets-2.22.0.tar.bz2) = 6923842 diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 15dbb4e41d2a..29aa4df4550c 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,13 +1,6 @@ %%CPUFREQ%%bin/cpufreq-selector %%PYTHON%%bin/invest-chart %%BATTERY%%etc/sound/events/battstat_applet.soundlist -include/libgweather/gweather-gconf.h -include/libgweather/gweather-prefs.h -include/libgweather/weather.h -lib/libgweather.a -lib/libgweather.la -lib/libgweather.so -lib/libgweather.so.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyo @@ -52,7 +45,6 @@ libdata/bonobo/servers/GNOME_Panel_TrashApplet.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server libdata/bonobo/servers/GNOME_StickyNotesApplet.server %%PYTHON%%libdata/bonobo/servers/Invest_Applet.server -libdata/pkgconfig/gweather.pc libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 libexec/charpick_applet2 @@ -111,9 +103,7 @@ share/gnome-2.0/ui/GNOME_StickyNotesApplet.xml %%DATADIR%%/glade/modemlights.glade %%PYTHON%%%%DATADIR%%/glade/prefs-dialog.glade %%DATADIR%%/glade/stickynotes.glade -%%DATADIR%%/glade/trashapplet.glade -%%DATADIR%%/gweather/Locations.xml -%%DATADIR%%/gweather/locations.dtd +%%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 @@ -299,6 +289,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/pa/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/pa/figures/context-menu.png +%%BATTERY%%share/gnome/help/battstat/pt_BR/battstat.xml +%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/battstat-applet-expanded.png +%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/battstat-applet.png +%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/pt_BR/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/sv/battstat.xml %%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png @@ -322,6 +318,11 @@ share/gnome/help/char-palette/bg/figures/charpalette_applet.png share/gnome/help/char-palette/bg/figures/charpalette_chargroup.png share/gnome/help/char-palette/bg/figures/charpick-preferences.png share/gnome/help/char-palette/bg/figures/charpick_characters.png +share/gnome/help/char-palette/ca/char-palette.xml +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/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 @@ -485,6 +486,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/oc/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/pt_BR/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/ru/figures/cpufreq-25.png @@ -627,6 +638,7 @@ share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml share/gnome/help/gswitchit/C/gswitchit.xml share/gnome/help/gswitchit/C/legal.xml +share/gnome/help/gswitchit/ca/gswitchit.xml share/gnome/help/gswitchit/el/gswitchit.xml share/gnome/help/gswitchit/en_GB/gswitchit.xml share/gnome/help/gswitchit/es/gswitchit.xml @@ -756,6 +768,36 @@ share/gnome/help/gweather/pa/figures/stock_weather-snow.png share/gnome/help/gweather/pa/figures/stock_weather-storm.png share/gnome/help/gweather/pa/figures/stock_weather-sunny.png share/gnome/help/gweather/pa/gweather.xml +share/gnome/help/gweather/pt_BR/figures/gweather-details.png +share/gnome/help/gweather/pt_BR/figures/gweather-menu-prefs.png +share/gnome/help/gweather/pt_BR/figures/gweather-prefs-general.png +share/gnome/help/gweather/pt_BR/figures/gweather-prefs-locations.png +share/gnome/help/gweather/pt_BR/figures/gweather_applet.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-cloudy.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-fog.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-night-clear.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-showers.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-snow.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-storm.png +share/gnome/help/gweather/pt_BR/figures/stock_weather-sunny.png +share/gnome/help/gweather/pt_BR/gweather.xml +share/gnome/help/gweather/ru/figures/gweather-details.png +share/gnome/help/gweather/ru/figures/gweather-menu-prefs.png +share/gnome/help/gweather/ru/figures/gweather-prefs-general.png +share/gnome/help/gweather/ru/figures/gweather-prefs-locations.png +share/gnome/help/gweather/ru/figures/gweather_applet.png +share/gnome/help/gweather/ru/figures/stock_weather-cloudy.png +share/gnome/help/gweather/ru/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/ru/figures/stock_weather-fog.png +share/gnome/help/gweather/ru/figures/stock_weather-night-clear.png +share/gnome/help/gweather/ru/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/ru/figures/stock_weather-showers.png +share/gnome/help/gweather/ru/figures/stock_weather-snow.png +share/gnome/help/gweather/ru/figures/stock_weather-storm.png +share/gnome/help/gweather/ru/figures/stock_weather-sunny.png +share/gnome/help/gweather/ru/gweather.xml share/gnome/help/gweather/sv/figures/gweather-details.png share/gnome/help/gweather/sv/figures/gweather-menu-prefs.png share/gnome/help/gweather/sv/figures/gweather-prefs-general.png @@ -805,6 +847,8 @@ share/gnome/help/mixer_applet2/oc/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/oc/mixer_applet2.xml share/gnome/help/mixer_applet2/pa/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/pa/mixer_applet2.xml +share/gnome/help/mixer_applet2/pt_BR/figures/volumecontrol_applet.png +share/gnome/help/mixer_applet2/pt_BR/mixer_applet2.xml share/gnome/help/mixer_applet2/ru/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/ru/mixer_applet2.xml share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png @@ -863,6 +907,18 @@ share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/C/legal.xml share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/ca/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/ca/figures/stickynote-right-menu-new.png +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/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 +share/gnome/help/stickynotes_applet/el/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/el/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/el/stickynotes_applet.xml share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-lock.png share/gnome/help/stickynotes_applet/en_GB/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/en_GB/figures/stickynotes-note-prefs.png @@ -899,6 +955,12 @@ share/gnome/help/stickynotes_applet/pa/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/pa/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/pa/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/pa/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/ru/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/ru/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/ru/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/ru/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/ru/figures/stickynotes_applet.png +share/gnome/help/stickynotes_applet/ru/stickynotes_applet.xml share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-lock.png share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/sv/figures/stickynotes-note-prefs.png @@ -1018,6 +1080,7 @@ share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ka/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/kn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ky/LC_MESSAGES/gnome-applets-2.0.mo @@ -1054,8 +1117,6 @@ share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/uz/LC_MESSAGES/gnome-applets-2.0.mo -share/locale/uz@cyrillic/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo @@ -1081,10 +1142,12 @@ share/omf/accessx-status/accessx-status-uk.omf %%BATTERY%%share/omf/battstat/battstat-ko.omf %%BATTERY%%share/omf/battstat/battstat-oc.omf %%BATTERY%%share/omf/battstat/battstat-pa.omf +%%BATTERY%%share/omf/battstat/battstat-pt_BR.omf %%BATTERY%%share/omf/battstat/battstat-sv.omf %%BATTERY%%share/omf/battstat/battstat-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-en_GB.omf share/omf/char-palette/char-palette-es.omf share/omf/char-palette/char-palette-fr.omf @@ -1112,6 +1175,7 @@ share/omf/char-palette/char-palette-uk.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-fr.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-nl.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-oc.omf +%%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-pt_BR.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-ru.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-sv.omf %%CPUFREQ%%share/omf/cpufreq-applet/cpufreq-applet-uk.omf @@ -1142,6 +1206,7 @@ share/omf/geyes/geyes-ru.omf share/omf/geyes/geyes-sv.omf share/omf/geyes/geyes-uk.omf share/omf/gswitchit/gswitchit-C.omf +share/omf/gswitchit/gswitchit-ca.omf share/omf/gswitchit/gswitchit-el.omf share/omf/gswitchit/gswitchit-en_GB.omf share/omf/gswitchit/gswitchit-es.omf @@ -1158,6 +1223,8 @@ share/omf/gweather/gweather-ko.omf share/omf/gweather/gweather-nl.omf share/omf/gweather/gweather-oc.omf share/omf/gweather/gweather-pa.omf +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 share/omf/mixer_applet2/mixer_applet2-C.omf @@ -1169,6 +1236,7 @@ share/omf/mixer_applet2/mixer_applet2-it.omf share/omf/mixer_applet2/mixer_applet2-ko.omf share/omf/mixer_applet2/mixer_applet2-oc.omf share/omf/mixer_applet2/mixer_applet2-pa.omf +share/omf/mixer_applet2/mixer_applet2-pt_BR.omf share/omf/mixer_applet2/mixer_applet2-ru.omf share/omf/mixer_applet2/mixer_applet2-sv.omf share/omf/mixer_applet2/mixer_applet2-uk.omf @@ -1184,12 +1252,15 @@ share/omf/multiload/multiload-ru.omf 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-el.omf share/omf/stickynotes_applet/stickynotes_applet-en_GB.omf share/omf/stickynotes_applet/stickynotes_applet-es.omf share/omf/stickynotes_applet/stickynotes_applet-fr.omf share/omf/stickynotes_applet/stickynotes_applet-ko.omf share/omf/stickynotes_applet/stickynotes_applet-oc.omf share/omf/stickynotes_applet/stickynotes_applet-pa.omf +share/omf/stickynotes_applet/stickynotes_applet-ru.omf share/omf/stickynotes_applet/stickynotes_applet-sv.omf share/omf/stickynotes_applet/stickynotes_applet-uk.omf share/omf/trashapplet/trashapplet-C.omf @@ -1385,6 +1456,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/stickynotes_applet/uk @dirrm share/gnome/help/stickynotes_applet/sv/figures @dirrm share/gnome/help/stickynotes_applet/sv +@dirrm share/gnome/help/stickynotes_applet/ru/figures +@dirrm share/gnome/help/stickynotes_applet/ru @dirrm share/gnome/help/stickynotes_applet/pa/figures @dirrm share/gnome/help/stickynotes_applet/pa @dirrm share/gnome/help/stickynotes_applet/oc/figures @@ -1397,6 +1470,10 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/stickynotes_applet/es @dirrm share/gnome/help/stickynotes_applet/en_GB/figures @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/ca/figures +@dirrm share/gnome/help/stickynotes_applet/ca @dirrm share/gnome/help/stickynotes_applet/C/figures @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet @@ -1429,6 +1506,8 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/mixer_applet2/sv @dirrm share/gnome/help/mixer_applet2/ru/figures @dirrm share/gnome/help/mixer_applet2/ru +@dirrm share/gnome/help/mixer_applet2/pt_BR/figures +@dirrm share/gnome/help/mixer_applet2/pt_BR @dirrm share/gnome/help/mixer_applet2/pa/figures @dirrm share/gnome/help/mixer_applet2/pa @dirrm share/gnome/help/mixer_applet2/oc/figures @@ -1452,6 +1531,10 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/gweather/uk @dirrm share/gnome/help/gweather/sv/figures @dirrm share/gnome/help/gweather/sv +@dirrm share/gnome/help/gweather/ru/figures +@dirrm share/gnome/help/gweather/ru +@dirrm share/gnome/help/gweather/pt_BR/figures +@dirrm share/gnome/help/gweather/pt_BR @dirrm share/gnome/help/gweather/pa/figures @dirrm share/gnome/help/gweather/pa @dirrm share/gnome/help/gweather/oc/figures @@ -1477,6 +1560,7 @@ share/xmodmap/xmodmap.yu @dirrm share/gnome/help/gswitchit/es @dirrm share/gnome/help/gswitchit/en_GB @dirrm share/gnome/help/gswitchit/el +@dirrm share/gnome/help/gswitchit/ca @dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit @dirrm share/gnome/help/geyes/uk/figures @@ -1539,6 +1623,8 @@ share/xmodmap/xmodmap.yu %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ru/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/ru +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/pt_BR/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/pt_BR %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/oc %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures @@ -1595,6 +1681,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/ca/figures +@dirrm share/gnome/help/char-palette/ca @dirrm share/gnome/help/char-palette/bg/figures @dirrm share/gnome/help/char-palette/bg @dirrm share/gnome/help/char-palette/C/figures @@ -1604,6 +1692,8 @@ share/xmodmap/xmodmap.yu %%BATTERY%%@dirrm share/gnome/help/battstat/uk %%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures %%BATTERY%%@dirrm share/gnome/help/battstat/sv +%%BATTERY%%@dirrm share/gnome/help/battstat/pt_BR/figures +%%BATTERY%%@dirrm share/gnome/help/battstat/pt_BR %%BATTERY%%@dirrm share/gnome/help/battstat/pa/figures %%BATTERY%%@dirrm share/gnome/help/battstat/pa %%BATTERY%%@dirrm share/gnome/help/battstat/oc/figures @@ -1645,7 +1735,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%%/gweather @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%%/geyes/Tango @dirrm %%DATADIR%%/geyes/Horrid @@ -1657,13 +1746,10 @@ share/xmodmap/xmodmap.yu @dirrm %%DATADIR%% %%COMMANDER%%@dirrmtry libexec/gnome-applets %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest -@dirrm include/libgweather @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/si/LC_MESSAGES diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 3fc5466064ba..2b5d34481764 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-stable/x11/gnome-desktop/Makefile,v 1.1 2007/12/02 00:19:50 marcus Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.138 2008/03/11 00:00:35 ahze Exp $ # PORTNAME= gnome-desktop -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 PORTREVISION?= 0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -21,14 +21,16 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -USE_XPM= yes +RUN_DEPENDS= ${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2 + +USE_XORG= xpm USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ ltverhack referencehack GNOME_DESKTOP_VERSION=2 USE_GETTEXT= yes USE_GMAKE= yes USE_BISON= build -USE_XLIB= yes +USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index a708127bc4c4..e0fb2f5fdcf5 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-desktop-2.20.3.tar.bz2) = d59ddca5e9bc4e4d1717538ceae57501 -SHA256 (gnome2/gnome-desktop-2.20.3.tar.bz2) = b793ce87b99ba2f9b0eb48a4646128f752a1de2e7c4cd94da9b5e9fd6dcbc36a -SIZE (gnome2/gnome-desktop-2.20.3.tar.bz2) = 1362861 +MD5 (gnome2/gnome-desktop-2.22.0.tar.bz2) = 452d4ee91b3c54aac4282f3f1e3b68f0 +SHA256 (gnome2/gnome-desktop-2.22.0.tar.bz2) = 09b96d473e941fdc51773ab296f0f2fb8fe7694c580a9487effac4eb18c964af +SIZE (gnome2/gnome-desktop-2.22.0.tar.bz2) = 1386857 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index ee615541cc20..fa73b6407ae1 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -1,5 +1,6 @@ bin/gnome-about 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 lib/libgnome-desktop-2.a @@ -83,6 +84,7 @@ share/locale/et/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/fur/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo @@ -298,6 +300,7 @@ share/pixmaps/vnterm.xpm @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome @dirrm include/gnome-desktop-2.0 +@dirrmtry share/applications @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -336,10 +339,11 @@ share/pixmaps/vnterm.xpm @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 @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index ec1145f5842a..cce2627157a7 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-menus/Makefile,v 1.5 2007/12/01 20:00:52 marcus Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.74 2008/03/10 23:44:52 ahze Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,21 +18,14 @@ COMMENT= Implementation of the FreeDesktop Desktop Menu Spec USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 ltverhack +USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack USE_AUTOTOOLS= libtool:15 USE_PYTHON= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.pre.mk> - -.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM) -USE_FAM= yes -.endif - post-patch: @${REINPLACE_CMD} -e 's|applications.menu||' \ ${WRKSRC}/layout/Makefile.in @@ -52,4 +45,4 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/KDE.directory \ ${PREFIX}/share/desktop-directories -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 8abb1433497b..7cc995ff1c3b 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-menus-2.20.3.tar.bz2) = b8ab05f5edfdc3e6a46662a504934657 -SHA256 (gnome2/gnome-menus-2.20.3.tar.bz2) = 2ce7a6aabed338ca3f65685e7e46149cdacc80fab0a8701c2d827fcb950a9897 -SIZE (gnome2/gnome-menus-2.20.3.tar.bz2) = 446966 +MD5 (gnome2/gnome-menus-2.22.0.tar.bz2) = b504e4ea92fcf5b1c2817d682ac5f61c +SHA256 (gnome2/gnome-menus-2.22.0.tar.bz2) = 3b461efd7b4831b5ca7105d52295f7b3417690cf4701532acf9481082d55db7e +SIZE (gnome2/gnome-menus-2.22.0.tar.bz2) = 482226 diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 07e67ea4e8ad..1541e93ecb50 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -1,4 +1,3 @@ -bin/gnome-menu-spec-test etc/xdg/menus/gnome-applications.menu etc/xdg/menus/preferences.menu etc/xdg/menus/settings.menu @@ -59,6 +58,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo share/locale/fa/LC_MESSAGES/gnome-menus.mo share/locale/fi/LC_MESSAGES/gnome-menus.mo share/locale/fr/LC_MESSAGES/gnome-menus.mo +share/locale/fur/LC_MESSAGES/gnome-menus.mo share/locale/ga/LC_MESSAGES/gnome-menus.mo share/locale/gl/LC_MESSAGES/gnome-menus.mo share/locale/gn/LC_MESSAGES/gnome-menus.mo @@ -68,6 +68,7 @@ share/locale/hi/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/it/LC_MESSAGES/gnome-menus.mo share/locale/ja/LC_MESSAGES/gnome-menus.mo share/locale/ka/LC_MESSAGES/gnome-menus.mo @@ -77,6 +78,7 @@ share/locale/ku/LC_MESSAGES/gnome-menus.mo share/locale/ky/LC_MESSAGES/gnome-menus.mo share/locale/lt/LC_MESSAGES/gnome-menus.mo share/locale/lv/LC_MESSAGES/gnome-menus.mo +share/locale/mai/LC_MESSAGES/gnome-menus.mo share/locale/mg/LC_MESSAGES/gnome-menus.mo share/locale/mk/LC_MESSAGES/gnome-menus.mo share/locale/ml/LC_MESSAGES/gnome-menus.mo @@ -139,14 +141,20 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.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/ky/LC_MESSAGES @dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/io/LC_MESSAGES +@dirrmtry share/locale/io @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy @dirrmtry share/locale/gn/LC_MESSAGES @dirrmtry share/locale/gn +@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/gnome-panel/Makefile b/x11/gnome-panel/Makefile index f4b9b720b80e..49487cf3f0a7 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,15 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-panel/Makefile,v 1.1 2007/12/02 00:54:55 marcus Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.177 2008/03/23 06:13:12 marcus Exp $ # PORTNAME= gnome-panel -PORTVERSION= 2.20.3 -PORTREVISION?= 0 +PORTVERSION= 2.22.0 +PORTREVISION?= 2 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,19 +20,24 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) +LIB_DEPENDS= gweather.0:${PORTSDIR}/net/libgweather \ + polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome + USE_GETTEXT= yes USE_XLIB= yes INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \ libwnck gnomemenus gnomedocutils ltverhack referencehack WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ - --with-kde-docdir=${LOCALBASE}/share/doc + --with-kde-docdir=${LOCALBASE}/share/doc \ + --disable-network-manager \ + --enable-polkit CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -64,6 +68,8 @@ post-patch: @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ 's|"applications.menu"|"gnome-applications.menu"|' + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ + ${WRKSRC}/applets/clock/gweather-xml.c .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) .for po in da.po it.po zh_CN.po zh_TW.po @@ -71,6 +77,11 @@ post-patch: .endfor .endif +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 761f01205b24..57f37c4c59d5 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-panel-2.20.3.tar.bz2) = 0ddf04cea0859570216319d6f1f8c4d8 -SHA256 (gnome2/gnome-panel-2.20.3.tar.bz2) = fa76158e659ab5d36f016ba9a5117c4d03680e7c94aa174fdcc03200fe2444c9 -SIZE (gnome2/gnome-panel-2.20.3.tar.bz2) = 2829469 +MD5 (gnome2/gnome-panel-2.22.0.tar.bz2) = fe10c920c1f182a2bd5dba98863c786c +SHA256 (gnome2/gnome-panel-2.22.0.tar.bz2) = 8b2152b35e3d82a640c383b29e99a322595dca23269450ad8d3182bdd94b308a +SIZE (gnome2/gnome-panel-2.22.0.tar.bz2) = 3267787 diff --git a/x11/gnome-panel/files/iso3166.tab b/x11/gnome-panel/files/iso3166.tab new file mode 100644 index 000000000000..22ff82083588 --- /dev/null +++ b/x11/gnome-panel/files/iso3166.tab @@ -0,0 +1,268 @@ +# $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-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c new file mode 100644 index 000000000000..1bb485f32586 --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_clock-location.c @@ -0,0 +1,59 @@ +--- applets/clock/clock-location.c.orig 2008-03-22 21:14:45.000000000 -0400 ++++ applets/clock/clock-location.c 2008-03-23 02:11:34.000000000 -0400 +@@ -28,6 +28,8 @@ + #include "set-timezone.h" + #include "gweather-xml.h" + ++#define daylight 1 ++ + G_DEFINE_TYPE (ClockLocation, clock_location, G_TYPE_OBJECT) + + typedef struct { +@@ -62,6 +64,7 @@ static void clock_location_unset_tz (Clo + static void setup_weather_updates (ClockLocation *loc); + static void add_to_network_monitor (ClockLocation *loc); + static void remove_from_network_monitor (ClockLocation *loc); ++static gchar *clock_location_guess_zone (ClockZoneTable *zones); + + #define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_LOCATION_TYPE, ClockLocationPrivate)) + +@@ -271,7 +274,6 @@ parse_etc_sysconfig_clock (void) + } + } + } +- + out: + if (lines) + g_strfreev (lines); +@@ -298,7 +300,11 @@ zone_from_etc_sysconfig_clock (void) + + parse_etc_sysconfig_clock (); + ++#ifndef __FreeBSD__ + file = g_file_new_for_path ("/etc/sysconfig/clock"); ++#else ++ file = g_file_new_for_path ("/etc/localtime"); ++#endif + + monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, + NULL, NULL); +@@ -632,10 +638,17 @@ gboolean + clock_location_is_current (ClockLocation *loc) + { + ClockLocationPrivate *priv = PRIVATE (loc); +- const char *zone; ++ ClockZoneTable *zones; ++ char *zone; + +- if ((zone = zone_from_etc_sysconfig_clock ())) ++ zones = clock_zonetable_new (SYSTEM_ZONEINFODIR); ++ ++ if ((zone = clock_location_guess_zone (zones))) { ++ g_object_unref (zones); + return strcmp (zone, priv->timezone) == 0; ++ } ++ ++ g_object_unref (zones); + + return clock_location_get_offset (loc) == 0; + } diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c new file mode 100644 index 000000000000..0df281fd941d --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c @@ -0,0 +1,14 @@ +--- applets/clock/clock-zonetable.c.orig 2008-01-20 13:32:13.000000000 -0500 ++++ applets/clock/clock-zonetable.c 2008-01-20 13:35:34.000000000 -0500 +@@ -124,7 +124,10 @@ clock_zonetable_new (gchar *zoneinfodir) + priv = PRIVATE (this); + + priv->zonetab = g_build_filename (zoneinfodir, "zone.tab", NULL); +- priv->iso3166 = g_build_filename (zoneinfodir, "iso3166.tab", NULL); ++ /*priv->iso3166 = g_build_filename (zoneinfodir, "iso3166.tab", NULL);*/ ++ /* FreeBSD doesn't include iso3166.tab, so we install it especially ++ * for this clock. */ ++ priv->iso3166 = g_build_filename (DATADIR, "gnome-panel", "iso3166.tab", NULL); + + #ifdef CLOCK_TEXTDOMAIN + /* this is used when clock is embedded in the gnome-panel diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c new file mode 100644 index 000000000000..5acc58b408c6 --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -0,0 +1,11 @@ +--- applets/clock/clock.c.orig 2008-02-26 14:17:49.000000000 +0100 ++++ applets/clock/clock.c 2008-02-26 18:01:17.000000000 +0100 +@@ -84,6 +84,8 @@ + + #define FALLBACK_CONFIG_TOOL "time-admin" + ++#define daylight 1 ++ + static const char *clock_config_tools [] = { + CLOCK_TIME_UTILITY, + FALLBACK_CONFIG_TOOL diff --git a/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c new file mode 100644 index 000000000000..7ae87fdd360f --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c @@ -0,0 +1,11 @@ +--- applets/clock/gweather-xml.c.orig 2008-01-23 00:51:33.000000000 -0500 ++++ applets/clock/gweather-xml.c 2008-01-23 00:52:35.000000000 -0500 +@@ -359,7 +359,7 @@ gweather_xml_load_locations( GtkTreeView + #ifdef GWEATHER_XML_LOCATION + xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml"); + #else +- xml = xmlNewTextReaderFilename ("/usr/share/gnome-applets/gweather/Locations.xml"); ++ xml = xmlNewTextReaderFilename ("/usr/local/share/libgweather/Locations.xml"); + #endif + if( xml == NULL ) + goto error_out; diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po index 45d98a92c0be..7de508a0eba4 100644 --- a/x11/gnome-panel/files/patch-po_ko.po +++ b/x11/gnome-panel/files/patch-po_ko.po @@ -1,38 +1,29 @@ ---- po/ko.po.orig Sun Jul 8 18:23:19 2007 -+++ po/ko.po Sun Jul 8 18:26:46 2007 -@@ -88,7 +88,7 @@ +--- po/ko.po.orig 2008-02-26 18:15:58.000000000 +0100 ++++ po/ko.po 2008-02-26 18:16:31.000000000 +0100 +@@ -95,7 +95,7 @@ msgstr "%H:%M" #. * possible. - #: ../applets/clock/calendar-window.c:233 + #: ../applets/clock/calendar-window.c:250 msgid "%b %d" -msgstr "%b %e일" +msgstr "%B %e일" - #: ../applets/clock/calendar-window.c:741 - msgid "_Tasks" -@@ -129,7 +129,7 @@ + #: ../applets/clock/calendar-window.c:765 + msgid "Tasks" +@@ -146,7 +146,7 @@ msgstr "%H:%M:%S" #. - #: ../applets/clock/clock.c:367 + #: ../applets/clock/clock.c:443 msgid "%a %b %e" -msgstr "%b %e일 (%a)" +msgstr "%B %e일 (%a)" #. translators: reverse the order of these arguments #. * if the time should come before the -@@ -156,7 +156,7 @@ - #. Show date in tooltip - #: ../applets/clock/clock.c:520 - msgid "%A %B %d" --msgstr "%b %e일 %A" -+msgstr "%B %e일 %A" +@@ -207,7 +207,7 @@ msgstr "%p %I:%M" - #: ../applets/clock/clock.c:534 - msgid "Click to hide your appointments and tasks" -@@ -188,7 +188,7 @@ - - #: ../applets/clock/clock.c:1073 + #: ../applets/clock/clock.c:1590 msgid "%A, %B %d %Y" -msgstr "%Y년 %b %e일 %A" +msgstr "%Y년 %B %e일 %A" - #: ../applets/clock/clock.c:1148 + #: ../applets/clock/clock.c:1665 #, c-format diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 1613aea9ffd5..776e004791d3 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -1,6 +1,7 @@ bin/gnome-desktop-item-edit bin/gnome-panel bin/panel-test-applets +etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true etc/gconf/schemas/panel-default-setup.entries @@ -22,9 +23,12 @@ libdata/bonobo/servers/GNOME_Wncklet_Factory.server libdata/pkgconfig/libpanelapplet-2.0.pc libexec/clock-applet libexec/fish-applet-2 +libexec/gnome-clock-applet-mechanism libexec/notification-area-applet libexec/wnck-applet +share/PolicyKit/policy/gnome-clock-applet-mechanism.policy share/applications/gnome-panel.desktop +share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service share/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome-2.0/ui/GNOME_FishApplet.xml share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml @@ -33,6 +37,7 @@ share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml share/gnome-2.0/ui/GNOME_WindowListApplet.xml share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +%%DATADIR%%/glade/clock.glade %%DATADIR%%/glade/fish.glade %%DATADIR%%/glade/panel-properties-dialog.glade %%DATADIR%%/glade/panel-run-dialog.glade @@ -40,6 +45,18 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml %%DATADIR%%/glade/timezone.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 +%%DATADIR%%/pixmaps/clock-face-small-evening.svg +%%DATADIR%%/pixmaps/clock-face-small-morning.svg +%%DATADIR%%/pixmaps/clock-face-small-night.svg +%%DATADIR%%/pixmaps/clock-face-small.svg +%%DATADIR%%/pixmaps/clock-map-location-current.png +%%DATADIR%%/pixmaps/clock-map-location-hilight.png +%%DATADIR%%/pixmaps/clock-map-location-marker.png +%%DATADIR%%/pixmaps/clock-map.png %%DATADIR%%/pixmaps/fishanim.png %%DATADIR%%/pixmaps/footguy.png %%DATADIR%%/pixmaps/gnome-gegl2-2.png @@ -153,6 +170,7 @@ 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/ca/window-list.xml +share/gnome/help/window-list/da/window-list.xml share/gnome/help/window-list/de/figures/window_list_applet.png share/gnome/help/window-list/de/figures/window_list_group.png share/gnome/help/window-list/de/figures/window_list_group_applet.png @@ -180,6 +198,7 @@ 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/ca/workspace-switcher.xml +share/gnome/help/workspace-switcher/da/workspace-switcher.xml share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/de/legal.xml @@ -251,6 +270,7 @@ share/icons/hicolor/32x32/apps/gnome-panel-window-list.png share/icons/hicolor/32x32/apps/gnome-panel-window-menu.png share/icons/hicolor/32x32/apps/gnome-panel-workspace-switcher.png share/icons/hicolor/32x32/apps/gnome-panel.png +share/icons/hicolor/48x48/apps/gnome-panel.png share/icons/hicolor/scalable/apps/gnome-panel-clock.svg share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg share/icons/hicolor/scalable/apps/gnome-panel-fish.svg @@ -266,6 +286,7 @@ share/idl/gnome-panel-2.0/GNOME_Panel.idl 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/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 @@ -325,6 +346,7 @@ share/locale/oc/LC_MESSAGES/gnome-panel-2.0.mo share/locale/or/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ps/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo @@ -395,6 +417,7 @@ 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-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 @@ -409,6 +432,7 @@ 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-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 @@ -448,6 +472,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @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/C @dirrm share/gnome/help/workspace-switcher @@ -468,6 +493,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @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/C @dirrm share/gnome/help/window-list @@ -543,6 +569,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrm include/panel-2.0 @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @@ -562,6 +589,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @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 @@ -584,4 +613,5 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 2f6d1e58a864..6e335094dedd 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,19 +3,19 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.80 2007/09/18 16:46:42 marcus Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.83 2008/03/11 03:13:07 mezz Exp $ # PORTNAME= gnome-screensaver -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= x11 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 COMMENT= GNOME screen saver and locker +LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks USE_BZIP2= yes @@ -23,14 +23,17 @@ USE_XLIB= yes USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus \ - libgnomekbd +USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" + GCONF_SCHEMAS= gnome-screensaver.schemas +MAN1= gnome-screensaver-command.1 gnome-screensaver-preferences.1 \ + gnome-screensaver.1 + PLIST= ${WRKDIR}/pkg-plist diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index e83e9955e264..8ebc79dc6df6 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = d166a3ebf69289331b2ebcf5c0187fd9 -SHA256 (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9 -SIZE (gnome2/gnome-screensaver-2.20.0.tar.bz2) = 2013842 +MD5 (gnome2/gnome-screensaver-2.22.0.tar.bz2) = 3f307d340d511c97192a9dc9b83a69f5 +SHA256 (gnome2/gnome-screensaver-2.22.0.tar.bz2) = e6d66ad1092babe5b9a1ded2a50464e21206fa42a922ea1de0c688e764e05bfb +SIZE (gnome2/gnome-screensaver-2.22.0.tar.bz2) = 2038929 diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist index fd8810021e01..7d0f70fd54b7 100644 --- a/x11/gnome-screensaver/pkg-plist +++ b/x11/gnome-screensaver/pkg-plist @@ -17,6 +17,8 @@ share/desktop-directories/gnome-screensaver.directory %%DATADIR%%/gnome-screensaver-preferences.glade %%DATADIR%%/lock-dialog-default.glade share/locale/ar/LC_MESSAGES/gnome-screensaver.mo +share/locale/as/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 share/locale/bn/LC_MESSAGES/gnome-screensaver.mo @@ -36,6 +38,7 @@ share/locale/eu/LC_MESSAGES/gnome-screensaver.mo share/locale/fa/LC_MESSAGES/gnome-screensaver.mo share/locale/fi/LC_MESSAGES/gnome-screensaver.mo share/locale/fr/LC_MESSAGES/gnome-screensaver.mo +share/locale/ga/LC_MESSAGES/gnome-screensaver.mo share/locale/gl/LC_MESSAGES/gnome-screensaver.mo share/locale/gu/LC_MESSAGES/gnome-screensaver.mo share/locale/he/LC_MESSAGES/gnome-screensaver.mo @@ -53,9 +56,11 @@ share/locale/mg/LC_MESSAGES/gnome-screensaver.mo share/locale/mk/LC_MESSAGES/gnome-screensaver.mo share/locale/ml/LC_MESSAGES/gnome-screensaver.mo share/locale/mn/LC_MESSAGES/gnome-screensaver.mo +share/locale/mr/LC_MESSAGES/gnome-screensaver.mo share/locale/nb/LC_MESSAGES/gnome-screensaver.mo share/locale/ne/LC_MESSAGES/gnome-screensaver.mo share/locale/nl/LC_MESSAGES/gnome-screensaver.mo +share/locale/nn/LC_MESSAGES/gnome-screensaver.mo share/locale/oc/LC_MESSAGES/gnome-screensaver.mo share/locale/or/LC_MESSAGES/gnome-screensaver.mo share/locale/pa/LC_MESSAGES/gnome-screensaver.mo @@ -91,8 +96,10 @@ share/pixmaps/backgrounds/cosmos/sombrero.jpg share/pixmaps/backgrounds/cosmos/whirlpool.jpg share/pixmaps/gnome-logo-white.svg @dirrm share/pixmaps/backgrounds/cosmos -@dirrm share/pixmaps/backgrounds +@dirrmtry share/pixmaps/backgrounds @dirrm %%DATADIR%% +@dirrm share/applications/screensavers +@dirrmtry share/applications @dirrm libexec/gnome-screensaver @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @@ -102,6 +109,8 @@ share/pixmaps/gnome-logo-white.svg @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/mg/LC_MESSAGES @dirrmtry share/locale/mg @dirrmtry share/locale/ku/LC_MESSAGES @@ -112,4 +121,5 @@ 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/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index c8e6b86efd94..56e06481b759 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-stable/x11/gnome-session/Makefile,v 1.1 2007/12/01 20:11:32 marcus Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.141 2008/03/10 23:48:33 ahze Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.20.3 +PORTVERSION= 2.22.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://www.marcuscom.com/downloads/:local @@ -20,23 +20,23 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gnome@FreeBSD.org COMMENT= Session component for the GNOME 2 desktop -BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center +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 -RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center \ + gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \ + notify.1:${PORTSDIR}/devel/libnotify +RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ ${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo INSTALLS_ICONS= yes USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop +USE_XORG= xau xrandr +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - ESD_SERVER="${LOCALBASE}/bin/esd" + LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index b4863f6af36a..c77a3cf49892 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.20.3.tar.bz2) = f9d80e12c8fd79efa9786f617ba18bc7 -SHA256 (gnome2/gnome-session-2.20.3.tar.bz2) = eff4f7a1eb15a9a92317de9c07f9530ce1110c9ac84fc777f97a59316b9f2ee1 -SIZE (gnome2/gnome-session-2.20.3.tar.bz2) = 751906 +MD5 (gnome2/gnome-session-2.22.0.tar.bz2) = 5f9531565c5ec08104c3518c72c79f42 +SHA256 (gnome2/gnome-session-2.22.0.tar.bz2) = ae426a2f356012aea1086dca89e0551d6970c404a56e31b814a53e24eab19939 +SIZE (gnome2/gnome-session-2.22.0.tar.bz2) = 778868 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 index 8fcdd3e2c5e7..82e1ed49f216 100644 --- a/x11/gnome-session/files/patch-data_Makefile.in +++ b/x11/gnome-session/files/patch-data_Makefile.in @@ -1,9 +1,18 @@ ---- data/Makefile.in.orig Sun Jan 28 20:39:50 2007 -+++ data/Makefile.in Sun Jan 28 20:41:03 2007 -@@ -271,7 +271,7 @@ EXTRA_DIST = \ - session-properties.desktop.in +--- 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 - CLEANFILES = default.session gnome-session.schemas session-properties.desktop -all: all-recursive +all: all-recursive default.session diff --git a/x11/gnome-session/files/patch-disable_debug b/x11/gnome-session/files/patch-disable_debug new file mode 100644 index 000000000000..778d72c9e67f --- /dev/null +++ b/x11/gnome-session/files/patch-disable_debug @@ -0,0 +1,13 @@ +--- 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/pkg-plist b/x11/gnome-session/pkg-plist index d90630fed19f..9c51b437c0e5 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -36,6 +36,7 @@ share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo +share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo @@ -116,6 +117,8 @@ 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 +@dirrmtry share/xsessions +@dirrmtry share/applications @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -142,10 +145,11 @@ share/pixmaps/splash/tremulant-brushed-metal-2.12.png @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 @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 2f9e302b425a..f837a8ee8224 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,14 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome-terminal/Makefile,v 1.1 2007/12/02 01:46:28 marcus Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.101 2008/03/11 02:42:58 mezz Exp $ # PORTNAME= gnome-terminal -PORTVERSION= 2.18.4 +PORTVERSION= 2.22.0 CATEGORIES= x11 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/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index b9f731480081..2a408d023865 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-terminal-2.18.4.tar.bz2) = e4429d66d0d2ede8e14756cfbc15d30a -SHA256 (gnome2/gnome-terminal-2.18.4.tar.bz2) = 1a6b1cbf81ed1a21b9ae628533f60511aa9495e02dfed6583df17db30d8d2282 -SIZE (gnome2/gnome-terminal-2.18.4.tar.bz2) = 2072290 +MD5 (gnome2/gnome-terminal-2.22.0.tar.bz2) = e91f000b8157c668940a297d7cfbc9f8 +SHA256 (gnome2/gnome-terminal-2.22.0.tar.bz2) = f157938dbfe0babe8545bcdb7b1fa51403bbf17904d56f3242a528d55190b56e +SIZE (gnome2/gnome-terminal-2.22.0.tar.bz2) = 1819541 diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index f69d5bcef194..491f827e3058 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -8,7 +8,6 @@ share/gnome/help/gnome-terminal/C/gnome-terminal.xml share/gnome/help/gnome-terminal/C/legal.xml share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/bg/figures/terminal_window.png share/gnome/help/gnome-terminal/bg/gnome-terminal.xml share/gnome/help/gnome-terminal/bg/legal.xml share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png @@ -28,7 +27,6 @@ share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/it/gnome-terminal.xml share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/ja/figures/terminal_window.png share/gnome/help/gnome-terminal/ja/gnome-terminal.xml share/gnome/help/gnome-terminal/ja/legal.xml share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png @@ -37,9 +35,11 @@ share/gnome/help/gnome-terminal/ko/gnome-terminal.xml share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/oc/gnome-terminal.xml +share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/pt_BR/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/pt_BR/gnome-terminal.xml share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/ro/figures/terminal_window.png share/gnome/help/gnome-terminal/ro/gnome-terminal.xml share/gnome/help/gnome-terminal/ro/legal.xml share/gnome/help/gnome-terminal/ru/figures/gnome-terminal-default.png @@ -53,12 +53,10 @@ share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/uk/gnome-terminal.xml share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml share/gnome/help/gnome-terminal/zh_CN/legal.xml share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png -share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml share/gnome/help/gnome-terminal/zh_TW/legal.xml share/locale/am/LC_MESSAGES/gnome-terminal.mo @@ -86,6 +84,7 @@ share/locale/eu/LC_MESSAGES/gnome-terminal.mo share/locale/fa/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo +share/locale/fur/LC_MESSAGES/gnome-terminal.mo share/locale/ga/LC_MESSAGES/gnome-terminal.mo share/locale/gl/LC_MESSAGES/gnome-terminal.mo share/locale/gu/LC_MESSAGES/gnome-terminal.mo @@ -148,6 +147,7 @@ share/omf/gnome-terminal/gnome-terminal-it.omf share/omf/gnome-terminal/gnome-terminal-ja.omf share/omf/gnome-terminal/gnome-terminal-ko.omf share/omf/gnome-terminal/gnome-terminal-oc.omf +share/omf/gnome-terminal/gnome-terminal-pt_BR.omf share/omf/gnome-terminal/gnome-terminal-ro.omf share/omf/gnome-terminal/gnome-terminal-ru.omf share/omf/gnome-terminal/gnome-terminal-sv.omf @@ -168,6 +168,8 @@ share/pixmaps/gnome-terminal.png @dirrm share/gnome/help/gnome-terminal/ru @dirrm share/gnome/help/gnome-terminal/ro/figures @dirrm share/gnome/help/gnome-terminal/ro +@dirrm share/gnome/help/gnome-terminal/pt_BR/figures +@dirrm share/gnome/help/gnome-terminal/pt_BR @dirrm share/gnome/help/gnome-terminal/oc/figures @dirrm share/gnome/help/gnome-terminal/oc @dirrm share/gnome/help/gnome-terminal/ko/figures @@ -191,6 +193,7 @@ share/pixmaps/gnome-terminal.png @dirrm share/gnome/help/gnome-terminal @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% +@dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -209,6 +212,8 @@ share/pixmaps/gnome-terminal.png @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 @@ -217,4 +222,3 @@ share/pixmaps/gnome-terminal.png @dirrmtry share/locale/be@latin @dirrmtry share/locale/as/LC_MESSAGES @dirrmtry share/locale/as -@dirrmtry share/applications diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index b9fa5664607c..5fa2ef6fc306 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.79 2007/10/18 23:45:20 marcus Exp $ +# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.82 2008/03/12 21:19:04 marcus Exp $ # PORTREVISION= 0 @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -power-tools COMMENT= The 'Geektoys' for the GNOME 2 power user -RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.20/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.22/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 \ @@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/epiphany/2.20/extensions/libgesturesextension.so:$ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ serpentine:${PORTSDIR}/sysutils/serpentine \ devilspie:${PORTSDIR}/x11-wm/devilspie \ - ${LOCALBASE}/lib/nautilus/extensions-1.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \ + ${LOCALBASE}/lib/nautilus/extensions-2.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \ gtweakui-menus:${PORTSDIR}/deskutils/gtweakui \ gnome-art:${PORTSDIR}/x11-themes/gnome-art \ brightside:${PORTSDIR}/x11/brightside \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 69ee8d17f6b9..e19af12aeafb 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/x11/gnome2/Makefile,v 1.5 2007/12/04 17:28:14 mezz Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.236 2008/03/15 18:40:17 marcus Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.20.3 -PORTREVISION?= 0 +PORTVERSION= 2.22.0 +PORTREVISION?= 1 CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -48,25 +48,29 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple network-admin:${PORTSDIR}/sysutils/gnome-system-tools \ gnome-nettool:${PORTSDIR}/net/gnome-nettool \ vino-session:${PORTSDIR}/net/vino \ - exchange-connector-setup-2.12:${PORTSDIR}/mail/evolution-exchange \ + exchange-connector-setup-2.22:${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 \ - gnome-keyring-manager:${PORTSDIR}/security/gnome-keyring-manager \ ${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \ 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 \ - gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \ + ${LOCALBASE}/libexec/gnome-volume-manager:${PORTSDIR}/sysutils/gnome-volume-manager \ orca:${PORTSDIR}/accessibility/orca \ gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon \ - seahorse:${PORTSDIR}/security/seahorse + 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 NO_BUILD= yes diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index cc476664cc1b..9b755c3a2989 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.110 2007/10/17 21:36:13 mezz Exp $ +# $MCom: ports/x11/libgnome/Makefile,v 1.115 2008/03/10 15:39:00 ahze Exp $ # PORTNAME= libgnome -PORTVERSION= 2.20.1.1 -PORTREVISION?= 1 +PORTVERSION= 2.22.0 +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) @@ -25,12 +25,11 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian USE_GETTEXT= yes -USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack esound \ - gnomevfs2 libxslt ltverhack referencehack +USE_GNOME= gnomeprefix gnomehack intlhack esound libbonobo \ + gnomevfs2 ltverhack referencehack USE_BISON= build -USE_XLIB= yes +USE_XORG= xpm USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -42,19 +41,21 @@ MAN7= gnome-options.7 GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \ desktop_gnome_accessibility_startup.schemas \ + desktop_gnome_applications_at_mobility.schemas \ + desktop_gnome_applications_at_visual.schemas \ desktop_gnome_applications_browser.schemas \ - desktop_gnome_applications_help_viewer.schemas \ + desktop_gnome_applications_office.schemas \ desktop_gnome_applications_terminal.schemas \ desktop_gnome_applications_window_manager.schemas \ desktop_gnome_background.schemas \ desktop_gnome_file_views.schemas \ - desktop_gnome_interface.schemas desktop_gnome_lockdown.schemas \ + desktop_gnome_interface.schemas \ + desktop_gnome_lockdown.schemas \ desktop_gnome_peripherals_keyboard.schemas \ desktop_gnome_peripherals_mouse.schemas \ - desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \ - desktop_gnome_typing_break.schemas \ - desktop_gnome_applications_at_mobility.schemas \ - desktop_gnome_applications_at_visual.schemas + desktop_gnome_sound.schemas \ + desktop_gnome_thumbnailers.schemas \ + desktop_gnome_typing_break.schemas post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 0d26b855320a..24ddd0fdd860 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnome-2.20.1.1.tar.bz2) = cfab025a8b9a19cdae1c64f8b005c513 -SHA256 (gnome2/libgnome-2.20.1.1.tar.bz2) = d5b66f1beeefe3b61b654fa4d9c35b642fd73e310da1dd241e0ccb99dc93adec -SIZE (gnome2/libgnome-2.20.1.1.tar.bz2) = 1370144 +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 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index 37c981693b8b..7d848a121482 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.12 2007/04/26 14:17:52 ahze Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.14 2008/01/28 17:41:05 mezz Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 47b38ad06555..cd55ecea0376 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -51,6 +51,7 @@ share/locale/eu/LC_MESSAGES/libgnome-2.0.mo share/locale/fa/LC_MESSAGES/libgnome-2.0.mo share/locale/fi/LC_MESSAGES/libgnome-2.0.mo share/locale/fr/LC_MESSAGES/libgnome-2.0.mo +share/locale/fur/LC_MESSAGES/libgnome-2.0.mo share/locale/ga/LC_MESSAGES/libgnome-2.0.mo share/locale/gl/LC_MESSAGES/libgnome-2.0.mo share/locale/gu/LC_MESSAGES/libgnome-2.0.mo @@ -71,6 +72,7 @@ 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 share/locale/mn/LC_MESSAGES/libgnome-2.0.mo +share/locale/mr/LC_MESSAGES/libgnome-2.0.mo share/locale/ms/LC_MESSAGES/libgnome-2.0.mo share/locale/nb/LC_MESSAGES/libgnome-2.0.mo share/locale/ne/LC_MESSAGES/libgnome-2.0.mo @@ -85,6 +87,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnome-2.0.mo share/locale/ro/LC_MESSAGES/libgnome-2.0.mo share/locale/ru/LC_MESSAGES/libgnome-2.0.mo share/locale/rw/LC_MESSAGES/libgnome-2.0.mo +share/locale/si/LC_MESSAGES/libgnome-2.0.mo 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 @@ -105,8 +108,8 @@ share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo share/pixmaps/backgrounds/gnome/background-default.jpg -@dirrm share/pixmaps/backgrounds/gnome -@dirrm share/pixmaps/backgrounds +@dirrmtry share/pixmaps/backgrounds/gnome +@dirrmtry share/pixmaps/backgrounds @dirrmtry share/gnome-background-properties @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 @@ -120,14 +123,20 @@ share/pixmaps/backgrounds/gnome/background-default.jpg @dirrmtry share/locale/tt @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/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/ku/LC_MESSAGES @dirrmtry share/locale/ku +@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/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index 85a453f578eb..48c2cdf7a2e3 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libgnomekbd/Makefile,v 1.13 2007/09/17 14:06:48 ahze Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.19 2008/03/20 13:08:28 marcus Exp $ # PORTNAME= libgnomekbd -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,12 +16,12 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME keyboard shared library -LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier \ +LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_BZIP2= yes -USE_GNOME= libgnomeui gnometarget gnomeprefix gnomehack -GNU_CONFIGURE= yes +USE_GNOME= libgnomeui gnometarget gnomeprefix gnomehack ltverhack +USE_AUTOTOOLS= libtool:15 INSTALLS_ICONS= yes USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index 931fde380f27..a4d5c97e740a 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomekbd-2.20.0.tar.bz2) = 0b495d355e25c3531419cb3996be7e28 -SHA256 (gnome2/libgnomekbd-2.20.0.tar.bz2) = b82310e5d319ac1ba33d008360c4fae128f1b68768f1e51ff1021b60c19a900c -SIZE (gnome2/libgnomekbd-2.20.0.tar.bz2) = 392206 +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 diff --git a/x11/libgnomekbd/pkg-plist b/x11/libgnomekbd/pkg-plist index e198161eecc8..5bcddd4508b4 100644 --- a/x11/libgnomekbd/pkg-plist +++ b/x11/libgnomekbd/pkg-plist @@ -1,6 +1,4 @@ bin/gkbd-indicator-plugins-capplet -include/libgnomekbd/gkbd-config-registry-client.h -include/libgnomekbd/gkbd-config-registry.h include/libgnomekbd/gkbd-desktop-config.h include/libgnomekbd/gkbd-indicator-config.h include/libgnomekbd/gkbd-indicator-plugin.h @@ -11,21 +9,21 @@ include/libgnomekbd/gkbd-util.h lib/libgnomekbd.a lib/libgnomekbd.la lib/libgnomekbd.so -lib/libgnomekbd.so.1 +lib/libgnomekbd.so.2 lib/libgnomekbdui.a lib/libgnomekbdui.la lib/libgnomekbdui.so -lib/libgnomekbdui.so.1 +lib/libgnomekbdui.so.2 libdata/pkgconfig/libgnomekbd.pc libdata/pkgconfig/libgnomekbdui.pc share/applications/gkbd-indicator-plugins-capplet.desktop -share/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png %%DATADIR%%/glade/gkbd-indicator-plugins.glade share/locale/ar/LC_MESSAGES/libgnomekbd.mo share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo share/locale/bg/LC_MESSAGES/libgnomekbd.mo share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo share/locale/ca/LC_MESSAGES/libgnomekbd.mo +share/locale/cs/LC_MESSAGES/libgnomekbd.mo share/locale/da/LC_MESSAGES/libgnomekbd.mo share/locale/de/LC_MESSAGES/libgnomekbd.mo share/locale/dz/LC_MESSAGES/libgnomekbd.mo @@ -33,10 +31,12 @@ share/locale/el/LC_MESSAGES/libgnomekbd.mo share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo share/locale/es/LC_MESSAGES/libgnomekbd.mo share/locale/et/LC_MESSAGES/libgnomekbd.mo +share/locale/eu/LC_MESSAGES/libgnomekbd.mo share/locale/fi/LC_MESSAGES/libgnomekbd.mo 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/hu/LC_MESSAGES/libgnomekbd.mo share/locale/it/LC_MESSAGES/libgnomekbd.mo share/locale/ja/LC_MESSAGES/libgnomekbd.mo @@ -44,7 +44,10 @@ share/locale/ka/LC_MESSAGES/libgnomekbd.mo share/locale/ko/LC_MESSAGES/libgnomekbd.mo share/locale/lt/LC_MESSAGES/libgnomekbd.mo 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/oc/LC_MESSAGES/libgnomekbd.mo share/locale/or/LC_MESSAGES/libgnomekbd.mo @@ -54,23 +57,33 @@ share/locale/pt/LC_MESSAGES/libgnomekbd.mo share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo share/locale/ru/LC_MESSAGES/libgnomekbd.mo 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/sv/LC_MESSAGES/libgnomekbd.mo share/locale/ta/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 share/locale/vi/LC_MESSAGES/libgnomekbd.mo share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo +share/locale/zh_HK/LC_MESSAGES/libgnomekbd.mo +share/locale/zh_TW/LC_MESSAGES/libgnomekbd.mo @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% @dirrm include/libgnomekbd +@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/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/applications diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile index 6e7db08070b5..7ea6c53d4e2c 100644 --- a/x11/libgnomemm26/Makefile +++ b/x11/libgnomemm26/Makefile @@ -3,11 +3,11 @@ # Whom: Alexander Nedotsukov <bland@mail.ru> # # $FreeBSD$ -# $MCom: ports/x11/libgnomemm26/Makefile,v 1.14 2007/09/17 03:10:06 marcus Exp $ +# $MCom: ports/x11/libgnomemm26/Makefile,v 1.16 2008/03/08 16:50:27 marcus Exp $ # PORTNAME= libgnomemm -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.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 862b17d72c20..1de4fb030c27 100644 --- a/x11/libgnomemm26/distinfo +++ b/x11/libgnomemm26/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libgnomemm-2.20.0.tar.bz2) = 6263d15a96c34a73964be37c4e9a261f -SHA256 (gnome2/libgnomemm-2.20.0.tar.bz2) = 4118936224bec44913e11b6b850ae33512c7aa8fde5524d171fcc7eafe1c5aa8 -SIZE (gnome2/libgnomemm-2.20.0.tar.bz2) = 248837 +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 diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index bfde4178af74..060c2039e0f3 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.35 2007/09/10 15:36:39 mezz Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.39 2008/03/20 16:07:22 mezz Exp $ # PORTNAME= libxklavier -PORTVERSION= 3.3 -PORTREVISION= 1 +PORTVERSION= 3.5 PORTEPOCH= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 9c48625aed65..2b2523958002 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,3 +1,3 @@ -MD5 (libxklavier-3.3.tar.gz) = 0b9a62ad4f007e6c42a70a4f6e0aecbf -SHA256 (libxklavier-3.3.tar.gz) = 050a14ddeda0bbf5c742cb60dee56de48736968d050543fc2e46bcd2e1837870 -SIZE (libxklavier-3.3.tar.gz) = 475629 +MD5 (libxklavier-3.5.tar.gz) = d0625fdd7e22dbe382af40872fbbe77b +SHA256 (libxklavier-3.5.tar.gz) = adac155e4d6be6b5bf6283eb265048e20c37c1caa49f39845532914151172706 +SIZE (libxklavier-3.5.tar.gz) = 448663 diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist index caf0c1705393..493ca170ada0 100644 --- a/x11/libxklavier/pkg-plist +++ b/x11/libxklavier/pkg-plist @@ -7,7 +7,7 @@ include/libxklavier/xklavier.h lib/libxklavier.a lib/libxklavier.la lib/libxklavier.so -lib/libxklavier.so.11 +lib/libxklavier.so.12 libdata/pkgconfig/libxklavier.pc %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html @@ -25,7 +25,5 @@ libdata/pkgconfig/libxklavier.pc %%DOCSDIR%%/right.png %%DOCSDIR%%/style.css %%DOCSDIR%%/up.png -%%DATADIR%%/xfree86.xml -@dirrm %%DATADIR%% @dirrm %%DOCSDIR%% @dirrm include/libxklavier diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index f644e39af29c..843c15b4487f 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xkeyboard-config -PORTVERSION= 1.0 -PORTREVISION= 2 +PORTVERSION= 1.2 CATEGORIES= x11 MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/ DISTNAME= xkeyboard-config-${PORTVERSION} @@ -15,8 +14,7 @@ DISTNAME= xkeyboard-config-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT= X Keyboard Configuration Database -BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \ - ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser +BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp # XXX - sigh PREFIX= ${X11BASE} @@ -24,11 +22,14 @@ PREFIX= ${X11BASE} USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes +USE_GNOME= intlhack USE_GETTEXT= yes USE_PERL5_BUILD=yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-xkb-base=${PREFIX}/share/X11/xkb \ +CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ --with-xkb-rules-symlink=xorg +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-install: ${MKDIR} /var/lib/xkb diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo index 2ad7f7527dd8..725911b0f6da 100644 --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,3 +1,3 @@ -MD5 (xkeyboard-config-1.0.tar.bz2) = bcf08a6bf76bd5661f730d36a1d66517 -SHA256 (xkeyboard-config-1.0.tar.bz2) = 44e4765c90b4ff3791eee40bdd95ab24d5b0089e39badedc2155cf10d4072ffb -SIZE (xkeyboard-config-1.0.tar.bz2) = 534180 +MD5 (xkeyboard-config-1.2.tar.bz2) = 667c582a54d5715d24110c20e8c4be38 +SHA256 (xkeyboard-config-1.2.tar.bz2) = 64856896fb71708b6fc2bab146b387b2fb34da02ca9425a77dcfbfa59edb27f7 +SIZE (xkeyboard-config-1.2.tar.bz2) = 586629 diff --git a/x11/xkeyboard-config/files/patch-configure b/x11/xkeyboard-config/files/patch-configure new file mode 100644 index 000000000000..c7d7ce26efb3 --- /dev/null +++ b/x11/xkeyboard-config/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2008-02-08 23:52:05.000000000 -0500 ++++ configure 2008-02-08 23:52:12.000000000 -0500 +@@ -7456,7 +7456,7 @@ else + echo " Symbolic link(s) to legacy rules: $xkb_rules_symlink" + fi + +-if test "$enable_compat_rules" == "yes" ; then ++if test "$enable_compat_rules" = "yes" ; then + echo " Compatibility rules are included" + else + echo " Compatibility rules are not included" diff --git a/x11/xkeyboard-config/files/patch-intltool-merge.in b/x11/xkeyboard-config/files/patch-intltool-merge.in deleted file mode 100644 index 32de637e9f5a..000000000000 --- a/x11/xkeyboard-config/files/patch-intltool-merge.in +++ /dev/null @@ -1,11 +0,0 @@ ---- intltool-merge.in.orig 2007-12-03 07:58:17.000000000 +0900 -+++ intltool-merge.in 2007-12-03 08:00:47.000000000 +0900 -@@ -91,7 +91,7 @@ - - my %po_files_by_lang = (); - my %translations = (); --my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv"; -+my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@"; - - # Use this instead of \w for XML files to handle more possible characters. - my $w = "[-A-Za-z0-9._:]"; diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist index e86940e9f01d..9799efb0a4ec 100644 --- a/x11/xkeyboard-config/pkg-plist +++ b/x11/xkeyboard-config/pkg-plist @@ -13,6 +13,7 @@ share/X11/xkb/compat/level5 share/X11/xkb/compat/misc share/X11/xkb/compat/mousekeys share/X11/xkb/compat/norepeat +share/X11/xkb/compat/olpc share/X11/xkb/compat/pc share/X11/xkb/compat/pc98 share/X11/xkb/compat/xfree86 @@ -133,6 +134,7 @@ share/X11/xkb/symbols/digital_vndr/vt share/X11/xkb/symbols/fujitsu_vndr/jp share/X11/xkb/symbols/fujitsu_vndr/us share/X11/xkb/symbols/hp_vndr/us +share/X11/xkb/symbols/kpdl share/X11/xkb/symbols/macintosh_vndr/apple share/X11/xkb/symbols/macintosh_vndr/ch share/X11/xkb/symbols/macintosh_vndr/de @@ -150,7 +152,9 @@ share/X11/xkb/symbols/macintosh_vndr/pt share/X11/xkb/symbols/macintosh_vndr/se share/X11/xkb/symbols/macintosh_vndr/us share/X11/xkb/symbols/nec_vndr/jp +share/X11/xkb/symbols/olpc share/X11/xkb/symbols/sgi_vndr/jp +share/X11/xkb/symbols/shift share/X11/xkb/symbols/sony_vndr/us share/X11/xkb/symbols/sun_vndr/cs share/X11/xkb/symbols/sun_vndr/cz @@ -198,7 +202,7 @@ share/X11/xkb/symbols/by share/X11/xkb/symbols/ca share/X11/xkb/symbols/cd share/X11/xkb/symbols/ch -share/X11/xkb/symbols/cs +share/X11/xkb/symbols/cn share/X11/xkb/symbols/cz share/X11/xkb/symbols/de share/X11/xkb/symbols/dk @@ -212,6 +216,7 @@ share/X11/xkb/symbols/fr share/X11/xkb/symbols/gb share/X11/xkb/symbols/ge share/X11/xkb/symbols/gh +share/X11/xkb/symbols/gn share/X11/xkb/symbols/gr share/X11/xkb/symbols/hr share/X11/xkb/symbols/hu @@ -235,6 +240,7 @@ share/X11/xkb/symbols/lt share/X11/xkb/symbols/lv share/X11/xkb/symbols/ma share/X11/xkb/symbols/mao +share/X11/xkb/symbols/me share/X11/xkb/symbols/mk share/X11/xkb/symbols/mm share/X11/xkb/symbols/mn @@ -250,6 +256,7 @@ share/X11/xkb/symbols/pk share/X11/xkb/symbols/pl share/X11/xkb/symbols/pt share/X11/xkb/symbols/ro +share/X11/xkb/symbols/rs share/X11/xkb/symbols/ru share/X11/xkb/symbols/se share/X11/xkb/symbols/si @@ -289,6 +296,34 @@ share/X11/xkb/types/numpad share/X11/xkb/types/pc share/X11/xkb/types/README share/X11/xkb/xkbcomp +share/locale/af/LC_MESSAGES/xkeyboard-config.mo +share/locale/az/LC_MESSAGES/xkeyboard-config.mo +share/locale/bg/LC_MESSAGES/xkeyboard-config.mo +share/locale/cs/LC_MESSAGES/xkeyboard-config.mo +share/locale/da/LC_MESSAGES/xkeyboard-config.mo +share/locale/el/LC_MESSAGES/xkeyboard-config.mo +share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo +share/locale/es/LC_MESSAGES/xkeyboard-config.mo +share/locale/fi/LC_MESSAGES/xkeyboard-config.mo +share/locale/fr/LC_MESSAGES/xkeyboard-config.mo +share/locale/hu/LC_MESSAGES/xkeyboard-config.mo +share/locale/it/LC_MESSAGES/xkeyboard-config.mo +share/locale/ka/LC_MESSAGES/xkeyboard-config.mo +share/locale/ko/LC_MESSAGES/xkeyboard-config.mo +share/locale/nl/LC_MESSAGES/xkeyboard-config.mo +share/locale/ru/LC_MESSAGES/xkeyboard-config.mo +share/locale/rw/LC_MESSAGES/xkeyboard-config.mo +share/locale/sk/LC_MESSAGES/xkeyboard-config.mo +share/locale/sl/LC_MESSAGES/xkeyboard-config.mo +share/locale/sq/LC_MESSAGES/xkeyboard-config.mo +share/locale/sr/LC_MESSAGES/xkeyboard-config.mo +share/locale/sr@Latn/LC_MESSAGES/xkeyboard-config.mo +share/locale/sv/LC_MESSAGES/xkeyboard-config.mo +share/locale/tr/LC_MESSAGES/xkeyboard-config.mo +share/locale/uk/LC_MESSAGES/xkeyboard-config.mo +share/locale/vi/LC_MESSAGES/xkeyboard-config.mo +share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo +share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo @exec mkdir -p /var/lib/xkb @dirrm share/X11/xkb/compat @dirrm share/X11/xkb/geometry/digital_vndr @@ -317,3 +352,5 @@ share/X11/xkb/xkbcomp @dirrm share/X11/xkb @dirrmtry share/X11 @dirrmtry /var/lib/xkb +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index c32be1a305ea..94a6d0a4d2cb 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,14 +3,13 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.117 2007/09/18 16:50:09 marcus Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.122 2008/03/09 21:51:58 mezz Exp $ # PORTNAME= yelp -PORTVERSION= 2.20.0 +PORTVERSION= 2.22.0 CATEGORIES= x11 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 @@ -19,18 +18,17 @@ COMMENT= A help browser for the GNOME 2 desktop LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ rarian.0:${PORTSDIR}/textproc/rarian -USE_GECKO= firefox xulrunner firefox-devel<->firefox +USE_GECKO= firefox xulrunner seamonkey USE_GETTEXT= yes USE_BZIP2= yes -USE_XLIB= yes +USE_XORG= ice USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ - libgnomeprintui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-mozilla=${GECKO} +CONFIGURE_ARGS= --with-gecko=${GECKO} MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" GCONF_SCHEMAS= yelp.schemas diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 4d65e16ff4f2..b488f21f2869 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/yelp-2.20.0.tar.bz2) = 8902618c343093b1c64ee6d647ec41ed -SHA256 (gnome2/yelp-2.20.0.tar.bz2) = 0f4e1c5f3c4bf8d5109794b4d0a340ed847d49381d42968beb405f14b68c61ed -SIZE (gnome2/yelp-2.20.0.tar.bz2) = 903106 +MD5 (gnome2/yelp-2.22.0.tar.bz2) = 941e67796bbc332c1db3d63771ae2590 +SHA256 (gnome2/yelp-2.22.0.tar.bz2) = 211b05ff153efff714b7767c4d5bce068562bf242e5f935a703f54d899e30cd0 +SIZE (gnome2/yelp-2.22.0.tar.bz2) = 978777 diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 9d5800d0c26b..b55642d47706 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -1,37 +1,11 @@ bin/gnome-help bin/yelp share/applications/yelp.desktop -share/yelp/default.css -share/yelp/icons/yelp-icon-caution.png -share/yelp/icons/yelp-icon-important.png -share/yelp/icons/yelp-icon-note.png -share/yelp/icons/yelp-icon-tip.png -share/yelp/icons/yelp-icon-warning.png -share/yelp/icons/yelp-watermark-blockquote-00AB.png -share/yelp/icons/yelp-watermark-blockquote-00BB.png -share/yelp/icons/yelp-watermark-blockquote-201C.png -share/yelp/icons/yelp-watermark-blockquote-201D.png -share/yelp/icons/yelp-watermark-blockquote-201E.png -share/yelp/important_docs.xml -share/yelp/info.xml -share/yelp/man.xml -share/yelp/scrollkeeper.xml -share/yelp/toc.xml -share/yelp/ui/yelp-search-ui.xml -share/yelp/ui/yelp-ui.xml -share/yelp/ui/yelp.glade -share/yelp/xslt/db-title.xsl -share/yelp/xslt/db2html.xsl -share/yelp/xslt/info2html.xsl -share/yelp/xslt/man2html.xsl -share/yelp/xslt/search2html.xsl -share/yelp/xslt/toc2html.xsl -share/yelp/xslt/yelp-common.xsl -share/yelp/yelp.js share/icons/hicolor/192x192/apps/yelp-icon-big.png share/locale/af/LC_MESSAGES/yelp.mo share/locale/am/LC_MESSAGES/yelp.mo share/locale/ar/LC_MESSAGES/yelp.mo +share/locale/as/LC_MESSAGES/yelp.mo share/locale/az/LC_MESSAGES/yelp.mo share/locale/be/LC_MESSAGES/yelp.mo share/locale/be@latin/LC_MESSAGES/yelp.mo @@ -117,10 +91,38 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo share/locale/zh_HK/LC_MESSAGES/yelp.mo share/locale/zh_TW/LC_MESSAGES/yelp.mo share/locale/zu/LC_MESSAGES/yelp.mo -@dirrm share/yelp/xslt -@dirrm share/yelp/ui -@dirrm share/yelp/icons -@dirrm share/yelp +%%DATADIR%%/default.css +%%DATADIR%%/icons/yelp-icon-caution.png +%%DATADIR%%/icons/yelp-icon-important.png +%%DATADIR%%/icons/yelp-icon-note.png +%%DATADIR%%/icons/yelp-icon-tip.png +%%DATADIR%%/icons/yelp-icon-warning.png +%%DATADIR%%/icons/yelp-watermark-blockquote-00AB.png +%%DATADIR%%/icons/yelp-watermark-blockquote-00BB.png +%%DATADIR%%/icons/yelp-watermark-blockquote-201C.png +%%DATADIR%%/icons/yelp-watermark-blockquote-201D.png +%%DATADIR%%/icons/yelp-watermark-blockquote-201E.png +%%DATADIR%%/important_docs.xml +%%DATADIR%%/info.xml +%%DATADIR%%/man.xml +%%DATADIR%%/scrollkeeper.xml +%%DATADIR%%/toc.xml +%%DATADIR%%/ui/yelp-search-ui.xml +%%DATADIR%%/ui/yelp-ui.xml +%%DATADIR%%/ui/yelp.glade +%%DATADIR%%/xslt/db-title.xsl +%%DATADIR%%/xslt/db2html.xsl +%%DATADIR%%/xslt/info2html.xsl +%%DATADIR%%/xslt/man2html.xsl +%%DATADIR%%/xslt/search2html.xsl +%%DATADIR%%/xslt/toc2html.xsl +%%DATADIR%%/xslt/yelp-common.xsl +%%DATADIR%%/yelp.js +@dirrm %%DATADIR%%/xslt +@dirrm %%DATADIR%%/ui +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%% +@dirrmtry share/applications @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES @@ -155,4 +157,5 @@ share/locale/zu/LC_MESSAGES/yelp.mo @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/applications +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 2e9bcc0032aa..fe4e9e25f535 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,11 +3,11 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ -# $MCom: ports-stable/x11/zenity/Makefile,v 1.1 2007/12/01 19:10:42 marcus Exp $ +# $MCom: ports/x11/zenity/Makefile,v 1.90 2008/03/10 13:46:16 ahze Exp $ # PORTNAME= zenity -PORTVERSION= 2.20.1 +PORTVERSION= 2.22.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/zenity/distinfo b/x11/zenity/distinfo index db03818b9408..3507e2a8df1e 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/zenity-2.20.1.tar.bz2) = b9989582ea43f8fd58819d85ef9c9bc5 -SHA256 (gnome2/zenity-2.20.1.tar.bz2) = cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36 -SIZE (gnome2/zenity-2.20.1.tar.bz2) = 1830201 +MD5 (gnome2/zenity-2.22.0.tar.bz2) = f482090f1bd4946a2f8aee8e73200b04 +SHA256 (gnome2/zenity-2.22.0.tar.bz2) = d7c1277b7e69b41c1e21814a6cd613220b06b522fbfbf931f42b1c4b557bfaee +SIZE (gnome2/zenity-2.22.0.tar.bz2) = 1821422 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 54d0d5ef1892..2b697946e3c0 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -111,7 +111,9 @@ share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png share/gnome/help/zenity/uk/zenity.xml share/locale/am/LC_MESSAGES/zenity.mo share/locale/ar/LC_MESSAGES/zenity.mo +share/locale/as/LC_MESSAGES/zenity.mo share/locale/az/LC_MESSAGES/zenity.mo +share/locale/be@latin/LC_MESSAGES/zenity.mo share/locale/be/LC_MESSAGES/zenity.mo share/locale/bg/LC_MESSAGES/zenity.mo share/locale/bn/LC_MESSAGES/zenity.mo @@ -154,6 +156,7 @@ share/locale/mi/LC_MESSAGES/zenity.mo share/locale/mk/LC_MESSAGES/zenity.mo share/locale/ml/LC_MESSAGES/zenity.mo share/locale/mn/LC_MESSAGES/zenity.mo +share/locale/mr/LC_MESSAGES/zenity.mo share/locale/ms/LC_MESSAGES/zenity.mo share/locale/nb/LC_MESSAGES/zenity.mo share/locale/ne/LC_MESSAGES/zenity.mo @@ -243,6 +246,8 @@ share/omf/zenity/zenity-uk.omf @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/mi/LC_MESSAGES @dirrmtry share/locale/mi @dirrmtry share/locale/mg/LC_MESSAGES @@ -253,3 +258,7 @@ share/omf/zenity/zenity-uk.omf @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 |