diff options
| author | martti <martti> | 2007-12-07 19:43:19 +0000 |
|---|---|---|
| committer | martti <martti> | 2007-12-07 19:43:19 +0000 |
| commit | c892a5fdb1f59531df14dda6a93effc7f9bc558f (patch) | |
| tree | b13a72118dfeb40f0301f5034c64ed4656b8e1d0 /x11 | |
| parent | f7a10a1b0df36db774523c928ff342342c6bca90 (diff) | |
| download | pkgsrc-c892a5fdb1f59531df14dda6a93effc7f9bc558f.tar.gz | |
Updated Xfce to 4.4.2
Lots of bug fixes. For the official ChangeLog, please see
http://www.xfce.org/documentation/changelogs/4.4.2
Diffstat (limited to 'x11')
51 files changed, 322 insertions, 476 deletions
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile index af6136a33f4..1c910f290a9 100644 --- a/x11/libxfce4gui/Makefile +++ b/x11/libxfce4gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/04/12 09:55:20 martti Exp $ +# $NetBSD: Makefile,v 1.24 2007/12/07 19:43:25 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -8,7 +8,7 @@ CATEGORIES= x11 COMMENT= Xfce widget library USE_TOOLS+= msgfmt -CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST index c2182286ab0..ce10d715b06 100644 --- a/x11/libxfce4gui/PLIST +++ b/x11/libxfce4gui/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2007/04/12 09:55:20 martti Exp $ +@comment $NetBSD: PLIST,v 1.18 2007/12/07 19:43:25 martti Exp $ include/xfce4/libxfcegui4/dialogs.h include/xfce4/libxfcegui4/gtk_style.h include/xfce4/libxfcegui4/gtktoxevent.h @@ -87,6 +87,7 @@ share/icons/hicolor/48x48/apps/xfce-terminal.png share/icons/hicolor/48x48/apps/xfce-unknown.png share/icons/hicolor/48x48/apps/xfce-utils.png share/icons/hicolor/scalable/apps/xfce-filemanager.svg +share/locale/am/LC_MESSAGES/libxfcegui4.mo share/locale/ar/LC_MESSAGES/libxfcegui4.mo share/locale/be/LC_MESSAGES/libxfcegui4.mo share/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo @@ -114,18 +115,22 @@ share/locale/ja/LC_MESSAGES/libxfcegui4.mo share/locale/ka/LC_MESSAGES/libxfcegui4.mo share/locale/ko/LC_MESSAGES/libxfcegui4.mo share/locale/lt/LC_MESSAGES/libxfcegui4.mo +share/locale/lv/LC_MESSAGES/libxfcegui4.mo share/locale/mk/LC_MESSAGES/libxfcegui4.mo share/locale/mr/LC_MESSAGES/libxfcegui4.mo +share/locale/nb_NO/LC_MESSAGES/libxfcegui4.mo share/locale/nl/LC_MESSAGES/libxfcegui4.mo share/locale/pa/LC_MESSAGES/libxfcegui4.mo share/locale/pl/LC_MESSAGES/libxfcegui4.mo share/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo +share/locale/pt_PT/LC_MESSAGES/libxfcegui4.mo share/locale/ro/LC_MESSAGES/libxfcegui4.mo share/locale/ru/LC_MESSAGES/libxfcegui4.mo share/locale/sk/LC_MESSAGES/libxfcegui4.mo share/locale/sq/LC_MESSAGES/libxfcegui4.mo share/locale/sv/LC_MESSAGES/libxfcegui4.mo share/locale/ta/LC_MESSAGES/libxfcegui4.mo +share/locale/th/LC_MESSAGES/libxfcegui4.mo share/locale/tr/LC_MESSAGES/libxfcegui4.mo share/locale/uk/LC_MESSAGES/libxfcegui4.mo share/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index 8e3a3a24093..bea2b87bf5c 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2007/04/12 09:55:20 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2007/12/07 19:43:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= libxfce4gui BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4gui .if ${LIBXFCE4GUI_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.4.1 +BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.4.2 BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui .endif # LIBXFCE4GUI_BUILDLINK3_MK @@ -20,6 +20,7 @@ BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo index 95a2ed1d984..fd788c0275e 100644 --- a/x11/libxfce4gui/distinfo +++ b/x11/libxfce4gui/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.15 2007/04/12 09:55:20 martti Exp $ +$NetBSD: distinfo,v 1.16 2007/12/07 19:43:25 martti Exp $ -SHA1 (libxfcegui4-4.4.1.tar.bz2) = d0a5d59e36fb29756fb3e9a1e1f646a0980104a2 -RMD160 (libxfcegui4-4.4.1.tar.bz2) = d92a8340e006d55f910f68613d0ed6f2787952b2 -Size (libxfcegui4-4.4.1.tar.bz2) = 606608 bytes +SHA1 (libxfcegui4-4.4.2.tar.bz2) = 554a30c02c92b76c8caad444040e18d8ec1737bc +RMD160 (libxfcegui4-4.4.2.tar.bz2) = 1de306d67f9a38d72ec184e00471e4d53db3801d +Size (libxfcegui4-4.4.2.tar.bz2) = 565036 bytes diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile index 3ebf6d666ed..075d4a27ca2 100644 --- a/x11/libxfce4mcs/Makefile +++ b/x11/libxfce4mcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/04/12 09:55:21 martti Exp $ +# $NetBSD: Makefile,v 1.15 2007/12/07 19:43:25 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -6,7 +6,7 @@ DISTNAME= libxfce4mcs-${XFCE4_VERSION} CATEGORIES= x11 COMMENT= Xfce settings management library -CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc PKGCONFIG_OVERRIDE= libxfce4mcs/libxfce4mcs-client-1.0.pc.in PKGCONFIG_OVERRIDE+= libxfce4mcs/libxfce4mcs-manager-1.0.pc.in diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk index cdf6ac78553..e398b7c4144 100644 --- a/x11/libxfce4mcs/buildlink3.mk +++ b/x11/libxfce4mcs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:21 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2007/12/07 19:43:25 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+ @@ -12,12 +12,12 @@ BUILDLINK_PACKAGES+= libxfce4mcs BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4mcs .if ${LIBXFCE4MCS_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.4.1 +BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.4.2 BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs .endif # LIBXFCE4MCS_BUILDLINK3_MK -.include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo index 05441fcfcab..22feeab4b33 100644 --- a/x11/libxfce4mcs/distinfo +++ b/x11/libxfce4mcs/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.14 2007/04/12 09:55:21 martti Exp $ +$NetBSD: distinfo,v 1.15 2007/12/07 19:43:25 martti Exp $ -SHA1 (libxfce4mcs-4.4.1.tar.bz2) = 9a39e5227f6f574635bd5a06f023cadd4256e57c -RMD160 (libxfce4mcs-4.4.1.tar.bz2) = c834ffb4b7ea7dc90faa3565b804c8146b2789a9 -Size (libxfce4mcs-4.4.1.tar.bz2) = 265299 bytes +SHA1 (libxfce4mcs-4.4.2.tar.bz2) = f71c618070a57b1180a25dc008d83b623a862f42 +RMD160 (libxfce4mcs-4.4.2.tar.bz2) = 38fa32720aa4d3201867e6313d49e3f632f01888 +Size (libxfce4mcs-4.4.2.tar.bz2) = 280108 bytes diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index 2aa576bcb19..89297e8c606 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:21 martti Exp $ +# $NetBSD: Makefile,v 1.14 2007/12/07 19:43:26 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -6,7 +6,7 @@ DISTNAME= libxfce4util-${XFCE4_VERSION} CATEGORIES= x11 COMMENT= Xfce basic library -CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc PKGCONFIG_OVERRIDE= libxfce4util/libxfce4util-1.0.pc.in diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST index 5885fec78a2..0f59f10ec78 100644 --- a/x11/libxfce4util/PLIST +++ b/x11/libxfce4util/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2007/04/12 09:55:21 martti Exp $ +@comment $NetBSD: PLIST,v 1.11 2007/12/07 19:43:26 martti Exp $ include/xfce4/libxfce4util/debug.h include/xfce4/libxfce4util/i18n.h include/xfce4/libxfce4util/libxfce4util-config.h @@ -44,6 +44,7 @@ share/doc/libxfce4util/reference.html share/doc/libxfce4util/right.png share/doc/libxfce4util/style.css share/doc/libxfce4util/up.png +share/locale/am/LC_MESSAGES/libxfce4util.mo share/locale/ar/LC_MESSAGES/libxfce4util.mo share/locale/ca/LC_MESSAGES/libxfce4util.mo share/locale/cs/LC_MESSAGES/libxfce4util.mo @@ -61,11 +62,16 @@ share/locale/ja/LC_MESSAGES/libxfce4util.mo share/locale/ka/LC_MESSAGES/libxfce4util.mo share/locale/ko/LC_MESSAGES/libxfce4util.mo share/locale/lt/LC_MESSAGES/libxfce4util.mo +share/locale/lv/LC_MESSAGES/libxfce4util.mo share/locale/mk/LC_MESSAGES/libxfce4util.mo +share/locale/nb_NO/LC_MESSAGES/libxfce4util.mo share/locale/nl/LC_MESSAGES/libxfce4util.mo share/locale/pl/LC_MESSAGES/libxfce4util.mo share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo +share/locale/pt_PT/LC_MESSAGES/libxfce4util.mo +share/locale/ro/LC_MESSAGES/libxfce4util.mo share/locale/sq/LC_MESSAGES/libxfce4util.mo +share/locale/th/LC_MESSAGES/libxfce4util.mo share/locale/tr/LC_MESSAGES/libxfce4util.mo share/locale/uk/LC_MESSAGES/libxfce4util.mo @dirrm share/doc/libxfce4util diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index 5805bf7c982..8397edb80d6 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:21 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2007/12/07 19:43:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= libxfce4util BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4util .if ${LIBXFCE4UTIL_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.4.1 +BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.4.2 BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util .endif # LIBXFCE4UTIL_BUILDLINK3_MK diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo index 38475774c0e..eba3f35f251 100644 --- a/x11/libxfce4util/distinfo +++ b/x11/libxfce4util/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.17 2007/04/12 09:55:21 martti Exp $ +$NetBSD: distinfo,v 1.18 2007/12/07 19:43:26 martti Exp $ -SHA1 (libxfce4util-4.4.1.tar.bz2) = 20b0d8b952e780569b0d32bcf26f377867c659c8 -RMD160 (libxfce4util-4.4.1.tar.bz2) = fa05dcf9e48d96dcae8ea1368647064e10a41a87 -Size (libxfce4util-4.4.1.tar.bz2) = 372848 bytes +SHA1 (libxfce4util-4.4.2.tar.bz2) = b0399b476bd901a84424a2b77d4aa89d7fcfac7d +RMD160 (libxfce4util-4.4.2.tar.bz2) = d0b92cae1a50cf219ff728a78789e8876aa63c91 +Size (libxfce4util-4.4.2.tar.bz2) = 366163 bytes diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index 9b938bbcee5..377c020c4a6 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.28 2007/10/03 10:25:00 martti Exp $ +# $NetBSD: Makefile,v 1.29 2007/12/07 19:43:26 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfdesktop-${XFCE4_VERSION} PKGNAME= xfce4-desktop-${XFCE4_VERSION} -PKGREVISION= 2 +#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce desktop background manager diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST index 99e3a83fa96..80777c96f5c 100644 --- a/x11/xfce4-desktop/PLIST +++ b/x11/xfce4-desktop/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:22 martti Exp $ +@comment $NetBSD: PLIST,v 1.17 2007/12/07 19:43:26 martti Exp $ bin/xfce4-menueditor bin/xfce4-popup-menu bin/xfdesktop @@ -25,6 +25,7 @@ share/examples/xfce4/desktop/menu.xml.hu share/examples/xfce4/desktop/menu.xml.it share/examples/xfce4/desktop/menu.xml.ja share/examples/xfce4/desktop/menu.xml.ko +share/examples/xfce4/desktop/menu.xml.nb_NO share/examples/xfce4/desktop/menu.xml.nl share/examples/xfce4/desktop/menu.xml.pa share/examples/xfce4/desktop/menu.xml.pl @@ -50,6 +51,7 @@ share/examples/xfce4/desktop/xfce-registered-categories.xml.he share/examples/xfce4/desktop/xfce-registered-categories.xml.hu share/examples/xfce4/desktop/xfce-registered-categories.xml.it share/examples/xfce4/desktop/xfce-registered-categories.xml.ja +share/examples/xfce4/desktop/xfce-registered-categories.xml.nb_NO share/examples/xfce4/desktop/xfce-registered-categories.xml.nl share/examples/xfce4/desktop/xfce-registered-categories.xml.pl share/examples/xfce4/desktop/xfce-registered-categories.xml.pt_BR @@ -66,6 +68,7 @@ share/icons/hicolor/48x48/apps/xfce4-backdrop.png share/icons/hicolor/48x48/apps/xfce4-menueditor.png share/icons/hicolor/scalable/apps/xfce4-backdrop.svg share/icons/hicolor/scalable/apps/xfce4-menueditor.svg +share/locale/am/LC_MESSAGES/xfdesktop.mo share/locale/ar/LC_MESSAGES/xfdesktop.mo share/locale/az/LC_MESSAGES/xfdesktop.mo share/locale/be/LC_MESSAGES/xfdesktop.mo @@ -96,6 +99,7 @@ share/locale/ja/LC_MESSAGES/xfdesktop.mo share/locale/ka/LC_MESSAGES/xfdesktop.mo share/locale/ko/LC_MESSAGES/xfdesktop.mo share/locale/lt/LC_MESSAGES/xfdesktop.mo +share/locale/lv/LC_MESSAGES/xfdesktop.mo share/locale/mk/LC_MESSAGES/xfdesktop.mo share/locale/mr/LC_MESSAGES/xfdesktop.mo share/locale/ms/LC_MESSAGES/xfdesktop.mo diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk index 396dddf8fc9..caf4de1c6e0 100644 --- a/x11/xfce4-desktop/buildlink3.mk +++ b/x11/xfce4-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2007/10/03 10:25:00 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2007/12/07 19:43:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-desktop BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-desktop .if ${XFCE4_DESKTOP_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.4.1nb2 +BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.4.2 BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop .endif # XFCE4_DESKTOP_BUILDLINK3_MK diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo index 59db3cee46e..c2e7586db0b 100644 --- a/x11/xfce4-desktop/distinfo +++ b/x11/xfce4-desktop/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.16 2007/10/03 10:25:00 martti Exp $ +$NetBSD: distinfo,v 1.17 2007/12/07 19:43:27 martti Exp $ -SHA1 (xfdesktop-4.4.1.tar.bz2) = 46324ad37bb782ec7a5da11c619d9e76a0f54133 -RMD160 (xfdesktop-4.4.1.tar.bz2) = 10e182f2cebd309ed7e2b18d00331861e21f4528 -Size (xfdesktop-4.4.1.tar.bz2) = 3067577 bytes -SHA1 (patch-aa) = 22de9a53d0d87cfddecaf2374b0fce2beb50108c -SHA1 (patch-ab) = bc96e67a327eb9e2a3dfde21ee59ac4895a67531 -SHA1 (patch-ac) = c3f50f9814405fd41e21351dc0fecc44ec47c65e +SHA1 (xfdesktop-4.4.2.tar.bz2) = f2ff4d429c0241401bdeebd3dc9b71b35dbe9ae8 +RMD160 (xfdesktop-4.4.2.tar.bz2) = 4e1e4db449a6e18e3c32458c7946246f399c52af +Size (xfdesktop-4.4.2.tar.bz2) = 3047839 bytes +SHA1 (patch-aa) = 72eb8d6810d0a680f49fa03f45a73fe4f124d02d +SHA1 (patch-ab) = 0816049644f48d4057b20d32f88629552216f5fc diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa index 22e1023ffe5..214c2bd2498 100644 --- a/x11/xfce4-desktop/patches/patch-aa +++ b/x11/xfce4-desktop/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:22 martti Exp $ +$NetBSD: patch-aa,v 1.5 2007/12/07 19:43:27 martti Exp $ ---- Makefile.in.orig 2007-04-09 18:56:45.000000000 +0300 -+++ Makefile.in 2007-04-11 16:04:43.000000000 +0300 -@@ -327,7 +327,7 @@ +--- Makefile.in.orig 2007-11-17 19:52:57.000000000 +0000 ++++ Makefile.in 2007-12-04 13:28:52.000000000 +0000 +@@ -314,7 +314,7 @@ modules \ pixmaps diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab index 4947d60e128..9ef1c37f9b2 100644 --- a/x11/xfce4-desktop/patches/patch-ab +++ b/x11/xfce4-desktop/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2007/04/12 09:55:22 martti Exp $ +$NetBSD: patch-ab,v 1.5 2007/12/07 19:43:27 martti Exp $ ---- modules/menu/Makefile.in.orig 2007-04-09 18:56:43.000000000 +0300 -+++ modules/menu/Makefile.in 2007-04-11 16:05:14.000000000 +0300 -@@ -348,7 +348,7 @@ +--- modules/menu/Makefile.in.orig 2007-11-17 19:52:57.000000000 +0000 ++++ modules/menu/Makefile.in 2007-12-04 13:29:15.000000000 +0000 +@@ -337,7 +337,7 @@ $(LIBX11_LIBS) \ $(LIBXFCEGUI4_LIBS) diff --git a/x11/xfce4-desktop/patches/patch-ac b/x11/xfce4-desktop/patches/patch-ac deleted file mode 100644 index bf7d24e0c5f..00000000000 --- a/x11/xfce4-desktop/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2007/10/03 10:25:00 martti Exp $ - ---- src/main.c (revision 25872) -+++ src/main.c (working copy) -@@ -178,7 +178,7 @@ - popup_windowlist(gscreen, button, evt->time); - return TRUE; - } else if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) { -- popup_desktop_menu(gscreen, button, evt->time); -+ popup_desktop_menu(gscreen, 0, evt->time); - return TRUE; - } - } diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile index f2898db946a..86094b84fac 100644 --- a/x11/xfce4-exo/Makefile +++ b/x11/xfce4-exo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $ +# $NetBSD: Makefile,v 1.2 2007/12/07 19:43:27 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.3.2 +XFCE4_VERSION= 0.3.4 DISTNAME= exo-${XFCE4_VERSION} PKGNAME= xfce4-exo-${XFCE4_VERSION} diff --git a/x11/xfce4-exo/PLIST b/x11/xfce4-exo/PLIST index 29715c76620..e4cff002ec1 100644 --- a/x11/xfce4-exo/PLIST +++ b/x11/xfce4-exo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/12/07 19:43:27 martti Exp $ bin/exo-csource bin/exo-desktop-item-edit bin/exo-eject @@ -45,10 +45,63 @@ libexec/exo-helper-0.3 man/man1/exo-csource.1 man/man1/exo-open.1 share/applications/exo-preferred-applications.desktop +share/gtk-doc/html/exo/ExoCellRendererIcon.html +share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html +share/gtk-doc/html/exo/ExoEllipsizedLabel.html +share/gtk-doc/html/exo/ExoIconBar.html +share/gtk-doc/html/exo/ExoIconChooserDialog.html +share/gtk-doc/html/exo/ExoIconView.html +share/gtk-doc/html/exo/ExoToolbarsEditor.html +share/gtk-doc/html/exo/ExoToolbarsEditorDialog.html +share/gtk-doc/html/exo/ExoToolbarsModel.html +share/gtk-doc/html/exo/ExoToolbarsView.html +share/gtk-doc/html/exo/ExoTreeView.html +share/gtk-doc/html/exo/ExoWrapTable.html +share/gtk-doc/html/exo/ExoXsessionClient.html +share/gtk-doc/html/exo/ch01.html +share/gtk-doc/html/exo/exo-Binding-Properties-Functions.html +share/gtk-doc/html/exo/exo-Executing-Applications.html +share/gtk-doc/html/exo/exo-Extensions-to-GObject.html +share/gtk-doc/html/exo/exo-Extensions-to-Gtk.html +share/gtk-doc/html/exo/exo-Extensions-to-Pango.html +share/gtk-doc/html/exo/exo-Extensions-to-gdk-pixbuf.html +share/gtk-doc/html/exo/exo-HAL-Support-Functions.html +share/gtk-doc/html/exo/exo-MD5-functions.html +share/gtk-doc/html/exo/exo-Miscellaneous-Utility-Functions.html +share/gtk-doc/html/exo/exo-Mount-Points.html +share/gtk-doc/html/exo/exo-Opening-URLs.html +share/gtk-doc/html/exo/exo-String-Utility-Functions.html +share/gtk-doc/html/exo/exo-Version-Information.html +share/gtk-doc/html/exo/exo-cell-renderers.html +share/gtk-doc/html/exo/exo-csource.html +share/gtk-doc/html/exo/exo-deprecated-widgets.html +share/gtk-doc/html/exo/exo-extensions.html +share/gtk-doc/html/exo/exo-gtk-file-chooser-add-thumbnail-preview.png +share/gtk-doc/html/exo/exo-icon-chooser-dialog.png +share/gtk-doc/html/exo/exo-miscelleanous.html +share/gtk-doc/html/exo/exo-overview.html +share/gtk-doc/html/exo/exo-toolbars-editor-dialog.png +share/gtk-doc/html/exo/exo-toolbars-editor.png +share/gtk-doc/html/exo/exo-toolbars-view.png +share/gtk-doc/html/exo/exo-toolbars.html +share/gtk-doc/html/exo/exo-tools.html +share/gtk-doc/html/exo/exo-widgets.html +share/gtk-doc/html/exo/exo-wrap-table.png +share/gtk-doc/html/exo/exo.devhelp +share/gtk-doc/html/exo/exo.devhelp2 +share/gtk-doc/html/exo/home.png +share/gtk-doc/html/exo/index.html +share/gtk-doc/html/exo/index.sgml +share/gtk-doc/html/exo/ix01.html +share/gtk-doc/html/exo/left.png +share/gtk-doc/html/exo/right.png +share/gtk-doc/html/exo/style.css +share/gtk-doc/html/exo/up.png share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png share/icons/hicolor/48x48/apps/applications-internet.png share/icons/hicolor/48x48/apps/applications-other.png share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png +share/locale/ar/LC_MESSAGES/libexo-0.3.mo share/locale/be/LC_MESSAGES/libexo-0.3.mo share/locale/ca/LC_MESSAGES/libexo-0.3.mo share/locale/cs/LC_MESSAGES/libexo-0.3.mo @@ -69,14 +122,20 @@ share/locale/it/LC_MESSAGES/libexo-0.3.mo share/locale/ja/LC_MESSAGES/libexo-0.3.mo share/locale/ka/LC_MESSAGES/libexo-0.3.mo share/locale/lt/LC_MESSAGES/libexo-0.3.mo +share/locale/lv/LC_MESSAGES/libexo-0.3.mo share/locale/mk/LC_MESSAGES/libexo-0.3.mo +share/locale/nb_NO/LC_MESSAGES/libexo-0.3.mo share/locale/nl/LC_MESSAGES/libexo-0.3.mo share/locale/pa/LC_MESSAGES/libexo-0.3.mo share/locale/pl/LC_MESSAGES/libexo-0.3.mo share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo +share/locale/pt_PT/LC_MESSAGES/libexo-0.3.mo share/locale/ro/LC_MESSAGES/libexo-0.3.mo share/locale/ru/LC_MESSAGES/libexo-0.3.mo +share/locale/sq/LC_MESSAGES/libexo-0.3.mo share/locale/sv/LC_MESSAGES/libexo-0.3.mo +share/locale/ur/LC_MESSAGES/libexo-0.3.mo +share/locale/zh_TW/LC_MESSAGES/libexo-0.3.mo share/pixmaps/exo-0.3/exo-thumbnail-frame.png share/xfce4/doc/C/exo-preferred-applications.html share/xfce4/doc/C/images/exo-preferred-applications-internet.png diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk index 71ed1dc12ab..41a59e53094 100644 --- a/x11/xfce4-exo/buildlink3.mk +++ b/x11/xfce4-exo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2007/12/07 19:43:27 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_EXO_BUILDLINK3_MK:= ${XFCE4_EXO_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-exo BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-exo .if ${XFCE4_EXO_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.2 +BUILDLINK_API_DEPENDS.xfce4-exo+= xfce4-exo>=0.3.4 BUILDLINK_PKGSRCDIR.xfce4-exo?= ../../x11/xfce4-exo .endif # XFCE4_EXO_BUILDLINK3_MK diff --git a/x11/xfce4-exo/distinfo b/x11/xfce4-exo/distinfo index 687278581e8..d4b3f494a36 100644 --- a/x11/xfce4-exo/distinfo +++ b/x11/xfce4-exo/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.2 2007/07/06 11:15:00 martti Exp $ +$NetBSD: distinfo,v 1.3 2007/12/07 19:43:27 martti Exp $ -SHA1 (exo-0.3.2.tar.bz2) = 3a9f65c093d0a81e0a76bd2e8cbcde9805194f3c -RMD160 (exo-0.3.2.tar.bz2) = 5281645f63f2195420ba8ba501eeb7bc39170df8 -Size (exo-0.3.2.tar.bz2) = 1121928 bytes -SHA1 (patch-aa) = dda3afe5dc27c1d4bdbb016a8c5c93e2ef5cee11 -SHA1 (patch-ab) = 7a7b8483f89dc3e09b24dda66b48a509ca3a2570 -SHA1 (patch-ac) = 4aa1d87b367dc89f9b09776a6547a48337998f10 -SHA1 (patch-ad) = 34c91f3c627602758bb93b95489df0ad54824e39 +SHA1 (exo-0.3.4.tar.bz2) = 4f7a3f46592fd0311be1f011f17431f211cc1fcb +RMD160 (exo-0.3.4.tar.bz2) = e021f030a624c522c819ec0f3a8682a1007ae748 +Size (exo-0.3.4.tar.bz2) = 1300127 bytes +SHA1 (patch-ad) = 44acc5846e1a2bb78ec5cde978747a3cd56bbd50 diff --git a/x11/xfce4-exo/patches/patch-aa b/x11/xfce4-exo/patches/patch-aa deleted file mode 100644 index 7ce8f9aa867..00000000000 --- a/x11/xfce4-exo/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $ - ---- configure.in 2007-01-20 14:05:43.000000000 +0000 -+++ configure.in 2007-01-22 15:43:57.000000000 +0000 -@@ -108,14 +108,14 @@ - locale.h math.h md5.h md5global.h mmintrin.h mntent.h \ - paths.h regex.h signal.h stdarg.h string.h sys/mman.h \ - sys/mnttab.h sys/mount.h sys/param.h sys/resource.h \ -- sys/stat.h sys/time.h sys/types.h sys/ucred.h \ -- sys/wait.h time.h]) -+ sys/statvfs.h sys/stat.h sys/time.h sys/types.h \ -+ sys/ucred.h sys/wait.h time.h]) - - dnl ************************************ - dnl *** Check for standard functions *** - dnl ************************************ - AC_FUNC_MMAP() --AC_CHECK_FUNCS([getfsstat getmntent regexec setfsent setmntent]) -+AC_CHECK_FUNCS([getvfsstat getfsstat getmntent regexec setfsent setmntent]) - - dnl ****************************************** - dnl *** Check for Message Digest functions *** diff --git a/x11/xfce4-exo/patches/patch-ab b/x11/xfce4-exo/patches/patch-ab deleted file mode 100644 index c78fd14393a..00000000000 --- a/x11/xfce4-exo/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $ - ---- configure.orig 2007-01-22 16:16:38.000000000 +0000 -+++ configure 2007-01-22 16:17:24.000000000 +0000 -@@ -21769,4 +21770,4 @@ - sys/mnttab.h sys/mount.h sys/param.h sys/resource.h \ -- sys/stat.h sys/time.h sys/types.h sys/ucred.h \ -- sys/wait.h time.h -+ sys/statvfs.h sys/stat.h sys/time.h sys/types.h \ -+ sys/ucred.h sys/wait.h time.h - do -@@ -22346,3 +22347,4 @@ - --for ac_func in getfsstat getmntent regexec setfsent setmntent -+ -+for ac_func in getvfsstat getfsstat getmntent regexec setfsent setmntent - do diff --git a/x11/xfce4-exo/patches/patch-ac b/x11/xfce4-exo/patches/patch-ac deleted file mode 100644 index 7a89ac1284f..00000000000 --- a/x11/xfce4-exo/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2007/04/12 09:50:50 martti Exp $ - ---- config.h.in.orig 2007-01-22 16:22:10.000000000 +0000 -+++ config.h.in 2007-01-22 16:22:28.000000000 +0000 -@@ -30,6 +30,9 @@ - /* Define to 1 if you have the <fstab.h> header file. */ - #undef HAVE_FSTAB_H - -+/* Define to 1 if you have the `getvfsstat' function. */ -+#undef HAVE_GETVFSSTAT -+ - /* Define to 1 if you have the `getfsstat' function. */ - #undef HAVE_GETFSSTAT - diff --git a/x11/xfce4-exo/patches/patch-ad b/x11/xfce4-exo/patches/patch-ad index c2f2d3a6003..4a19df64082 100644 --- a/x11/xfce4-exo/patches/patch-ad +++ b/x11/xfce4-exo/patches/patch-ad @@ -1,54 +1,86 @@ ---- exo/exo-mount-point.c.orig 2007-01-20 15:58:22.000000000 +0200 -+++ exo/exo-mount-point.c 2007-07-06 14:10:50.000000000 +0300 -@@ -25,6 +25,9 @@ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif -+#ifdef HAVE_SYS_STATVFS_H -+#include <sys/statvfs.h> -+#endif - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif -@@ -38,6 +41,7 @@ - #include <sys/mount.h> - #endif - #ifdef HAVE_SYS_MNTTAB_H -+#include <stdio.h> - #include <sys/mnttab.h> - #endif - -@@ -250,6 +254,33 @@ +$NetBSD: patch-ad,v 1.3 2007/12/07 19:43:29 martti Exp $ + +--- exo/exo-mount-point.c.orig 2007-12-04 11:46:28.000000000 +0000 ++++ exo/exo-mount-point.c 2007-12-04 11:52:46.000000000 +0000 +@@ -253,57 +253,57 @@ /* close the file handle */ fclose (fp); -+#elif defined(HAVE_GETVFSSTAT) +-#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */ +- struct statfs *mntbuf = NULL; +- glong bufsize = 0; +- gint mntsize; +- gint n; ++#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */ + struct statvfs *mntbuf = NULL; + glong bufsize = 0; + gint mntsize; + gint n; -+ -+ /* determine the number of active mount points */ -+ mntsize = getvfsstat(NULL, 0, MNT_NOWAIT); -+ if (G_LIKELY(mntsize > 0)) { -+ /* allocate a new buffer */ -+ bufsize = (mntsize + 4) * sizeof(*mntbuf); -+ mntbuf = (struct statvfs *)malloc(bufsize); -+ -+ /* determine the mount point for the device file */ -+ mntsize = getvfsstat(mntbuf, bufsize, ST_NOWAIT); -+ for (n = 0; n < mntsize; ++n) { -+ /* check if we have a match here */ -+ exo_mount_point_add_if_matches(mask, device, folder, fstype, -+ mntbuf[n].f_mntfromname, -+ mntbuf[n].f_mntonname, -+ mntbuf[n].f_fstypename, -+ ((mntbuf[n].f_flag & MNT_RDONLY) != 0), -+ &mount_points); -+ } -+ /* release the buffer */ -+ free(mntbuf); -+ } - #elif defined(HAVE_GETFSSTAT) /* BSD */ - struct statfs *mntbuf = NULL; - glong bufsize = 0; + + /* determine the number of active mount points */ +- mntsize = getfsstat (NULL, 0, MNT_NOWAIT); ++ mntsize = getvfsstat (NULL, 0, MNT_NOWAIT); + if (G_LIKELY (mntsize > 0)) + { + /* allocate a new buffer */ + bufsize = (mntsize + 4) * sizeof (*mntbuf); +- mntbuf = (struct statfs *) malloc (bufsize); ++ mntbuf = (struct statvfs *) malloc (bufsize); + + /* determine the mount point for the device file */ +- mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT); ++ mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT); + for (n = 0; n < mntsize; ++n) + { + /* check if we have a match here */ +- exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname, +- mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points); ++ exo_mount_point_add_if_matches (mask, device, folder, fstype, ++ mntbuf[n].f_mntfromname, ++ mntbuf[n].f_mntonname, ++ mntbuf[n].f_fstypename, ++ ((mntbuf[n].f_flag & MNT_RDONLY) != 0), ++ &mount_points); + } + + /* release the buffer */ + free (mntbuf); + } +-#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */ +- struct statvfs *mntbuf = NULL; +- glong bufsize = 0; +- gint mntsize; +- gint n; ++#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */ ++ struct statfs *mntbuf = NULL; ++ glong bufsize = 0; ++ gint mntsize; ++ gint n; + + /* determine the number of active mount points */ +- mntsize = getvfsstat (NULL, 0, MNT_NOWAIT); ++ mntsize = getfsstat (NULL, 0, MNT_NOWAIT); + if (G_LIKELY (mntsize > 0)) + { + /* allocate a new buffer */ + bufsize = (mntsize + 4) * sizeof (*mntbuf); +- mntbuf = (struct statvfs *) malloc (bufsize); ++ mntbuf = (struct statfs *) malloc (bufsize); + + /* determine the mount point for the device file */ +- mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT); ++ mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT); + for (n = 0; n < mntsize; ++n) + { + /* check if we have a match here */ +- exo_mount_point_add_if_matches (mask, device, folder, fstype, +- mntbuf[n].f_mntfromname, +- mntbuf[n].f_mntonname, +- mntbuf[n].f_fstypename, +- ((mntbuf[n].f_flag & MNT_RDONLY) != 0), +- &mount_points); ++ exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname, ++ mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points); + } + + /* release the buffer */ diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile index a5e21e2be05..40ac9736043 100644 --- a/x11/xfce4-gtk2-engine/Makefile +++ b/x11/xfce4-gtk2-engine/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2007/04/12 09:55:22 martti Exp $ +# $NetBSD: Makefile,v 1.8 2007/12/07 19:43:29 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 2.4.1 +XFCE4_VERSION= 2.4.2 DISTNAME= gtk-xfce-engine-${XFCE4_VERSION} PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION} diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk index 21d71960aa7..ad505e3f929 100644 --- a/x11/xfce4-gtk2-engine/buildlink3.mk +++ b/x11/xfce4-gtk2-engine/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/04/12 09:55:22 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2007/12/07 19:43:29 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-gtk2-engine BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-gtk2-engine .if ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.4.1 +BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.4.2 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine .endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK diff --git a/x11/xfce4-gtk2-engine/distinfo b/x11/xfce4-gtk2-engine/distinfo index d629c1819a8..2b575ca64e6 100644 --- a/x11/xfce4-gtk2-engine/distinfo +++ b/x11/xfce4-gtk2-engine/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2007/04/12 09:55:22 martti Exp $ +$NetBSD: distinfo,v 1.4 2007/12/07 19:43:29 martti Exp $ -SHA1 (gtk-xfce-engine-2.4.1.tar.bz2) = a28a59c704ba66aa30be2c8ed03ba1bf0eaf1ad9 -RMD160 (gtk-xfce-engine-2.4.1.tar.bz2) = 0ccb8e72ed372007fcf1f63bd3bcac0ee87d3d2b -Size (gtk-xfce-engine-2.4.1.tar.bz2) = 271644 bytes +SHA1 (gtk-xfce-engine-2.4.2.tar.bz2) = 67fb4959ec0be46ec0ac472ab1af74361b7d9be5 +RMD160 (gtk-xfce-engine-2.4.2.tar.bz2) = a8801ac518665f0d9d832732a97b52a6726a96e0 +Size (gtk-xfce-engine-2.4.2.tar.bz2) = 264252 bytes diff --git a/x11/xfce4-mcs-manager/PLIST b/x11/xfce4-mcs-manager/PLIST index 1635f777393..34516ac7a41 100644 --- a/x11/xfce4-mcs-manager/PLIST +++ b/x11/xfce4-mcs-manager/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.15 2007/04/12 09:55:22 martti Exp $ +@comment $NetBSD: PLIST,v 1.16 2007/12/07 19:43:29 martti Exp $ bin/xfce-mcs-manager bin/xfce-setting-show include/xfce4/xfce-mcs-manager/manager-plugin.h lib/pkgconfig/xfce-mcs-manager.pc share/applications/xfce-settings-manager.desktop share/icons/hicolor/48x48/apps/xfce4-settings.png +share/locale/am/LC_MESSAGES/xfce-mcs-manager.mo share/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo share/locale/az/LC_MESSAGES/xfce-mcs-manager.mo share/locale/be/LC_MESSAGES/xfce-mcs-manager.mo @@ -34,6 +35,7 @@ share/locale/ja/LC_MESSAGES/xfce-mcs-manager.mo share/locale/ka/LC_MESSAGES/xfce-mcs-manager.mo share/locale/ko/LC_MESSAGES/xfce-mcs-manager.mo share/locale/lt/LC_MESSAGES/xfce-mcs-manager.mo +share/locale/lv/LC_MESSAGES/xfce-mcs-manager.mo share/locale/mk/LC_MESSAGES/xfce-mcs-manager.mo share/locale/mr/LC_MESSAGES/xfce-mcs-manager.mo share/locale/ms/LC_MESSAGES/xfce-mcs-manager.mo diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk index 2cb07b1def6..0184dd3c75a 100644 --- a/x11/xfce4-mcs-manager/buildlink3.mk +++ b/x11/xfce4-mcs-manager/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:22 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2007/12/07 19:43:29 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-mcs-manager BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-manager .if ${XFCE4_MCS_MANAGER_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.4.1 +BUILDLINK_API_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.4.2 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager .endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK diff --git a/x11/xfce4-mcs-manager/distinfo b/x11/xfce4-mcs-manager/distinfo index 49db3e62437..fc0412769e1 100644 --- a/x11/xfce4-mcs-manager/distinfo +++ b/x11/xfce4-mcs-manager/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.14 2007/04/12 09:55:22 martti Exp $ +$NetBSD: distinfo,v 1.15 2007/12/07 19:43:29 martti Exp $ -SHA1 (xfce-mcs-manager-4.4.1.tar.bz2) = c03e83ebe5a315aa2a1333624cd2f04dafba6a15 -RMD160 (xfce-mcs-manager-4.4.1.tar.bz2) = 5c2c7259f10f51c4456e15677aef089394e61df6 -Size (xfce-mcs-manager-4.4.1.tar.bz2) = 653240 bytes +SHA1 (xfce-mcs-manager-4.4.2.tar.bz2) = 0fccebcd65bd547b29a2e497793d5d9055760ef1 +RMD160 (xfce-mcs-manager-4.4.2.tar.bz2) = a2b05674bc52d12dd0d2bc12cf32c57b1122f42b +Size (xfce-mcs-manager-4.4.2.tar.bz2) = 634994 bytes diff --git a/x11/xfce4-mcs-plugins/PLIST b/x11/xfce4-mcs-plugins/PLIST index 347e8630ff1..0e70b76cc6d 100644 --- a/x11/xfce4-mcs-plugins/PLIST +++ b/x11/xfce4-mcs-plugins/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2007/04/12 09:55:22 martti Exp $ +@comment $NetBSD: PLIST,v 1.15 2007/12/07 19:43:30 martti Exp $ lib/xfce4/mcs-plugins/display_plugin.la lib/xfce4/mcs-plugins/fm_plugin.la lib/xfce4/mcs-plugins/keyboard_plugin.la @@ -17,6 +17,7 @@ share/icons/hicolor/scalable/apps/xfce4-display.svg share/icons/hicolor/scalable/apps/xfce4-keyboard.svg share/icons/hicolor/scalable/apps/xfce4-mouse.svg share/icons/hicolor/scalable/apps/xfce4-ui.svg +share/locale/am/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/az/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/be/LC_MESSAGES/xfce-mcs-plugins.mo @@ -46,9 +47,11 @@ share/locale/ja/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/ka/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/ko/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/lt/LC_MESSAGES/xfce-mcs-plugins.mo +share/locale/lv/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/mk/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/mr/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/ms/LC_MESSAGES/xfce-mcs-plugins.mo +share/locale/nb_NO/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/nl/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/pa/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/pl/LC_MESSAGES/xfce-mcs-plugins.mo diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk index d29134b9655..b27901b3cef 100644 --- a/x11/xfce4-mcs-plugins/buildlink3.mk +++ b/x11/xfce4-mcs-plugins/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:22 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2007/12/07 19:43:30 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-mcs-plugins BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-plugins .if ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.4.1 +BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.4.2 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins .endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK diff --git a/x11/xfce4-mcs-plugins/distinfo b/x11/xfce4-mcs-plugins/distinfo index 1188697a339..f5942cd47af 100644 --- a/x11/xfce4-mcs-plugins/distinfo +++ b/x11/xfce4-mcs-plugins/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.14 2007/04/12 09:55:23 martti Exp $ +$NetBSD: distinfo,v 1.15 2007/12/07 19:43:30 martti Exp $ -SHA1 (xfce-mcs-plugins-4.4.1.tar.bz2) = 50b5e82e67ab76e24ed232e6302a1430a902cd08 -RMD160 (xfce-mcs-plugins-4.4.1.tar.bz2) = 45507d0a3d46a21804250e8373a77098d1e52c2b -Size (xfce-mcs-plugins-4.4.1.tar.bz2) = 876128 bytes +SHA1 (xfce-mcs-plugins-4.4.2.tar.bz2) = c44cb09e081366a0fbe88dcaa85b4fdd4307d0da +RMD160 (xfce-mcs-plugins-4.4.2.tar.bz2) = 4a32448ba52fca491fe398948f5f85e210333868 +Size (xfce-mcs-plugins-4.4.2.tar.bz2) = 811156 bytes diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index c609598f6bf..59b28475dbc 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2007/04/12 09:55:23 martti Exp $ +# $NetBSD: Makefile,v 1.31 2007/12/07 19:43:30 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" .include "../../mk/compiler.mk" @@ -8,7 +8,7 @@ DISTNAME= xfce4-panel-${XFCE4_VERSION} CATEGORIES= x11 COMMENT= Xfce panel -CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc PKGCONFIG_OVERRIDE= panel/xfce4-panel-1.0.pc.in PTHREAD_AUTO_VARS= yes @@ -24,6 +24,10 @@ SUBST_SED.launcher= -e 's|-O |-O0 |g' SUBST_SED.launcher+= -e 's|-O[123s] |-O0 |g' .endif +post-install: + @${ECHO} "Removing the dummy files" + rm -f ${PREFIX}/bin/xfce4-iconbox ${PREFIX}/bin/xftaskbar4 + .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST index acdabcec2c9..3b9bb7a3701 100644 --- a/x11/xfce4-panel/PLIST +++ b/x11/xfce4-panel/PLIST @@ -1,8 +1,6 @@ -@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:23 martti Exp $ -bin/xfce4-iconbox +@comment $NetBSD: PLIST,v 1.17 2007/12/07 19:43:30 martti Exp $ bin/xfce4-panel bin/xfce4-popup-windowlist -bin/xftaskbar4 etc/xdg/xfce4/panel/clock-14.rc etc/xdg/xfce4/panel/launcher-10.rc etc/xdg/xfce4/panel/launcher-7.rc @@ -66,6 +64,7 @@ share/icons/hicolor/48x48/apps/xfce-mouse.png share/icons/hicolor/48x48/apps/xfce4-iconbox.png share/icons/hicolor/48x48/apps/xfce4-panel.png share/icons/hicolor/48x48/apps/xfce4-taskbar.png +share/locale/am/LC_MESSAGES/xfce4-panel.mo share/locale/ar/LC_MESSAGES/xfce4-panel.mo share/locale/az/LC_MESSAGES/xfce4-panel.mo share/locale/be/LC_MESSAGES/xfce4-panel.mo @@ -96,6 +95,7 @@ share/locale/ja/LC_MESSAGES/xfce4-panel.mo share/locale/ka/LC_MESSAGES/xfce4-panel.mo share/locale/ko/LC_MESSAGES/xfce4-panel.mo share/locale/lt/LC_MESSAGES/xfce4-panel.mo +share/locale/lv/LC_MESSAGES/xfce4-panel.mo share/locale/mk/LC_MESSAGES/xfce4-panel.mo share/locale/mr/LC_MESSAGES/xfce4-panel.mo share/locale/ms/LC_MESSAGES/xfce4-panel.mo diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk index 67d2bf45c6a..888b8846714 100644 --- a/x11/xfce4-panel/buildlink3.mk +++ b/x11/xfce4-panel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:23 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2007/12/07 19:43:30 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_PANEL_BUILDLINK3_MK:= ${XFCE4_PANEL_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-panel BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-panel .if ${XFCE4_PANEL_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.4.1 +BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.4.2 BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel .endif # XFCE4_PANEL_BUILDLINK3_MK diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo index 197e1fa2252..6754b7b8826 100644 --- a/x11/xfce4-panel/distinfo +++ b/x11/xfce4-panel/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.15 2007/04/12 09:55:23 martti Exp $ +$NetBSD: distinfo,v 1.16 2007/12/07 19:43:30 martti Exp $ -SHA1 (xfce4-panel-4.4.1.tar.bz2) = 5a0ca0dee7f8d525120f65cc8fd199a3e673f60c -RMD160 (xfce4-panel-4.4.1.tar.bz2) = 53d804b18b363e3571d065435163a6f74df6b3ed -Size (xfce4-panel-4.4.1.tar.bz2) = 767669 bytes +SHA1 (xfce4-panel-4.4.2.tar.bz2) = f66a5f46abc21324e5a375e52a37b98757eae121 +RMD160 (xfce4-panel-4.4.2.tar.bz2) = 6bcbc27d3de95d631ee3f556cf79ed89450769eb +Size (xfce4-panel-4.4.2.tar.bz2) = 757724 bytes diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST index 9d12f916286..438e6a372fc 100644 --- a/x11/xfce4-session/PLIST +++ b/x11/xfce4-session/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2007/04/12 09:55:24 martti Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/12/07 19:43:30 martti Exp $ bin/xfce4-autostart-editor bin/xfce4-session bin/xfce4-session-logout @@ -33,6 +33,7 @@ share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png share/icons/hicolor/72x72/apps/xfsm-trash-normal.png share/icons/hicolor/scalable/apps/xfce4-session.svg share/icons/hicolor/scalable/apps/xfsm-shutdown.svg +share/locale/am/LC_MESSAGES/xfce4-session.mo share/locale/ar/LC_MESSAGES/xfce4-session.mo share/locale/az/LC_MESSAGES/xfce4-session.mo share/locale/be/LC_MESSAGES/xfce4-session.mo @@ -61,6 +62,7 @@ share/locale/ja/LC_MESSAGES/xfce4-session.mo share/locale/ka/LC_MESSAGES/xfce4-session.mo share/locale/ko/LC_MESSAGES/xfce4-session.mo share/locale/lt/LC_MESSAGES/xfce4-session.mo +share/locale/lv/LC_MESSAGES/xfce4-session.mo share/locale/mk/LC_MESSAGES/xfce4-session.mo share/locale/mr/LC_MESSAGES/xfce4-session.mo share/locale/ms/LC_MESSAGES/xfce4-session.mo diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk index 898c06f97f1..06cf1418cda 100644 --- a/x11/xfce4-session/buildlink3.mk +++ b/x11/xfce4-session/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:24 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2007/12/07 19:43:30 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-session BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session .if ${XFCE4_SESSION_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.1 +BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.2 BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session .endif # XFCE4_SESSION_BUILDLINK3_MK diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index 6e6319328d3..36a431e4971 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2007/04/12 09:55:24 martti Exp $ +$NetBSD: distinfo,v 1.9 2007/12/07 19:43:30 martti Exp $ -SHA1 (xfce4-session-4.4.1.tar.bz2) = 05a47d55830a9f9b91498a6a3fd1bf3eb197d42a -RMD160 (xfce4-session-4.4.1.tar.bz2) = 76450c7b53d6b81d378649d52035dcbd3d68a999 -Size (xfce4-session-4.4.1.tar.bz2) = 1289278 bytes +SHA1 (xfce4-session-4.4.2.tar.bz2) = 576d0515257354d1d9da646fcf29d0dc9b5065db +RMD160 (xfce4-session-4.4.2.tar.bz2) = 9dff9a44b458f98d498da5c2b65056d1d3cdbcea +Size (xfce4-session-4.4.2.tar.bz2) = 1252395 bytes SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195 diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile index 15409e98582..5427ed9b0d4 100644 --- a/x11/xfce4-terminal/Makefile +++ b/x11/xfce4-terminal/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:45 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2007/12/07 19:43:31 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.2.6 +XFCE4_VERSION= 0.2.8 DISTNAME= Terminal-${XFCE4_VERSION} PKGNAME= xfce4-terminal-${XFCE4_VERSION} -PKGREVISION= 2 +#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce terminal emulator diff --git a/x11/xfce4-terminal/PLIST b/x11/xfce4-terminal/PLIST index 21a3822c5a6..1779e1bc814 100644 --- a/x11/xfce4-terminal/PLIST +++ b/x11/xfce4-terminal/PLIST @@ -1,28 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/04/12 09:51:20 martti Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/12/07 19:43:31 martti Exp $ bin/Terminal bin/terminal libexec/TerminalHelp man/man1/Terminal.1 share/Terminal/Terminal-toolbars.ui -share/Terminal/Terminal.ui -share/Terminal/apps/balsa.desktop -share/Terminal/apps/epiphany.desktop -share/Terminal/apps/evolution.desktop -share/Terminal/apps/exo-open-browser.desktop -share/Terminal/apps/exo-open-mailer.desktop -share/Terminal/apps/firefox.desktop -share/Terminal/apps/galeon.desktop -share/Terminal/apps/kmail.desktop -share/Terminal/apps/konqueror.desktop -share/Terminal/apps/lynx.desktop -share/Terminal/apps/mozilla-browser.desktop -share/Terminal/apps/mozilla-mailer.desktop -share/Terminal/apps/mutt.desktop -share/Terminal/apps/opera-browser.desktop -share/Terminal/apps/opera-mailer.desktop -share/Terminal/apps/sensible-browser.desktop -share/Terminal/apps/sylpheed-claws.desktop -share/Terminal/apps/thunderbird.desktop share/applications/Terminal.desktop share/doc/Terminal/C/advanced.html share/doc/Terminal/C/copyright.html @@ -45,9 +26,31 @@ share/doc/Terminal/C/images/terminal-set-title.png share/doc/Terminal/C/images/terminal-toolbars.png share/doc/Terminal/C/index.html share/doc/Terminal/C/preferences.html -share/doc/Terminal/C/preferred-applications.html share/doc/Terminal/C/support.html share/doc/Terminal/C/usage.html +share/doc/Terminal/fr/advanced.html +share/doc/Terminal/fr/copyright.html +share/doc/Terminal/fr/faq.html +share/doc/Terminal/fr/getting-started.html +share/doc/Terminal/fr/images/terminal-applications-dialog.png +share/doc/Terminal/fr/images/terminal-applications-menu.png +share/doc/Terminal/fr/images/terminal-choose-custom-webbrowser.png +share/doc/Terminal/fr/images/terminal-compose-shortcut.png +share/doc/Terminal/fr/images/terminal-edit-applications.png +share/doc/Terminal/fr/images/terminal-edit-preferences.png +share/doc/Terminal/fr/images/terminal-first-time.png +share/doc/Terminal/fr/images/terminal-multiple-tabs.png +share/doc/Terminal/fr/images/terminal-preferences-advanced.png +share/doc/Terminal/fr/images/terminal-preferences-appearance.png +share/doc/Terminal/fr/images/terminal-preferences-colors.png +share/doc/Terminal/fr/images/terminal-preferences-general.png +share/doc/Terminal/fr/images/terminal-preferences-shortcuts.png +share/doc/Terminal/fr/images/terminal-set-title.png +share/doc/Terminal/fr/images/terminal-toolbars.png +share/doc/Terminal/fr/index.html +share/doc/Terminal/fr/preferences.html +share/doc/Terminal/fr/support.html +share/doc/Terminal/fr/usage.html share/doc/Terminal/ja/advanced.html share/doc/Terminal/ja/copyright.html share/doc/Terminal/ja/faq.html @@ -69,7 +72,6 @@ share/doc/Terminal/ja/images/terminal-set-title.png share/doc/Terminal/ja/images/terminal-toolbars.png share/doc/Terminal/ja/index.html share/doc/Terminal/ja/preferences.html -share/doc/Terminal/ja/preferred-applications.html share/doc/Terminal/ja/support.html share/doc/Terminal/ja/usage.html share/doc/Terminal/terminal.css @@ -92,10 +94,9 @@ share/icons/hicolor/48x48/stock/navigation/stock_terminal-appearance.png share/icons/hicolor/48x48/stock/navigation/stock_terminal-colors.png share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png share/icons/hicolor/48x48/stock/navigation/stock_terminal-general.png -share/icons/hicolor/48x48/stock/navigation/stock_terminal-mailreader.png share/icons/hicolor/48x48/stock/navigation/stock_terminal-shortcuts.png -share/icons/hicolor/48x48/stock/navigation/stock_terminal-webbrowser.png share/icons/hicolor/scalable/apps/Terminal.svg +share/locale/ar/LC_MESSAGES/Terminal.mo share/locale/be/LC_MESSAGES/Terminal.mo share/locale/ca/LC_MESSAGES/Terminal.mo share/locale/cs/LC_MESSAGES/Terminal.mo @@ -115,22 +116,30 @@ share/locale/it/LC_MESSAGES/Terminal.mo share/locale/ja/LC_MESSAGES/Terminal.mo share/locale/ko/LC_MESSAGES/Terminal.mo share/locale/lt/LC_MESSAGES/Terminal.mo +share/locale/lv/LC_MESSAGES/Terminal.mo +share/locale/nb_NO/LC_MESSAGES/Terminal.mo share/locale/nl/LC_MESSAGES/Terminal.mo share/locale/pa/LC_MESSAGES/Terminal.mo share/locale/pl/LC_MESSAGES/Terminal.mo share/locale/pt_BR/LC_MESSAGES/Terminal.mo +share/locale/pt_PT/LC_MESSAGES/Terminal.mo +share/locale/ro/LC_MESSAGES/Terminal.mo share/locale/ru/LC_MESSAGES/Terminal.mo share/locale/sk/LC_MESSAGES/Terminal.mo +share/locale/sq/LC_MESSAGES/Terminal.mo share/locale/sv/LC_MESSAGES/Terminal.mo +share/locale/tr/LC_MESSAGES/Terminal.mo share/locale/uk/LC_MESSAGES/Terminal.mo +share/locale/ur/LC_MESSAGES/Terminal.mo share/locale/vi/LC_MESSAGES/Terminal.mo share/locale/zh_CN/LC_MESSAGES/Terminal.mo share/locale/zh_TW/LC_MESSAGES/Terminal.mo share/pixmaps/terminal.xpm @dirrm share/doc/Terminal/ja/images @dirrm share/doc/Terminal/ja +@dirrm share/doc/Terminal/fr/images +@dirrm share/doc/Terminal/fr @dirrm share/doc/Terminal/C/images @dirrm share/doc/Terminal/C @dirrm share/doc/Terminal -@dirrm share/Terminal/apps @dirrm share/Terminal diff --git a/x11/xfce4-terminal/buildlink3.mk b/x11/xfce4-terminal/buildlink3.mk index 8cc0a4ec25a..04ca08bd501 100644 --- a/x11/xfce4-terminal/buildlink3.mk +++ b/x11/xfce4-terminal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/08/23 09:24:57 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2007/12/07 19:43:31 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_TERMINAL_BUILDLINK3_MK:= ${XFCE4_TERMINAL_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-terminal BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-terminal .if ${XFCE4_TERMINAL_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-terminal+= xfce4-terminal>=0.2.6nb1 +BUILDLINK_API_DEPENDS.xfce4-terminal+= xfce4-terminal>=0.2.8 BUILDLINK_PKGSRCDIR.xfce4-terminal?= ../../x11/xfce4-terminal .endif # XFCE4_TERMINAL_BUILDLINK3_MK diff --git a/x11/xfce4-terminal/distinfo b/x11/xfce4-terminal/distinfo index cd7f5b5bdf0..4a0d91db27e 100644 --- a/x11/xfce4-terminal/distinfo +++ b/x11/xfce4-terminal/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2007/08/23 09:24:57 martti Exp $ +$NetBSD: distinfo,v 1.3 2007/12/07 19:43:31 martti Exp $ -SHA1 (Terminal-0.2.6.tar.bz2) = 8851179492c4768a1a53d2424d7a7c8b1a873c58 -RMD160 (Terminal-0.2.6.tar.bz2) = 0e1bcb66b83a92044eae891c35cc3750918ca83e -Size (Terminal-0.2.6.tar.bz2) = 1582076 bytes -SHA1 (patch-aa) = f08cf609852fbf1ce81fb9066dfaa1338dbea85b +SHA1 (Terminal-0.2.8.tar.bz2) = 9c4ae0422dea8161aa72659d3bd1b035688d70d7 +RMD160 (Terminal-0.2.8.tar.bz2) = 49bf87091ef39011dc9111439a939a52f19771fe +Size (Terminal-0.2.8.tar.bz2) = 1908459 bytes diff --git a/x11/xfce4-terminal/patches/patch-aa b/x11/xfce4-terminal/patches/patch-aa deleted file mode 100644 index 682ac00f5a3..00000000000 --- a/x11/xfce4-terminal/patches/patch-aa +++ /dev/null @@ -1,214 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2007/08/23 09:24:57 martti Exp $ - -Patch for http://bugzilla.xfce.org/show_bug.cgi?id=3383 - ---- helpers/balsa.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/balsa.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=balsa - X-Terminal-Category=MailReader --X-Terminal-Command=%B -m "mailto:%u" -+X-Terminal-Command=%B -m mailto:%u - ---- helpers/epiphany.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/epiphany.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=epiphany; - X-Terminal-Category=WebBrowser --X-Terminal-Command=%B "%u" -+X-Terminal-Command=%B %u - ---- helpers/evolution.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/evolution.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution; - X-Terminal-Category=MailReader --X-Terminal-Command=%B "mailto:%u" -+X-Terminal-Command=%B mailto:%u - ---- helpers/exo-open-browser.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/exo-open-browser.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=exo-open - X-Terminal-Category=WebBrowser --X-Terminal-Command=%B --launch WebBrowser "%u" -+X-Terminal-Command=%B --launch WebBrowser %u - ---- helpers/exo-open-mailer.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/exo-open-mailer.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=exo-open - X-Terminal-Category=MailReader --X-Terminal-Command=%B --launch MailReader "%u" -+X-Terminal-Command=%B --launch MailReader %u - ---- helpers/firefox.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/firefox.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox; - X-Terminal-Category=WebBrowser --X-Terminal-Command=%B -remote "openURL(%u)" || %B "%u" -+X-Terminal-Command=%B -remote openURL\(%u\) || %B %u - ---- helpers/galeon.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/galeon.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=galeon; - X-Terminal-Category=WebBrowser --X-Terminal-Command=%B "%u" -+X-Terminal-Command=%B %u - ---- helpers/kmail.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/kmail.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=kmail; - X-Terminal-Category=MailReader --X-Terminal-Command=%B "%u" -+X-Terminal-Command=%B %u - ---- helpers/konqueror.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/konqueror.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,6 +5,6 @@ - Type=Application - X-Terminal-Binaries=konqueror; - X-Terminal-Category=WebBrowser --X-Terminal-Command=%B "%u" -+X-Terminal-Command=%B %u - - - ---- helpers/lynx.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/lynx.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=lynx; - X-Terminal-Category=WebBrowser --X-Terminal-Command=Terminal -x %B "%u" -+X-Terminal-Command=Terminal -x %B %u - ---- helpers/mozilla-browser.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/mozilla-browser.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk; - X-Terminal-Category=WebBrowser --X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u" -+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u - ---- helpers/mozilla-mailer.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/mozilla-mailer.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk; - X-Terminal-Category=MailReader --X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u" -+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u - ---- helpers/mutt.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/mutt.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=mutt; - X-Terminal-Category=MailReader --X-Terminal-Command=Terminal -x %B "%u" -+X-Terminal-Command=Terminal -x %B %u - ---- helpers/opera-browser.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/opera-browser.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=opera; - X-Terminal-Category=WebBrowser --X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u" -+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u - ---- helpers/opera-mailer.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/opera-mailer.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=opera; - X-Terminal-Category=MailReader --X-Terminal-Command=%B -remote "openURL(mailto:%u)" || %B "mailto:%u" -+X-Terminal-Command=%B -remote openURL\(mailto:%u\) || %B mailto:%u - ---- helpers/sensible-browser.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/sensible-browser.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=sensible-browser - X-Terminal-Category=WebBrowser --X-Terminal-Command=%B "%u" -+X-Terminal-Command=%B %u - ---- helpers/sylpheed-claws.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/sylpheed-claws.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -7,4 +7,4 @@ - StartupNotify=true - X-Terminal-Binaries=sylpheed-claws; - X-Terminal-Category=MailReader --X-Terminal-Command=%B --compose "%u" -+X-Terminal-Command=%B --compose %u - ---- helpers/thunderbird.desktop.in 2007-01-20 16:30:46.000000000 +0200 -+++ Terminal-0.2.6.patched/helpers/thunderbird.desktop.in 2007-08-14 09:12:57.000000000 +0300 -@@ -5,4 +5,4 @@ - Type=Application - X-Terminal-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird; - X-Terminal-Category=MailReader --X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u" -+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u - ---- terminal/terminal-helper.c 2007-01-20 16:30:51.000000000 +0200 -+++ Terminal-0.2.6.patched/terminal/terminal-helper.c 2007-08-14 09:17:20.000000000 +0300 -@@ -349,6 +349,8 @@ - gchar *argv[4]; - gchar *command; - gchar *t; -+ gchar *escaped; -+ gchar **parts; - guint n; - - g_return_if_fail (TERMINAL_IS_HELPER (helper)); -@@ -359,6 +361,12 @@ - if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u') - ++n; - -+ parts = g_strsplit (uri, "$", 0); -+ -+ escaped = g_shell_quote (g_strjoinv("\$", parts)); -+ -+ g_strfreev (parts); -+ - if (n > 0) - { - command = g_new (gchar, strlen (helper->command) + n * strlen (uri) + 1); -@@ -366,7 +374,7 @@ - { - if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u') - { -- for (u = uri; *u != '\0'; ) -+ for (u = escaped; *u != '\0'; ) - *t++ = *u++; - s += 2; - } -@@ -379,9 +387,11 @@ - } - else - { -- command = g_strconcat (helper->command, " ", uri, NULL); -+ command = g_strconcat (helper->command, " ", escaped, NULL); - } - -+ g_free (escaped); -+ - argv[0] = "/bin/sh"; - argv[1] = "-c"; - argv[2] = command; diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST index b2f473e4b53..53a4c96201d 100644 --- a/x11/xfce4-utils/PLIST +++ b/x11/xfce4-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:26 martti Exp $ +@comment $NetBSD: PLIST,v 1.17 2007/12/07 19:43:31 martti Exp $ bin/startxfce4 bin/xfbrowser4 bin/xfce4-about @@ -7,9 +7,11 @@ bin/xflock4 bin/xfmountdev4 bin/xfrun4 bin/xfterm4 +share/examples/xfce4/Xft.xrdb share/examples/xfce4/xinitrc share/icons/hicolor/48x48/apps/xfce4-logo.png share/locale/af/LC_MESSAGES/xfce-utils.mo +share/locale/am/LC_MESSAGES/xfce-utils.mo share/locale/ar/LC_MESSAGES/xfce-utils.mo share/locale/az/LC_MESSAGES/xfce-utils.mo share/locale/be/LC_MESSAGES/xfce-utils.mo @@ -40,9 +42,11 @@ share/locale/ja/LC_MESSAGES/xfce-utils.mo share/locale/ka/LC_MESSAGES/xfce-utils.mo share/locale/ko/LC_MESSAGES/xfce-utils.mo share/locale/lt/LC_MESSAGES/xfce-utils.mo +share/locale/lv/LC_MESSAGES/xfce-utils.mo share/locale/mk/LC_MESSAGES/xfce-utils.mo share/locale/mr/LC_MESSAGES/xfce-utils.mo share/locale/ms/LC_MESSAGES/xfce-utils.mo +share/locale/nb_NO/LC_MESSAGES/xfce-utils.mo share/locale/nl/LC_MESSAGES/xfce-utils.mo share/locale/pa/LC_MESSAGES/xfce-utils.mo share/locale/pl/LC_MESSAGES/xfce-utils.mo diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk index f220fbc109f..75718f1cb37 100644 --- a/x11/xfce4-utils/buildlink3.mk +++ b/x11/xfce4-utils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2007/04/12 09:55:26 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2007/12/07 19:43:31 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= xfce4-utils BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-utils .if ${XFCE4_UTILS_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.4.1 +BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.4.2 BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils .endif # XFCE4_UTILS_BUILDLINK3_MK diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo index 867fcd7f6e2..7d8b7baae20 100644 --- a/x11/xfce4-utils/distinfo +++ b/x11/xfce4-utils/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.17 2007/04/12 09:55:26 martti Exp $ +$NetBSD: distinfo,v 1.18 2007/12/07 19:43:31 martti Exp $ -SHA1 (xfce-utils-4.4.1.tar.bz2) = 69ab30d45bbe252993f783e2f4d7f184226cacbb -RMD160 (xfce-utils-4.4.1.tar.bz2) = 65ed96acb6491829d0f97e8b1e4b5cba64a73e63 -Size (xfce-utils-4.4.1.tar.bz2) = 608154 bytes -SHA1 (patch-aa) = 9fba43b9ee2314743b19c0b72bd1a67ecb92ee29 +SHA1 (xfce-utils-4.4.2.tar.bz2) = b03b685743770b12157159f4b46bde9fb8c2f434 +RMD160 (xfce-utils-4.4.2.tar.bz2) = 7be37ec67faba686d1d329318ca68f4dc0e81ce1 +Size (xfce-utils-4.4.2.tar.bz2) = 596712 bytes +SHA1 (patch-aa) = aff3c61c25944ae7e106cecc9e22a4f2f230741f diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa index a91f41fe58d..a9a1a87e175 100644 --- a/x11/xfce4-utils/patches/patch-aa +++ b/x11/xfce4-utils/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:26 martti Exp $ +$NetBSD: patch-aa,v 1.3 2007/12/07 19:43:32 martti Exp $ ---- scripts/Makefile.in.orig 2006-11-05 11:08:43.000000000 +0000 -+++ scripts/Makefile.in 2006-11-06 12:47:55.000000000 +0000 -@@ -239,7 +239,7 @@ +--- scripts/Makefile.in.orig 2007-12-04 10:55:10.000000000 +0000 ++++ scripts/Makefile.in 2007-12-04 10:55:21.000000000 +0000 +@@ -240,7 +240,7 @@ -e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \ -e 's,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g' -conffilesdir = @sysconfdir@/xdg/xfce4 +conffilesdir = @datadir@/examples/xfce4 conffiles_DATA = \ - xinitrc - + xinitrc \ + Xft.xrdb |