diff options
| author | martti <martti@pkgsrc.org> | 2007-04-12 09:55:08 +0000 |
|---|---|---|
| committer | martti <martti@pkgsrc.org> | 2007-04-12 09:55:08 +0000 |
| commit | cc3a1b98dbb5f28f9899b166be27a16e4831791a (patch) | |
| tree | df1647c213d3eed2c06db3ecc7e1e4a7031720db /x11 | |
| parent | aaa04d9ac82bfe4f1c8570d3badea5fbf3fac8fb (diff) | |
| download | pkgsrc-cc3a1b98dbb5f28f9899b166be27a16e4831791a.tar.gz | |
Updated to Xfce 4.4.1
See http://www.xfce.org/documentation/changelogs/4.4.1 for details.
Diffstat (limited to 'x11')
68 files changed, 513 insertions, 812 deletions
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile index 0594503487c..af6136a33f4 100644 --- a/x11/libxfce4gui/Makefile +++ b/x11/libxfce4gui/Makefile @@ -1,25 +1,20 @@ -# $NetBSD: Makefile,v 1.22 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.23 2007/04/12 09:55:20 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= libxfcegui4-${XFCE4_VERSION} PKGNAME= libxfce4gui-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce widget library -USE_TOOLS+= msgfmt +USE_TOOLS+= msgfmt +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in -BUILDLINK_DEPMETHOD.libXt?= build - -.include "../../databases/dbh/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST index 752beb4bc57..c2182286ab0 100644 --- a/x11/libxfce4gui/PLIST +++ b/x11/libxfce4gui/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.16 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.17 2007/04/12 09:55:20 martti Exp $ include/xfce4/libxfcegui4/dialogs.h include/xfce4/libxfcegui4/gtk_style.h include/xfce4/libxfcegui4/gtktoxevent.h +include/xfce4/libxfcegui4/gui-enum-types.h include/xfce4/libxfcegui4/icons.h include/xfce4/libxfcegui4/libnetk.h include/xfce4/libxfcegui4/libxfcegui4-config.h @@ -27,7 +28,11 @@ include/xfce4/libxfcegui4/xfce-exec.h include/xfce4/libxfcegui4/xfce-filechooser.h include/xfce4/libxfcegui4/xfce-gdk-extensions.h include/xfce4/libxfcegui4/xfce-gtk-extensions.h +include/xfce4/libxfcegui4/xfce-heading.h include/xfce4/libxfcegui4/xfce-icontheme.h +include/xfce4/libxfcegui4/xfce-startup-notification.h +include/xfce4/libxfcegui4/xfce-titled-dialog.h +include/xfce4/libxfcegui4/xfce-widget-helpers.h include/xfce4/libxfcegui4/xfce_aboutdialog.h include/xfce4/libxfcegui4/xfce_clock.h include/xfce4/libxfcegui4/xfce_decorbutton.h @@ -41,22 +46,55 @@ include/xfce4/libxfcegui4/xfce_scaled_image.h include/xfce4/libxfcegui4/xfce_systemtray.h include/xfce4/libxfcegui4/xfce_togglebutton.h include/xfce4/libxfcegui4/xinerama.h -include/xfce4/xfce4-modules/combo.h -include/xfce4/xfce4-modules/constants.h -include/xfce4/xfce4-modules/mime.h -include/xfce4/xfce4-modules/mime_icons.h lib/libxfcegui4.la lib/pkgconfig/libxfcegui4-1.0.pc -lib/xfce4/modules/libxfce4_combo.la -lib/xfce4/modules/libxfce4_mime.la -lib/xfce4/modules/libxfce4_mime_icons.la -share/locale/af/LC_MESSAGES/libxfcegui4.mo +share/doc/libxfcegui4/XfceAboutDialog.html +share/doc/libxfcegui4/XfceAppMenuItem.html +share/doc/libxfcegui4/XfceFramebox.html +share/doc/libxfcegui4/XfceHeading.html +share/doc/libxfcegui4/XfceIconTheme.html +share/doc/libxfcegui4/XfceTitledDialog.html +share/doc/libxfcegui4/home.png +share/doc/libxfcegui4/index.html +share/doc/libxfcegui4/index.sgml +share/doc/libxfcegui4/left.png +share/doc/libxfcegui4/libxfcegui4-Standard-Macros.html +share/doc/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html +share/doc/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html +share/doc/libxfcegui4/libxfcegui4-XfceFileChooser.html +share/doc/libxfcegui4/libxfcegui4-core.html +share/doc/libxfcegui4/libxfcegui4-dialogs.html +share/doc/libxfcegui4/libxfcegui4-fundamentals.html +share/doc/libxfcegui4/libxfcegui4-netk.html +share/doc/libxfcegui4/libxfcegui4-xfce-exec.html +share/doc/libxfcegui4/libxfcegui4.devhelp +share/doc/libxfcegui4/libxfcegui4.devhelp2 +share/doc/libxfcegui4/reference.html +share/doc/libxfcegui4/right.png +share/doc/libxfcegui4/style.css +share/doc/libxfcegui4/up.png +share/icons/hicolor/48x48/apps/xfce-edit.png +share/icons/hicolor/48x48/apps/xfce-filemanager.png +share/icons/hicolor/48x48/apps/xfce-games.png +share/icons/hicolor/48x48/apps/xfce-graphics.png +share/icons/hicolor/48x48/apps/xfce-internet.png +share/icons/hicolor/48x48/apps/xfce-man.png +share/icons/hicolor/48x48/apps/xfce-multimedia.png +share/icons/hicolor/48x48/apps/xfce-printer.png +share/icons/hicolor/48x48/apps/xfce-schedule.png +share/icons/hicolor/48x48/apps/xfce-sound.png +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/ar/LC_MESSAGES/libxfcegui4.mo share/locale/be/LC_MESSAGES/libxfcegui4.mo share/locale/bn_IN/LC_MESSAGES/libxfcegui4.mo share/locale/ca/LC_MESSAGES/libxfcegui4.mo share/locale/cs/LC_MESSAGES/libxfcegui4.mo -share/locale/da/LC_MESSAGES/libxfcegui4.mo +share/locale/cy/LC_MESSAGES/libxfcegui4.mo share/locale/de/LC_MESSAGES/libxfcegui4.mo +share/locale/dz/LC_MESSAGES/libxfcegui4.mo share/locale/el/LC_MESSAGES/libxfcegui4.mo share/locale/en_GB/LC_MESSAGES/libxfcegui4.mo share/locale/eo/LC_MESSAGES/libxfcegui4.mo @@ -66,15 +104,17 @@ share/locale/eu/LC_MESSAGES/libxfcegui4.mo share/locale/fa/LC_MESSAGES/libxfcegui4.mo share/locale/fi/LC_MESSAGES/libxfcegui4.mo share/locale/fr/LC_MESSAGES/libxfcegui4.mo +share/locale/gl/LC_MESSAGES/libxfcegui4.mo share/locale/gu/LC_MESSAGES/libxfcegui4.mo share/locale/he/LC_MESSAGES/libxfcegui4.mo share/locale/hu/LC_MESSAGES/libxfcegui4.mo share/locale/hy/LC_MESSAGES/libxfcegui4.mo share/locale/it/LC_MESSAGES/libxfcegui4.mo share/locale/ja/LC_MESSAGES/libxfcegui4.mo +share/locale/ka/LC_MESSAGES/libxfcegui4.mo share/locale/ko/LC_MESSAGES/libxfcegui4.mo -share/locale/ku/LC_MESSAGES/libxfcegui4.mo share/locale/lt/LC_MESSAGES/libxfcegui4.mo +share/locale/mk/LC_MESSAGES/libxfcegui4.mo share/locale/mr/LC_MESSAGES/libxfcegui4.mo share/locale/nl/LC_MESSAGES/libxfcegui4.mo share/locale/pa/LC_MESSAGES/libxfcegui4.mo @@ -83,23 +123,12 @@ share/locale/pt_BR/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/sl/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/tr/LC_MESSAGES/libxfcegui4.mo share/locale/uk/LC_MESSAGES/libxfcegui4.mo share/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo share/locale/zh_TW/LC_MESSAGES/libxfcegui4.mo -share/xfce4/hicolor-index.theme -share/xfce4/mime/applications.xml -share/xfce4/mime/freedesktop.org.xml -share/xfce4/mime/gnome.mime.xml -share/xfce4/mime/hicolor.mime.xml -share/xfce4/mime/types.xml -share/xfce4/mime/xfce.org.xml -share/xfce4/xfce-svg-test.svg -@dirrm lib/xfce4/modules -@dirrm lib/xfce4 -@dirrm include/xfce4/xfce4-modules +@dirrm share/doc/libxfcegui4 @dirrm include/xfce4/libxfcegui4 -@unexec ${RMDIR} %D/share/xfce4/mime 2>/dev/null || ${TRUE} diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index bdb00cac790..8e3a3a24093 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2007/04/12 09:55:20 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4GUI_BUILDLINK3_MK:= ${LIBXFCE4GUI_BUILDLINK3_MK}+ @@ -12,17 +12,15 @@ BUILDLINK_PACKAGES+= libxfce4gui BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4gui .if ${LIBXFCE4GUI_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.2.4 +BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.4.1 BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui .endif # LIBXFCE4GUI_BUILDLINK3_MK -.include "../../databases/dbh/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/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" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo index 8527db1b0d1..95a2ed1d984 100644 --- a/x11/libxfce4gui/distinfo +++ b/x11/libxfce4gui/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.15 2007/04/12 09:55:20 martti Exp $ -SHA1 (libxfcegui4-4.2.4.tar.gz) = fa92b33e756bee9f77ec4bf5b2a3fdfd1fbc349b -RMD160 (libxfcegui4-4.2.4.tar.gz) = 381c661822836a4a7be1989f63cde56c0e1a6866 -Size (libxfcegui4-4.2.4.tar.gz) = 839024 bytes +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 diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile index 1d9a734eddd..3ebf6d666ed 100644 --- a/x11/libxfce4mcs/Makefile +++ b/x11/libxfce4mcs/Makefile @@ -1,19 +1,16 @@ -# $NetBSD: Makefile,v 1.13 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.14 2007/04/12 09:55:21 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= libxfce4mcs-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce settings management library +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc + PKGCONFIG_OVERRIDE= libxfce4mcs/libxfce4mcs-client-1.0.pc.in PKGCONFIG_OVERRIDE+= libxfce4mcs/libxfce4mcs-manager-1.0.pc.in -BUILDLINK_DEPMETHOD.libXt?= build - -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4mcs/PLIST b/x11/libxfce4mcs/PLIST index a18c70453b5..1658376798a 100644 --- a/x11/libxfce4mcs/PLIST +++ b/x11/libxfce4mcs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.9 2007/04/12 09:55:21 martti Exp $ include/xfce4/libxfce4mcs/mcs-client-enum-types.h include/xfce4/libxfce4mcs/mcs-client.h include/xfce4/libxfce4mcs/mcs-common.h @@ -7,4 +7,18 @@ lib/libxfce4mcs-client.la lib/libxfce4mcs-manager.la lib/pkgconfig/libxfce4mcs-client-1.0.pc lib/pkgconfig/libxfce4mcs-manager-1.0.pc +share/doc/libxfce4mcs/ch01.html +share/doc/libxfce4mcs/home.png +share/doc/libxfce4mcs/index.html +share/doc/libxfce4mcs/index.sgml +share/doc/libxfce4mcs/left.png +share/doc/libxfce4mcs/libxfce4mcs-mcs-client.html +share/doc/libxfce4mcs/libxfce4mcs-mcs-common.html +share/doc/libxfce4mcs/libxfce4mcs-mcs-manager.html +share/doc/libxfce4mcs/libxfce4mcs.devhelp +share/doc/libxfce4mcs/libxfce4mcs.devhelp2 +share/doc/libxfce4mcs/right.png +share/doc/libxfce4mcs/style.css +share/doc/libxfce4mcs/up.png +@dirrm share/doc/libxfce4mcs @dirrm include/xfce4/libxfce4mcs diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk index cd1d33f8f10..cdf6ac78553 100644 --- a/x11/libxfce4mcs/buildlink3.mk +++ b/x11/libxfce4mcs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:21 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4MCS_BUILDLINK3_MK:= ${LIBXFCE4MCS_BUILDLINK3_MK}+ @@ -12,13 +12,13 @@ BUILDLINK_PACKAGES+= libxfce4mcs BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4mcs .if ${LIBXFCE4MCS_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.2.4 +BUILDLINK_API_DEPENDS.libxfce4mcs+= libxfce4mcs>=4.4.1 BUILDLINK_PKGSRCDIR.libxfce4mcs?= ../../x11/libxfce4mcs .endif # LIBXFCE4MCS_BUILDLINK3_MK -.include "../../devel/glib2/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo index 16d947f2cb5..05441fcfcab 100644 --- a/x11/libxfce4mcs/distinfo +++ b/x11/libxfce4mcs/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.14 2007/04/12 09:55:21 martti Exp $ -SHA1 (libxfce4mcs-4.2.4.tar.gz) = 98ff8095f097654808643d57d323f13be9a3019f -RMD160 (libxfce4mcs-4.2.4.tar.gz) = ab6b1a18440fd46b23b24b637084246335f4e020 -Size (libxfce4mcs-4.2.4.tar.gz) = 373754 bytes +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 diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index c33a2212007..2aa576bcb19 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.12 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:21 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 4.2.4 - DISTNAME= libxfce4util-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce basic library +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc + PKGCONFIG_OVERRIDE= libxfce4util/libxfce4util-1.0.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4util/PLIST b/x11/libxfce4util/PLIST index becd89f163a..5885fec78a2 100644 --- a/x11/libxfce4util/PLIST +++ b/x11/libxfce4util/PLIST @@ -1,26 +1,73 @@ -@comment $NetBSD: PLIST,v 1.9 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/04/12 09:55:21 martti Exp $ include/xfce4/libxfce4util/debug.h include/xfce4/libxfce4util/i18n.h include/xfce4/libxfce4util/libxfce4util-config.h +include/xfce4/libxfce4util/libxfce4util-enum-types.h include/xfce4/libxfce4util/libxfce4util.h include/xfce4/libxfce4util/utf8.h -include/xfce4/libxfce4util/util-enum-types.h include/xfce4/libxfce4util/util.h include/xfce4/libxfce4util/xfce-desktopentry.h include/xfce4/libxfce4util/xfce-fileutils.h include/xfce4/libxfce4util/xfce-generics.h +include/xfce4/libxfce4util/xfce-i18n.h include/xfce4/libxfce4util/xfce-kiosk.h +include/xfce4/libxfce4util/xfce-license.h include/xfce4/libxfce4util/xfce-miscutils.h include/xfce4/libxfce4util/xfce-rc.h include/xfce4/libxfce4util/xfce-resource.h +include/xfce4/libxfce4util/xfce-utf8.h lib/libxfce4util.la lib/pkgconfig/libxfce4util-1.0.pc sbin/xfce4-kiosk-query -share/xfce4/m4/X11.m4 -share/xfce4/m4/debug.m4 -share/xfce4/m4/depends.m4 -share/xfce4/m4/i18n.m4 -@dirrm share/xfce4/m4 +share/doc/libxfce4util/home.png +share/doc/libxfce4util/index.html +share/doc/libxfce4util/index.sgml +share/doc/libxfce4util/left.png +share/doc/libxfce4util/libxfce4util-Desktop-entries.html +share/doc/libxfce4util/libxfce4util-File-Utilities.html +share/doc/libxfce4util/libxfce4util-Internationalisation.html +share/doc/libxfce4util/libxfce4util-Miscellaneous-Utilities.html +share/doc/libxfce4util/libxfce4util-Resource-Config-File-Support.html +share/doc/libxfce4util/libxfce4util-Resource-lookup-functions.html +share/doc/libxfce4util/libxfce4util-Software-Licenses.html +share/doc/libxfce4util/libxfce4util-Unicode-Support-Functions.html +share/doc/libxfce4util/libxfce4util-Version-Information.html +share/doc/libxfce4util/libxfce4util-Xfce-Generics.html +share/doc/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html +share/doc/libxfce4util/libxfce4util-core.html +share/doc/libxfce4util/libxfce4util-datatypes.html +share/doc/libxfce4util/libxfce4util-fundamentals.html +share/doc/libxfce4util/libxfce4util-utilities.html +share/doc/libxfce4util/libxfce4util.devhelp +share/doc/libxfce4util/libxfce4util.devhelp2 +share/doc/libxfce4util/reference.html +share/doc/libxfce4util/right.png +share/doc/libxfce4util/style.css +share/doc/libxfce4util/up.png +share/locale/ar/LC_MESSAGES/libxfce4util.mo +share/locale/ca/LC_MESSAGES/libxfce4util.mo +share/locale/cs/LC_MESSAGES/libxfce4util.mo +share/locale/cy/LC_MESSAGES/libxfce4util.mo +share/locale/de/LC_MESSAGES/libxfce4util.mo +share/locale/dz/LC_MESSAGES/libxfce4util.mo +share/locale/en_GB/LC_MESSAGES/libxfce4util.mo +share/locale/eu/LC_MESSAGES/libxfce4util.mo +share/locale/fi/LC_MESSAGES/libxfce4util.mo +share/locale/fr/LC_MESSAGES/libxfce4util.mo +share/locale/gl/LC_MESSAGES/libxfce4util.mo +share/locale/he/LC_MESSAGES/libxfce4util.mo +share/locale/it/LC_MESSAGES/libxfce4util.mo +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/mk/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/sq/LC_MESSAGES/libxfce4util.mo +share/locale/tr/LC_MESSAGES/libxfce4util.mo +share/locale/uk/LC_MESSAGES/libxfce4util.mo +@dirrm share/doc/libxfce4util @dirrm include/xfce4/libxfce4util @dirrm include/xfce4 -@unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE} diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk index 95d8d066ba6..5805bf7c982 100644 --- a/x11/libxfce4util/buildlink3.mk +++ b/x11/libxfce4util/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:21 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBXFCE4UTIL_BUILDLINK3_MK:= ${LIBXFCE4UTIL_BUILDLINK3_MK}+ @@ -12,10 +12,13 @@ BUILDLINK_PACKAGES+= libxfce4util BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4util .if ${LIBXFCE4UTIL_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.2.4 +BUILDLINK_API_DEPENDS.libxfce4util+= libxfce4util>=4.4.1 BUILDLINK_PKGSRCDIR.libxfce4util?= ../../x11/libxfce4util .endif # LIBXFCE4UTIL_BUILDLINK3_MK +.include "../../devel/xfce4-dev-tools/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo index 41763dc0d0b..38475774c0e 100644 --- a/x11/libxfce4util/distinfo +++ b/x11/libxfce4util/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.16 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.17 2007/04/12 09:55:21 martti Exp $ -SHA1 (libxfce4util-4.2.4.tar.gz) = 89cd2c9570e1f068a1a1d3ddf5e5887576d6812c -RMD160 (libxfce4util-4.2.4.tar.gz) = 88c70b3e3cc6dd5f0a1519dc12b8e4092943e899 -Size (libxfce4util-4.2.4.tar.gz) = 428865 bytes -SHA1 (patch-aa) = 448e78adfaa2dc0407419060dbb4d57fad8e8bf7 +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 diff --git a/x11/libxfce4util/patches/patch-aa b/x11/libxfce4util/patches/patch-aa deleted file mode 100644 index 750229168cc..00000000000 --- a/x11/libxfce4util/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2007/01/23 11:53:47 martti Exp $ - -No, it's not ok. Except for GNU C. - ---- libxfce4util/xfce-miscutils.h.orig 2007-01-13 21:41:32.000000000 +0000 -+++ libxfce4util/xfce-miscutils.h 2007-01-23 11:26:14.000000000 +0000 -@@ -32,12 +32,11 @@ - - #include <libxfce4util/debug.h> - --/* This looks a bit "hacky", but its ok */ --#define _BUILTIN_LICENSE_TEXT(name) \ --({ \ -- extern const char xfce_builtin_license_##name[]; \ -- xfce_builtin_license_##name; \ --}) -+extern const char xfce_builtin_license_BSD[]; -+extern const char xfce_builtin_license_GPL[]; -+extern const char xfce_builtin_license_LGPL[]; -+ -+#define _BUILTIN_LICENSE_TEXT(name) xfce_builtin_license_##name - - #if defined (__sun) - extern const char xfce_builtin_license_BSD[]; diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index d86cd800b3f..dea340c96b7 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:14 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:21 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.4.1 +XFCE4_VERSION= 0.8.0 DISTNAME= xfce4-clipman-plugin-${XFCE4_VERSION} -PKGREVISION= 3 +#PKGREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= http://download.berlios.de/xfce-goodies/ +MASTER_SITES= http://goodies.xfce.org/releases/xfce4-clipman-plugin/ COMMENT= Xfce clipboard plugin .include "../../x11/xfce4-panel/buildlink3.mk" diff --git a/x11/xfce4-clipman-plugin/PLIST b/x11/xfce4-clipman-plugin/PLIST index 360795380a6..bc45d59ebc9 100644 --- a/x11/xfce4-clipman-plugin/PLIST +++ b/x11/xfce4-clipman-plugin/PLIST @@ -1,2 +1,13 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:10:07 jlam Exp $ -lib/xfce4/panel-plugins/libclipman.la +@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:21 martti Exp $ +libexec/xfce4/panel-plugins/xfce4-clipman-plugin +share/locale/ca/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/cs/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/eu/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/fr/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/ja/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-clipman-plugin.mo +share/xfce4/panel-plugins/clipman.desktop diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk index b15ac5f1174..5a57784c3ed 100644 --- a/x11/xfce4-clipman-plugin/buildlink3.mk +++ b/x11/xfce4-clipman-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 09:24:21 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:21 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:= ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+ @@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-clipman-plugin BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-clipman-plugin .if ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.4.1nb3 +BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+= xfce4-clipman-plugin>=0.8.0 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?= ../../x11/xfce4-clipman-plugin .endif # XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-clipman-plugin/distinfo b/x11/xfce4-clipman-plugin/distinfo index cfc0173daf7..8966ed32dce 100644 --- a/x11/xfce4-clipman-plugin/distinfo +++ b/x11/xfce4-clipman-plugin/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 17:36:22 wiz Exp $ +$NetBSD: distinfo,v 1.5 2007/04/12 09:55:21 martti Exp $ -SHA1 (xfce4-clipman-plugin-0.4.1.tar.gz) = 3de3a457286471d3d873bed77bf5c8a0f125b409 -RMD160 (xfce4-clipman-plugin-0.4.1.tar.gz) = 2a474443d757b80606d5d57d1b548e02122b47f0 -Size (xfce4-clipman-plugin-0.4.1.tar.gz) = 305762 bytes +SHA1 (xfce4-clipman-plugin-0.8.0.tar.bz2) = 575bcda816646c5fa18b1a452a7696f70842841b +RMD160 (xfce4-clipman-plugin-0.8.0.tar.bz2) = f5b4f14b2317bcd00ba82e7be7060373b94cf3d7 +Size (xfce4-clipman-plugin-0.8.0.tar.bz2) = 193458 bytes diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index a0b04587938..f54bfb3a324 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,25 +1,23 @@ -# $NetBSD: Makefile,v 1.25 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.26 2007/04/12 09:55:21 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfdesktop-${XFCE4_VERSION} PKGNAME= xfce4-desktop-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce desktop background manager - PKG_SYSCONFSUBDIR= xdg/xfce4/desktop EGDIR= ${XFCE4_EGBASE}/desktop CONF_FILES= ${EGDIR:Q}/menu.xml ${PKG_SYSCONFDIR:Q}/menu.xml -.for l in ca cs da de el es et fi fr he hu ja ko nl pl pt_BR ro ru sk sv \ +.for l in ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR ro ru sk sv \ uk vi zh_TW CONF_FILES+= ${EGDIR:Q}/menu.xml.${l:Q} \ ${PKG_SYSCONFDIR:Q}/menu.xml.${l:Q} .endfor CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml \ ${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml -.for l in cs eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW +.for l in ca cs de el es eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml.${l:Q} \ ${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml.${l:Q} .endfor @@ -27,13 +25,11 @@ CONF_FILES+= ${EGDIR:Q}/xfce-registered-categories.xml.${l:Q} \ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} REQD_DIRS+= ${XFCE4_EGBASE:Q} ${EGDIR:Q} - -BUILDLINK_DEPMETHOD.libXt?= build +BUILD_DEFS+= PKG_SYSCONFBASE .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/xfce4-thunar/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST index 4bf5d4a99cc..99e3a83fa96 100644 --- a/x11/xfce4-desktop/PLIST +++ b/x11/xfce4-desktop/PLIST @@ -1,13 +1,15 @@ -@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:22 martti Exp $ bin/xfce4-menueditor +bin/xfce4-popup-menu bin/xfdesktop lib/xfce4/mcs-plugins/backdrop_settings.la lib/xfce4/modules/xfce4_desktop_menu.la -lib/xfce4/panel-plugins/libdesktopmenu.la +libexec/xfce4/panel-plugins/xfce4-menu-plugin man/man1/xfdesktop.1 share/applications/xfce-backdrop-settings.desktop share/applications/xfce-menueditor.desktop share/examples/xfce4/desktop/menu.xml +share/examples/xfce4/desktop/menu.xml.be share/examples/xfce4/desktop/menu.xml.ca share/examples/xfce4/desktop/menu.xml.cs share/examples/xfce4/desktop/menu.xml.da @@ -20,26 +22,33 @@ share/examples/xfce4/desktop/menu.xml.fi share/examples/xfce4/desktop/menu.xml.fr share/examples/xfce4/desktop/menu.xml.he 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.nl +share/examples/xfce4/desktop/menu.xml.pa share/examples/xfce4/desktop/menu.xml.pl share/examples/xfce4/desktop/menu.xml.pt_BR share/examples/xfce4/desktop/menu.xml.ro share/examples/xfce4/desktop/menu.xml.ru share/examples/xfce4/desktop/menu.xml.sk share/examples/xfce4/desktop/menu.xml.sv +share/examples/xfce4/desktop/menu.xml.tr share/examples/xfce4/desktop/menu.xml.uk share/examples/xfce4/desktop/menu.xml.vi share/examples/xfce4/desktop/menu.xml.zh_TW share/examples/xfce4/desktop/xfce-registered-categories.xml +share/examples/xfce4/desktop/xfce-registered-categories.xml.ca share/examples/xfce4/desktop/xfce-registered-categories.xml.cs +share/examples/xfce4/desktop/xfce-registered-categories.xml.de share/examples/xfce4/desktop/xfce-registered-categories.xml.el share/examples/xfce4/desktop/xfce-registered-categories.xml.es share/examples/xfce4/desktop/xfce-registered-categories.xml.eu share/examples/xfce4/desktop/xfce-registered-categories.xml.fi +share/examples/xfce4/desktop/xfce-registered-categories.xml.fr 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.nl share/examples/xfce4/desktop/xfce-registered-categories.xml.pl @@ -48,6 +57,7 @@ share/examples/xfce4/desktop/xfce-registered-categories.xml.ro share/examples/xfce4/desktop/xfce-registered-categories.xml.ru share/examples/xfce4/desktop/xfce-registered-categories.xml.sk share/examples/xfce4/desktop/xfce-registered-categories.xml.sv +share/examples/xfce4/desktop/xfce-registered-categories.xml.tr share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_CN share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_TW share/icons/hicolor/32x32/apps/xfce4-backdrop.png @@ -56,7 +66,6 @@ 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/af/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 @@ -64,8 +73,8 @@ share/locale/bg/LC_MESSAGES/xfdesktop.mo share/locale/bn_IN/LC_MESSAGES/xfdesktop.mo share/locale/ca/LC_MESSAGES/xfdesktop.mo share/locale/cs/LC_MESSAGES/xfdesktop.mo -share/locale/da/LC_MESSAGES/xfdesktop.mo share/locale/de/LC_MESSAGES/xfdesktop.mo +share/locale/dz/LC_MESSAGES/xfdesktop.mo share/locale/el/LC_MESSAGES/xfdesktop.mo share/locale/en_GB/LC_MESSAGES/xfdesktop.mo share/locale/eo/LC_MESSAGES/xfdesktop.mo @@ -76,6 +85,7 @@ share/locale/eu/LC_MESSAGES/xfdesktop.mo share/locale/fa/LC_MESSAGES/xfdesktop.mo share/locale/fi/LC_MESSAGES/xfdesktop.mo share/locale/fr/LC_MESSAGES/xfdesktop.mo +share/locale/gl/LC_MESSAGES/xfdesktop.mo share/locale/gu/LC_MESSAGES/xfdesktop.mo share/locale/he/LC_MESSAGES/xfdesktop.mo share/locale/hi/LC_MESSAGES/xfdesktop.mo @@ -83,9 +93,10 @@ share/locale/hu/LC_MESSAGES/xfdesktop.mo share/locale/hy/LC_MESSAGES/xfdesktop.mo share/locale/it/LC_MESSAGES/xfdesktop.mo share/locale/ja/LC_MESSAGES/xfdesktop.mo +share/locale/ka/LC_MESSAGES/xfdesktop.mo share/locale/ko/LC_MESSAGES/xfdesktop.mo -share/locale/ku/LC_MESSAGES/xfdesktop.mo share/locale/lt/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 share/locale/nb_NO/LC_MESSAGES/xfdesktop.mo @@ -97,8 +108,6 @@ share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo share/locale/ro/LC_MESSAGES/xfdesktop.mo share/locale/ru/LC_MESSAGES/xfdesktop.mo share/locale/sk/LC_MESSAGES/xfdesktop.mo -share/locale/sl/LC_MESSAGES/xfdesktop.mo -share/locale/sq/LC_MESSAGES/xfdesktop.mo share/locale/sv/LC_MESSAGES/xfdesktop.mo share/locale/ta/LC_MESSAGES/xfdesktop.mo share/locale/tr/LC_MESSAGES/xfdesktop.mo @@ -106,11 +115,14 @@ share/locale/uk/LC_MESSAGES/xfdesktop.mo share/locale/vi/LC_MESSAGES/xfdesktop.mo share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo share/locale/zh_TW/LC_MESSAGES/xfdesktop.mo +share/pixmaps/xfce4/xfdesktop/text-selection-frame.png share/pixmaps/xfce4_xicon.png share/pixmaps/xfce4_xicon1.png share/pixmaps/xfce4_xicon2.png share/pixmaps/xfce4_xicon3.png share/pixmaps/xfce4_xicon4.png +share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png +share/xfce4-menueditor/xfce4-menueditor.ui share/xfce4/backdrops/flower.png share/xfce4/backdrops/xfce-in-a-grid.png share/xfce4/backdrops/xfce-in-the-moon.png @@ -123,26 +135,25 @@ share/xfce4/backdrops/xfce4logo.png share/xfce4/doc/C/images/root_menu.png share/xfce4/doc/C/images/root_menu2.png share/xfce4/doc/C/images/select_bg_color.png -share/xfce4/doc/C/images/xfdesktop-background.png +share/xfce4/doc/C/images/xfdesktop-appearance-tab.png +share/xfce4/doc/C/images/xfdesktop-behavior-tab.png share/xfce4/doc/C/images/xfdesktop-editor.png share/xfce4/doc/C/images/xfdesktop-list.png -share/xfce4/doc/C/images/xfdesktop-menu-tab.png share/xfce4/doc/C/xfdesktop.html share/xfce4/doc/fr/images/root_menu.png share/xfce4/doc/fr/images/root_menu2.png share/xfce4/doc/fr/images/select_bg_color.png -share/xfce4/doc/fr/images/xfdesktop-background.png +share/xfce4/doc/fr/images/xfdesktop-appearance-tab.png +share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png share/xfce4/doc/fr/images/xfdesktop-editor.png share/xfce4/doc/fr/images/xfdesktop-list.png -share/xfce4/doc/fr/images/xfdesktop-menu-tab.png share/xfce4/doc/fr/xfdesktop.html -share/xfce4/doc/he/images/root_menu.png -share/xfce4/doc/he/images/root_menu2.png -share/xfce4/doc/he/images/select_bg_color.png -share/xfce4/doc/he/images/xfdesktop-background.png -share/xfce4/doc/he/images/xfdesktop-editor.png -share/xfce4/doc/he/images/xfdesktop-list.png -share/xfce4/doc/he/images/xfdesktop-menu-tab.png -share/xfce4/doc/he/xfdesktop.html +share/xfce4/panel-plugins/xfce4-menu.desktop +@dirrm share/xfce4-menueditor +@dirrm share/pixmaps/xfdesktop +@dirrm share/pixmaps/xfce4/xfdesktop @dirrm share/examples/xfce4/desktop @unexec ${RMDIR} %D/share/xfce4/backdrops 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/pixmaps/xfce4 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/lib/xfce4/modules 2>/dev/null || ${TRUE} diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk index 52299f31700..c8cbabd9d48 100644 --- a/x11/xfce4-desktop/buildlink3.mk +++ b/x11/xfce4-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:22 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_DESKTOP_BUILDLINK3_MK:= ${XFCE4_DESKTOP_BUILDLINK3_MK}+ @@ -12,13 +12,16 @@ 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.2.4 +BUILDLINK_API_DEPENDS.xfce4-desktop+= xfce4-desktop>=4.4.1 BUILDLINK_PKGSRCDIR.xfce4-desktop?= ../../x11/xfce4-desktop .endif # XFCE4_DESKTOP_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../sysutils/xfce4-thunar/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo index 27fa670cdcc..b9e7b462317 100644 --- a/x11/xfce4-desktop/distinfo +++ b/x11/xfce4-desktop/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.15 2007/04/12 09:55:22 martti Exp $ -SHA1 (xfdesktop-4.2.4.tar.gz) = 9b19d900d325c5f2911de7e93f14b6be4ad07b59 -RMD160 (xfdesktop-4.2.4.tar.gz) = 99f98d9a5550ebee35bac5e3eb73d9817ae868d9 -Size (xfdesktop-4.2.4.tar.gz) = 3119654 bytes -SHA1 (patch-aa) = 074834de74292b1542f57a3b0b94ed9ff88f8bf8 -SHA1 (patch-ab) = 133532279efddccb723e735ccc630903fbace107 +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 diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa index 1c06a4204df..22e1023ffe5 100644 --- a/x11/xfce4-desktop/patches/patch-aa +++ b/x11/xfce4-desktop/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2007/01/23 11:53:47 martti Exp $ +$NetBSD: patch-aa,v 1.4 2007/04/12 09:55:22 martti Exp $ ---- Makefile.in.orig 2007-01-14 21:07:41.000000000 +0000 -+++ Makefile.in 2007-01-23 12:59:39.000000000 +0000 -@@ -271,7 +271,7 @@ +--- 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 @@ + modules \ + pixmaps - SUBDIRS = backdrops common doc po settings src modules pixmaps \ - $(am__append_1) $(am__append_2) -confdir = $(sysconfdir)/xdg/xfce4/desktop +confdir = $(datadir)/examples/xfce4/desktop conf_DATA = \ - menu.xml \ - menu.xml.ca \ + menu.xml \ + menu.xml.be \ diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab index e6ebefea58c..4947d60e128 100644 --- a/x11/xfce4-desktop/patches/patch-ab +++ b/x11/xfce4-desktop/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.3 2007/01/23 11:53:47 martti Exp $ +$NetBSD: patch-ab,v 1.4 2007/04/12 09:55:22 martti Exp $ ---- modules/menu/Makefile.in.orig 2007-01-14 21:07:40.000000000 +0000 -+++ modules/menu/Makefile.in 2007-01-23 13:00:00.000000000 +0000 -@@ -288,7 +288,7 @@ - @GMODULE_LIBS@ \ - @LIBXFCEGUI4_LIBS@ +--- 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 @@ + $(LIBX11_LIBS) \ + $(LIBXFCEGUI4_LIBS) -xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop +xfceconfdir = $(datadir)/examples/xfce4/desktop xfceconf_DATA = \ xfce-registered-categories.xml \ - xfce-registered-categories.xml.cs \ + xfce-registered-categories.xml.ca \ diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile index 11bc166acbc..a5e21e2be05 100644 --- a/x11/xfce4-gtk2-engine/Makefile +++ b/x11/xfce4-gtk2-engine/Makefile @@ -1,19 +1,15 @@ -# $NetBSD: Makefile,v 1.6 2007/01/23 11:53:47 martti Exp $ -# +# $NetBSD: Makefile,v 1.7 2007/04/12 09:55:22 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 2.2.9 +XFCE4_VERSION= 2.4.1 DISTNAME= gtk-xfce-engine-${XFCE4_VERSION} PKGNAME= xfce4-gtk2-engine-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce GTK2 themes USE_DIRS+= xdg-1.1 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 - .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-gtk2-engine/PLIST b/x11/xfce4-gtk2-engine/PLIST index 91961811e05..87cb1842463 100644 --- a/x11/xfce4-gtk2-engine/PLIST +++ b/x11/xfce4-gtk2-engine/PLIST @@ -1,8 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2006/09/15 17:05:24 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/04/12 09:55:22 martti Exp $ lib/gtk-2.0/2.10.0/engines/libxfce.la share/themes/Xfce-4.0/ICON.png share/themes/Xfce-4.0/README.html share/themes/Xfce-4.0/gtk-2.0/gtkrc +share/themes/Xfce-4.2/ICON.png +share/themes/Xfce-4.2/README.html +share/themes/Xfce-4.2/gtk-2.0/gtkrc share/themes/Xfce-b5/ICON.png share/themes/Xfce-b5/README.html share/themes/Xfce-b5/gtk-2.0/gtkrc @@ -30,6 +33,9 @@ share/themes/Xfce-kolors/gtk-2.0/gtkrc share/themes/Xfce-light/ICON.png share/themes/Xfce-light/README.html share/themes/Xfce-light/gtk-2.0/gtkrc +share/themes/Xfce-orange/ICON.png +share/themes/Xfce-orange/README.html +share/themes/Xfce-orange/gtk-2.0/gtkrc share/themes/Xfce-redmondxp/ICON.png share/themes/Xfce-redmondxp/README.html share/themes/Xfce-redmondxp/gtk-2.0/gtkrc @@ -59,6 +65,8 @@ share/themes/Xfce/gtk-2.0/gtkrc @dirrm share/themes/Xfce-saltlake @dirrm share/themes/Xfce-redmondxp/gtk-2.0 @dirrm share/themes/Xfce-redmondxp +@dirrm share/themes/Xfce-orange/gtk-2.0 +@dirrm share/themes/Xfce-orange @dirrm share/themes/Xfce-light/gtk-2.0 @dirrm share/themes/Xfce-light @dirrm share/themes/Xfce-kolors/gtk-2.0 @@ -77,6 +85,8 @@ share/themes/Xfce/gtk-2.0/gtkrc @dirrm share/themes/Xfce-basic @dirrm share/themes/Xfce-b5/gtk-2.0 @dirrm share/themes/Xfce-b5 +@dirrm share/themes/Xfce-4.2/gtk-2.0 +@dirrm share/themes/Xfce-4.2 @dirrm share/themes/Xfce-4.0/gtk-2.0 @dirrm share/themes/Xfce-4.0 @unexec ${RMDIR} %D/share/themes/Xfce 2>/dev/null || ${TRUE} diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk index c319caca6e1..21d71960aa7 100644 --- a/x11/xfce4-gtk2-engine/buildlink3.mk +++ b/x11/xfce4-gtk2-engine/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2007/04/12 09:55:22 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_GTK2_ENGINE_BUILDLINK3_MK:= ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+ @@ -12,11 +12,12 @@ 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.2.9 +BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+= xfce4-gtk2-engine>=2.4.1 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?= ../../x11/xfce4-gtk2-engine .endif # XFCE4_GTK2_ENGINE_BUILDLINK3_MK .include "../../x11/gtk2/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-gtk2-engine/distinfo b/x11/xfce4-gtk2-engine/distinfo index 2dffc8c507d..d629c1819a8 100644 --- a/x11/xfce4-gtk2-engine/distinfo +++ b/x11/xfce4-gtk2-engine/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.3 2007/04/12 09:55:22 martti Exp $ -SHA1 (gtk-xfce-engine-2.2.9.tar.gz) = 91bd115ad8b269d1db50e911d96991b4391beea6 -RMD160 (gtk-xfce-engine-2.2.9.tar.gz) = 823477bdf3dee8b0cfbdc01f28ebf3314e099ff5 -Size (gtk-xfce-engine-2.2.9.tar.gz) = 397464 bytes +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 diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile index 3f70e6db854..99e05705ba6 100644 --- a/x11/xfce4-mcs-manager/Makefile +++ b/x11/xfce4-mcs-manager/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.18 2007/04/12 09:55:22 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce-mcs-manager-${XFCE4_VERSION} PKGNAME= xfce4-mcs-manager-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce settings manager diff --git a/x11/xfce4-mcs-manager/PLIST b/x11/xfce4-mcs-manager/PLIST index 4fd5be218fd..1635f777393 100644 --- a/x11/xfce4-mcs-manager/PLIST +++ b/x11/xfce4-mcs-manager/PLIST @@ -1,11 +1,10 @@ -@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.15 2007/04/12 09:55:22 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/af/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 @@ -13,8 +12,8 @@ share/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo share/locale/bn_IN/LC_MESSAGES/xfce-mcs-manager.mo share/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo share/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo -share/locale/da/LC_MESSAGES/xfce-mcs-manager.mo share/locale/de/LC_MESSAGES/xfce-mcs-manager.mo +share/locale/dz/LC_MESSAGES/xfce-mcs-manager.mo share/locale/el/LC_MESSAGES/xfce-mcs-manager.mo share/locale/en_GB/LC_MESSAGES/xfce-mcs-manager.mo share/locale/eo/LC_MESSAGES/xfce-mcs-manager.mo @@ -25,6 +24,7 @@ share/locale/eu/LC_MESSAGES/xfce-mcs-manager.mo share/locale/fa/LC_MESSAGES/xfce-mcs-manager.mo share/locale/fi/LC_MESSAGES/xfce-mcs-manager.mo share/locale/fr/LC_MESSAGES/xfce-mcs-manager.mo +share/locale/gl/LC_MESSAGES/xfce-mcs-manager.mo share/locale/gu/LC_MESSAGES/xfce-mcs-manager.mo share/locale/he/LC_MESSAGES/xfce-mcs-manager.mo share/locale/hi/LC_MESSAGES/xfce-mcs-manager.mo @@ -33,8 +33,8 @@ share/locale/it/LC_MESSAGES/xfce-mcs-manager.mo 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/ku/LC_MESSAGES/xfce-mcs-manager.mo share/locale/lt/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 share/locale/nb_NO/LC_MESSAGES/xfce-mcs-manager.mo @@ -46,8 +46,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-mcs-manager.mo share/locale/ro/LC_MESSAGES/xfce-mcs-manager.mo share/locale/ru/LC_MESSAGES/xfce-mcs-manager.mo share/locale/sk/LC_MESSAGES/xfce-mcs-manager.mo -share/locale/sl/LC_MESSAGES/xfce-mcs-manager.mo -share/locale/sq/LC_MESSAGES/xfce-mcs-manager.mo share/locale/sv/LC_MESSAGES/xfce-mcs-manager.mo share/locale/ta/LC_MESSAGES/xfce-mcs-manager.mo share/locale/tr/LC_MESSAGES/xfce-mcs-manager.mo @@ -64,13 +62,14 @@ share/xfce4/doc/fr/images/smgr_from_panel.png share/xfce4/doc/fr/images/smgr_from_root_menu.png share/xfce4/doc/fr/images/smgr_from_setup_button.png share/xfce4/doc/fr/xfce-mcs-manager.html -share/xfce4/doc/he/images/settings_manager.png -share/xfce4/doc/he/images/smgr_from_root_menu.png -share/xfce4/doc/he/images/smgr_from_setup_button.png -share/xfce4/doc/he/xfce-mcs-manager.html +share/xfce4/doc/it/images/settings_manager.png +share/xfce4/doc/it/images/smgr_from_panel.png +share/xfce4/doc/it/images/smgr_from_root_menu.png +share/xfce4/doc/it/images/smgr_from_setup_button.png +share/xfce4/doc/it/xfce-mcs-manager.html @dirrm include/xfce4/xfce-mcs-manager -@unexec ${RMDIR} %D/share/xfce4/doc/he/images 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/xfce4/doc/he 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/xfce4/doc/it/images 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/xfce4/doc/it 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/xfce4/doc/fr/images 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/xfce4/doc/fr 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/xfce4/doc/C/images 2>/dev/null || ${TRUE} diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk index b2889a34a99..2cb07b1def6 100644 --- a/x11/xfce4-mcs-manager/buildlink3.mk +++ b/x11/xfce4-mcs-manager/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:22 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MCS_MANAGER_BUILDLINK3_MK:= ${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+ @@ -12,13 +12,14 @@ 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.2.4 +BUILDLINK_API_DEPENDS.xfce4-mcs-manager+= xfce4-mcs-manager>=4.4.1 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?= ../../x11/xfce4-mcs-manager .endif # XFCE4_MCS_MANAGER_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/libxfce4gui/buildlink3.mk" .include "../../x11/libxfce4mcs/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-mcs-manager/distinfo b/x11/xfce4-mcs-manager/distinfo index 7dff936686f..49db3e62437 100644 --- a/x11/xfce4-mcs-manager/distinfo +++ b/x11/xfce4-mcs-manager/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.14 2007/04/12 09:55:22 martti Exp $ -SHA1 (xfce-mcs-manager-4.2.4.tar.gz) = 4a477d3f80d97f0980b4070ef8a1570b169d9855 -RMD160 (xfce-mcs-manager-4.2.4.tar.gz) = 6dfacde3cbfd4903e17b32a0cbc1399d713109a2 -Size (xfce-mcs-manager-4.2.4.tar.gz) = 766343 bytes +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 diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile index 2f5e1d7988b..8f8182b6b23 100644 --- a/x11/xfce4-mcs-plugins/Makefile +++ b/x11/xfce4-mcs-plugins/Makefile @@ -1,18 +1,12 @@ -# $NetBSD: Makefile,v 1.15 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.16 2007/04/12 09:55:22 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce-mcs-plugins-${XFCE4_VERSION} PKGNAME= xfce4-mcs-plugins-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce settings manager plugins -BUILDLINK_DEPMETHOD.libXt?= build - .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" .include "../../x11/xfce4-mcs-manager/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-mcs-plugins/PLIST b/x11/xfce4-mcs-plugins/PLIST index e9abd89e3d4..347e8630ff1 100644 --- a/x11/xfce4-mcs-plugins/PLIST +++ b/x11/xfce4-mcs-plugins/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.13 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.14 2007/04/12 09:55:22 martti Exp $ lib/xfce4/mcs-plugins/display_plugin.la +lib/xfce4/mcs-plugins/fm_plugin.la lib/xfce4/mcs-plugins/keyboard_plugin.la lib/xfce4/mcs-plugins/mouse_plugin.la lib/xfce4/mcs-plugins/screensaver_plugin.la @@ -16,7 +17,6 @@ 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/af/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 @@ -24,8 +24,8 @@ share/locale/bg/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/bn_IN/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/cs/LC_MESSAGES/xfce-mcs-plugins.mo -share/locale/da/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo +share/locale/dz/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/el/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/en_GB/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/eo/LC_MESSAGES/xfce-mcs-plugins.mo @@ -36,15 +36,17 @@ share/locale/eu/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/fa/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/fi/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/fr/LC_MESSAGES/xfce-mcs-plugins.mo +share/locale/gl/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/gu/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/he/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/hi/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/hu/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/it/LC_MESSAGES/xfce-mcs-plugins.mo 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/ku/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/lt/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/nl/LC_MESSAGES/xfce-mcs-plugins.mo @@ -55,8 +57,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/ro/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/ru/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/sk/LC_MESSAGES/xfce-mcs-plugins.mo -share/locale/sl/LC_MESSAGES/xfce-mcs-plugins.mo -share/locale/sq/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/sv/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/ta/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/tr/LC_MESSAGES/xfce-mcs-plugins.mo @@ -64,6 +64,7 @@ share/locale/uk/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/vi/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/zh_CN/LC_MESSAGES/xfce-mcs-plugins.mo share/locale/zh_TW/LC_MESSAGES/xfce-mcs-plugins.mo +share/xfce-mcs-plugins/shortcuts/default.xml share/xfce4/doc/C/images/display_preferences.png share/xfce4/doc/C/images/font_selection.png share/xfce4/doc/C/images/keyboard_settings.png @@ -77,10 +78,12 @@ share/xfce4/doc/fr/images/keyboard_settings.png share/xfce4/doc/fr/images/mouse_settings.png share/xfce4/doc/fr/images/user_interface_settings.png share/xfce4/doc/fr/xfce-mcs-plugins.html -share/xfce4/doc/he/images/display_preferences.png -share/xfce4/doc/he/images/font_selection.png -share/xfce4/doc/he/images/keyboard_settings.png -share/xfce4/doc/he/images/mouse_settings.png -share/xfce4/doc/he/images/user_interface_settings.png -share/xfce4/doc/he/xfce-mcs-plugins.html +share/xfce4/doc/it/images/font_selection.png +share/xfce4/doc/it/images/keyboard_settings.png +share/xfce4/doc/it/images/mouse_settings.png +share/xfce4/doc/it/images/user_interface_settings.png +share/xfce4/doc/it/xfce-mcs-plugins.html +@dirrm share/xfce-mcs-plugins/shortcuts +@dirrm share/xfce-mcs-plugins @dirrm lib/xfce4/mcs-plugins +@unexec ${RMDIR} %D/lib/xfce4 2>/dev/null || ${TRUE} diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk index a5c79c25da4..d29134b9655 100644 --- a/x11/xfce4-mcs-plugins/buildlink3.mk +++ b/x11/xfce4-mcs-plugins/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2007/04/12 09:55:22 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_MCS_PLUGINS_BUILDLINK3_MK:= ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+ @@ -12,12 +12,13 @@ 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.2.4 +BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+= xfce4-mcs-plugins>=4.4.1 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?= ../../x11/xfce4-mcs-plugins .endif # XFCE4_MCS_PLUGINS_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-manager/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-mcs-plugins/distinfo b/x11/xfce4-mcs-plugins/distinfo index 22a6c24ef37..1188697a339 100644 --- a/x11/xfce4-mcs-plugins/distinfo +++ b/x11/xfce4-mcs-plugins/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.14 2007/04/12 09:55:23 martti Exp $ -SHA1 (xfce-mcs-plugins-4.2.4.tar.gz) = 98f2c28b213ecd17eff3caadf9ba091baa717321 -RMD160 (xfce-mcs-plugins-4.2.4.tar.gz) = b9f7e6e924d3d6d3bbcc1f81a48907332f9f3ba4 -Size (xfce-mcs-plugins-4.2.4.tar.gz) = 1010247 bytes +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 diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile index f149c2c2f33..7a1f0881809 100644 --- a/x11/xfce4-notes-plugin/Makefile +++ b/x11/xfce4-notes-plugin/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:14 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/04/12 09:55:23 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -XFCE4_VERSION= 0.11.1 +XFCE4_VERSION= 1.4.1 DISTNAME= xfce4-notes-plugin-${XFCE4_VERSION} -PKGREVISION= 3 +#PKGREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= http://download.berlios.de/xfce-goodies/ +MASTER_SITES= http://goodies.xfce.org/releases/xfce4-notes-plugin/ COMMENT= Xfce notes plugin .include "../../x11/xfce4-panel/buildlink3.mk" diff --git a/x11/xfce4-notes-plugin/PLIST b/x11/xfce4-notes-plugin/PLIST index 3e23d366ec5..4eded5315aa 100644 --- a/x11/xfce4-notes-plugin/PLIST +++ b/x11/xfce4-notes-plugin/PLIST @@ -1,4 +1,18 @@ -@comment $NetBSD: PLIST,v 1.3 2005/10/28 07:03:31 martti Exp $ -lib/xfce4/panel-plugins/libnotes.la -share/xfce4/notes/note_xfce.png -@dirrm share/xfce4/notes +@comment $NetBSD: PLIST,v 1.4 2007/04/12 09:55:23 martti Exp $ +bin/xfce4-popup-notes +libexec/xfce4/panel-plugins/xfce4-notes-plugin +share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png +share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png +share/icons/hicolor/24x24/apps/xfce4-notes-plugin.png +share/icons/hicolor/32x32/apps/xfce4-notes-plugin.png +share/icons/hicolor/scalable/apps/xfce4-notes-plugin.svg +share/locale/ca/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo +share/xfce4/panel-plugins/xfce4-notes-plugin.desktop diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk index 6ed03fbdcec..d0d750b42bf 100644 --- a/x11/xfce4-notes-plugin/buildlink3.mk +++ b/x11/xfce4-notes-plugin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/10/12 09:24:21 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2007/04/12 09:55:23 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:= ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+ @@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+= xfce4-notes-plugin BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-notes-plugin .if ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=0.11.1nb3 +BUILDLINK_API_DEPENDS.xfce4-notes-plugin+= xfce4-notes-plugin>=1.4 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?= ../../x11/xfce4-notes-plugin .endif # XFCE4_NOTES_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-notes-plugin/distinfo b/x11/xfce4-notes-plugin/distinfo index 8f38382882b..8d50eda69d9 100644 --- a/x11/xfce4-notes-plugin/distinfo +++ b/x11/xfce4-notes-plugin/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2005/12/18 22:56:15 rillig Exp $ +$NetBSD: distinfo,v 1.6 2007/04/12 09:55:23 martti Exp $ -SHA1 (xfce4-notes-plugin-0.11.1.tar.gz) = f0955bb680b9c7f98e86cb743d695bc5b0edd2d1 -RMD160 (xfce4-notes-plugin-0.11.1.tar.gz) = 67df2aad40cbfa7f7a544ab1a050a1b974885eed -Size (xfce4-notes-plugin-0.11.1.tar.gz) = 339966 bytes -SHA1 (patch-aa) = 1a1ba3c7f9f97f34046cf5fd37260d32a767899f +SHA1 (xfce4-notes-plugin-1.4.1.tar.bz2) = 6cc99392e44e94a81731dbd585a075c195f2a9d8 +RMD160 (xfce4-notes-plugin-1.4.1.tar.bz2) = abd47c86f7235406e84c5871603afdc80f7e04c9 +Size (xfce4-notes-plugin-1.4.1.tar.bz2) = 157811 bytes diff --git a/x11/xfce4-notes-plugin/patches/patch-aa b/x11/xfce4-notes-plugin/patches/patch-aa deleted file mode 100644 index 94dc09abdf9..00000000000 --- a/x11/xfce4-notes-plugin/patches/patch-aa +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2005/12/18 22:56:15 rillig Exp $ - -Keywords: c90 - ---- panel-plugin/notes.c.orig Sat Oct 1 18:30:35 2005 -+++ panel-plugin/notes.c Sun Dec 18 23:52:08 2005 -@@ -148,9 +148,6 @@ notes_create_note (void) - - _note *note; - -- /* create or note structure */ -- note = g_new(_note, 1); -- - GtkWidget *main_w; - GtkWidget *table; - GtkWidget *text_view; -@@ -169,6 +166,9 @@ notes_create_note (void) - GtkWidget *hbox; - - GtkWidget *button_close_image; -+ -+ /* create or note structure */ -+ note = g_new(_note, 1); - - main_w = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (main_w), _("main_w")); diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index 52121425252..c609598f6bf 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,36 +1,31 @@ -# $NetBSD: Makefile,v 1.29 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: Makefile,v 1.30 2007/04/12 09:55:23 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" +.include "../../mk/compiler.mk" -DISTNAME= xfce4-panel-${XFCE4_VERSION} -#PKGREVISION= 1 -CATEGORIES= x11 -COMMENT= Xfce panel +DISTNAME= xfce4-panel-${XFCE4_VERSION} +#PKGREVISION= 1 +CATEGORIES= x11 +COMMENT= Xfce panel + +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc PKGCONFIG_OVERRIDE= panel/xfce4-panel-1.0.pc.in PTHREAD_AUTO_VARS= yes +# If using gcc-4, compile the panel launcher without GCC optimization. See +# http://bugzilla.xfce.org/show_bug.cgi?id=2262 -PKG_SYSCONFSUBDIR= xdg/xfce4/panel -EGDIR= ${XFCE4_EGBASE}/panel -CONF_FILES= ${EGDIR:Q}/contents.xml ${PKG_SYSCONFDIR:Q}/contents.xml -.for l in ar az ca da el eu fi fr he hu it ja ko lt ms nl pl ro ru sk sv \ - tr vi zh_CN zh_TW -CONF_FILES+= ${EGDIR:Q}/contents.xml.${l} \ - ${PKG_SYSCONFDIR:Q}/contents.xml.${l} -.endfor - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} - -REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} - -BUILDLINK_DEPMETHOD.libXt?= build +.if (!empty(CC_VERSION:Mgcc-4.*)) +SUBST_CLASSES+= launcher +SUBST_STAGE.launcher= post-configure +SUBST_FILES.launcher= plugins/launcher/Makefile +SUBST_SED.launcher= -e 's|-O |-O0 |g' +SUBST_SED.launcher+= -e 's|-O[123s] |-O0 |g' +.endif .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST index 5895446b453..acdabcec2c9 100644 --- a/x11/xfce4-panel/PLIST +++ b/x11/xfce4-panel/PLIST @@ -1,71 +1,71 @@ -@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:23 martti Exp $ +bin/xfce4-iconbox bin/xfce4-panel -include/xfce4/panel/add-control-dialog.h -include/xfce4/panel/controls.h -include/xfce4/panel/global.h -include/xfce4/panel/icons.h -include/xfce4/panel/item.h -include/xfce4/panel/item_dialog.h -include/xfce4/panel/main.h -include/xfce4/panel/panel.h -include/xfce4/panel/plugins.h -include/xfce4/panel/xfce.h -include/xfce4/panel/xfce_support.h -lib/pkgconfig/xfce4-panel-1.0.pc +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 +etc/xdg/xfce4/panel/launcher-8.rc +etc/xdg/xfce4/panel/launcher-9.rc +etc/xdg/xfce4/panel/panels.xml +etc/xdg/xfce4/panel/systray-4.rc +etc/xdg/xfce4/panel/xfce4-menu-5.rc +include/xfce4/libxfce4panel/xfce-arrow-button.h +include/xfce4/libxfce4panel/xfce-hvbox.h +include/xfce4/libxfce4panel/xfce-itembar.h +include/xfce4/libxfce4panel/xfce-panel-convenience.h +include/xfce4/libxfce4panel/xfce-panel-enum-types.h +include/xfce4/libxfce4panel/xfce-panel-enums.h +include/xfce4/libxfce4panel/xfce-panel-external-plugin.h +include/xfce4/libxfce4panel/xfce-panel-internal-plugin.h +include/xfce4/libxfce4panel/xfce-panel-macros.h +include/xfce4/libxfce4panel/xfce-panel-plugin-iface.h +include/xfce4/libxfce4panel/xfce-panel-plugin.h +include/xfce4/libxfce4panel/xfce-panel-window.h +lib/libxfce4panel.la +lib/pkgconfig/libxfce4panel-1.0.pc lib/xfce4/mcs-plugins/libxfce4settings.la +lib/xfce4/panel-plugins/libactions.la lib/xfce4/panel-plugins/libclock.la -lib/xfce4/panel-plugins/libmailcheck.la +lib/xfce4/panel-plugins/libiconbox.la +lib/xfce4/panel-plugins/liblauncher.la lib/xfce4/panel-plugins/libpager.la lib/xfce4/panel-plugins/libseparator.la -lib/xfce4/panel-plugins/libswitcher.la -lib/xfce4/panel-plugins/libsystembuttons.la -share/applications/xfce-panel-settings.desktop -share/examples/xfce4/panel/contents.xml -share/examples/xfce4/panel/contents.xml.ar -share/examples/xfce4/panel/contents.xml.az -share/examples/xfce4/panel/contents.xml.ca -share/examples/xfce4/panel/contents.xml.da -share/examples/xfce4/panel/contents.xml.el -share/examples/xfce4/panel/contents.xml.eu -share/examples/xfce4/panel/contents.xml.fi -share/examples/xfce4/panel/contents.xml.fr -share/examples/xfce4/panel/contents.xml.he -share/examples/xfce4/panel/contents.xml.hu -share/examples/xfce4/panel/contents.xml.it -share/examples/xfce4/panel/contents.xml.ja -share/examples/xfce4/panel/contents.xml.ko -share/examples/xfce4/panel/contents.xml.lt -share/examples/xfce4/panel/contents.xml.ms -share/examples/xfce4/panel/contents.xml.nl -share/examples/xfce4/panel/contents.xml.pl -share/examples/xfce4/panel/contents.xml.ro -share/examples/xfce4/panel/contents.xml.ru -share/examples/xfce4/panel/contents.xml.sk -share/examples/xfce4/panel/contents.xml.sv -share/examples/xfce4/panel/contents.xml.tr -share/examples/xfce4/panel/contents.xml.vi -share/examples/xfce4/panel/contents.xml.zh_CN -share/examples/xfce4/panel/contents.xml.zh_TW +lib/xfce4/panel-plugins/libshowdesktop.la +lib/xfce4/panel-plugins/libsystray.la +lib/xfce4/panel-plugins/libtasklist.la +lib/xfce4/panel-plugins/libwindowlist.la +share/applications/xfce4-panel-manager.desktop +share/doc/libxfce4panel/XfceArrowButton.html +share/doc/libxfce4panel/XfceExternalPanelPlugin.html +share/doc/libxfce4panel/XfceHVBox.html +share/doc/libxfce4panel/XfceInternalPanelPlugin.html +share/doc/libxfce4panel/XfceItembar.html +share/doc/libxfce4panel/XfcePanelPlugin.html +share/doc/libxfce4panel/XfcePanelWindow.html +share/doc/libxfce4panel/ch01.html +share/doc/libxfce4panel/home.png +share/doc/libxfce4panel/index.html +share/doc/libxfce4panel/index.sgml +share/doc/libxfce4panel/left.png +share/doc/libxfce4panel/libxfce4panel-Convenience-Functions.html +share/doc/libxfce4panel/libxfce4panel-Standard-Enumerations.html +share/doc/libxfce4panel/libxfce4panel-Writing-Plugins.html +share/doc/libxfce4panel/libxfce4panel.devhelp +share/doc/libxfce4panel/libxfce4panel.devhelp2 +share/doc/libxfce4panel/right.png +share/doc/libxfce4panel/style.css +share/doc/libxfce4panel/up.png share/icons/hicolor/16x16/apps/xfce-system-exit.png share/icons/hicolor/16x16/apps/xfce-system-info.png share/icons/hicolor/16x16/apps/xfce-system-lock.png share/icons/hicolor/16x16/apps/xfce-system-settings.png -share/icons/hicolor/48x48/apps/xfce-edit.png -share/icons/hicolor/48x48/apps/xfce-filemanager.png -share/icons/hicolor/48x48/apps/xfce-games.png -share/icons/hicolor/48x48/apps/xfce-graphics.png -share/icons/hicolor/48x48/apps/xfce-internet.png share/icons/hicolor/48x48/apps/xfce-mail.png -share/icons/hicolor/48x48/apps/xfce-man.png -share/icons/hicolor/48x48/apps/xfce-multimedia.png -share/icons/hicolor/48x48/apps/xfce-printer.png -share/icons/hicolor/48x48/apps/xfce-schedule.png -share/icons/hicolor/48x48/apps/xfce-sound.png -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/48x48/apps/xfce-mouse.png +share/icons/hicolor/48x48/apps/xfce4-iconbox.png share/icons/hicolor/48x48/apps/xfce4-panel.png -share/locale/af/LC_MESSAGES/xfce4-panel.mo +share/icons/hicolor/48x48/apps/xfce4-taskbar.png share/locale/ar/LC_MESSAGES/xfce4-panel.mo share/locale/az/LC_MESSAGES/xfce4-panel.mo share/locale/be/LC_MESSAGES/xfce4-panel.mo @@ -73,8 +73,8 @@ share/locale/bg/LC_MESSAGES/xfce4-panel.mo share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo share/locale/ca/LC_MESSAGES/xfce4-panel.mo share/locale/cs/LC_MESSAGES/xfce4-panel.mo -share/locale/da/LC_MESSAGES/xfce4-panel.mo share/locale/de/LC_MESSAGES/xfce4-panel.mo +share/locale/dz/LC_MESSAGES/xfce4-panel.mo share/locale/el/LC_MESSAGES/xfce4-panel.mo share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo share/locale/eo/LC_MESSAGES/xfce4-panel.mo @@ -85,6 +85,7 @@ share/locale/eu/LC_MESSAGES/xfce4-panel.mo share/locale/fa/LC_MESSAGES/xfce4-panel.mo share/locale/fi/LC_MESSAGES/xfce4-panel.mo share/locale/fr/LC_MESSAGES/xfce4-panel.mo +share/locale/gl/LC_MESSAGES/xfce4-panel.mo share/locale/gu/LC_MESSAGES/xfce4-panel.mo share/locale/he/LC_MESSAGES/xfce4-panel.mo share/locale/hi/LC_MESSAGES/xfce4-panel.mo @@ -92,9 +93,10 @@ share/locale/hu/LC_MESSAGES/xfce4-panel.mo share/locale/hy/LC_MESSAGES/xfce4-panel.mo share/locale/it/LC_MESSAGES/xfce4-panel.mo 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/ku/LC_MESSAGES/xfce4-panel.mo share/locale/lt/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 share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo @@ -106,8 +108,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo share/locale/ro/LC_MESSAGES/xfce4-panel.mo share/locale/ru/LC_MESSAGES/xfce4-panel.mo share/locale/sk/LC_MESSAGES/xfce4-panel.mo -share/locale/sl/LC_MESSAGES/xfce4-panel.mo -share/locale/sq/LC_MESSAGES/xfce4-panel.mo share/locale/sv/LC_MESSAGES/xfce4-panel.mo share/locale/ta/LC_MESSAGES/xfce4-panel.mo share/locale/tr/LC_MESSAGES/xfce4-panel.mo @@ -115,44 +115,29 @@ share/locale/uk/LC_MESSAGES/xfce4-panel.mo share/locale/vi/LC_MESSAGES/xfce4-panel.mo share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo -share/xfce4/doc/C/images/add-item-dialog.png -share/xfce4/doc/C/images/clock-properties.png -share/xfce4/doc/C/images/default_panel.png -share/xfce4/doc/C/images/handle-popup.png -share/xfce4/doc/C/images/item-popup.png -share/xfce4/doc/C/images/launcher-properties.png -share/xfce4/doc/C/images/mailcheck-properties.png -share/xfce4/doc/C/images/menuitem-properties.png -share/xfce4/doc/C/images/nooptions-properties.png -share/xfce4/doc/C/images/pager-properties.png -share/xfce4/doc/C/images/panel-settings.png -share/xfce4/doc/C/images/systembuttons-properties.png +share/xfce4/doc/C/images/add_item_dialog.png +share/xfce4/doc/C/images/default_bottom_panel.png +share/xfce4/doc/C/images/default_top_panel.png +share/xfce4/doc/C/images/item_popup.png +share/xfce4/doc/C/images/launcher_properties.png +share/xfce4/doc/C/images/panel_manager.png share/xfce4/doc/C/xfce4-panel.html -share/xfce4/doc/fr/images/add-item-dialog.png -share/xfce4/doc/fr/images/clock-properties.png -share/xfce4/doc/fr/images/default_panel.png -share/xfce4/doc/fr/images/handle-popup.png -share/xfce4/doc/fr/images/item-popup.png -share/xfce4/doc/fr/images/launcher-properties.png -share/xfce4/doc/fr/images/mailcheck-properties.png -share/xfce4/doc/fr/images/menuitem-properties.png -share/xfce4/doc/fr/images/nooptions-properties.png -share/xfce4/doc/fr/images/pager-properties.png -share/xfce4/doc/fr/images/panel-settings.png -share/xfce4/doc/fr/images/systembuttons-properties.png -share/xfce4/doc/fr/xfce4-panel.html -share/xfce4/doc/he/images/add-item-dialog.png -share/xfce4/doc/he/images/clock-properties.png -share/xfce4/doc/he/images/default_panel.png -share/xfce4/doc/he/images/handle-popup.png -share/xfce4/doc/he/images/item-popup.png -share/xfce4/doc/he/images/launcher-properties.png -share/xfce4/doc/he/images/mailcheck-properties.png -share/xfce4/doc/he/images/menuitem-properties.png -share/xfce4/doc/he/images/nooptions-properties.png -share/xfce4/doc/he/images/pager-properties.png -share/xfce4/doc/he/images/panel-settings.png -share/xfce4/doc/he/images/systembuttons-properties.png -share/xfce4/doc/he/xfce4-panel.html +share/xfce4/panel-plugins/actions.desktop +share/xfce4/panel-plugins/clock.desktop +share/xfce4/panel-plugins/iconbox.desktop +share/xfce4/panel-plugins/launcher.desktop +share/xfce4/panel-plugins/pager.desktop +share/xfce4/panel-plugins/separator.desktop +share/xfce4/panel-plugins/showdesktop.desktop +share/xfce4/panel-plugins/systray.desktop +share/xfce4/panel-plugins/tasklist.desktop +share/xfce4/panel-plugins/windowlist.desktop +@dirrm share/xfce4/panel-plugins +@dirrm share/doc/libxfce4panel @dirrm lib/xfce4/panel-plugins -@dirrm include/xfce4/panel +@dirrm include/xfce4/libxfce4panel +@dirrm etc/xdg/xfce4/panel +@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/libexec/xfce4 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE} diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk index c19710f67b9..67d2bf45c6a 100644 --- a/x11/xfce4-panel/buildlink3.mk +++ b/x11/xfce4-panel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:23 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.2.4 +BUILDLINK_API_DEPENDS.xfce4-panel+= xfce4-panel>=4.4.1 BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel .endif # XFCE4_PANEL_BUILDLINK3_MK @@ -20,6 +20,7 @@ BUILDLINK_PKGSRCDIR.xfce4-panel?= ../../x11/xfce4-panel .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo index 06be96d4222..197e1fa2252 100644 --- a/x11/xfce4-panel/distinfo +++ b/x11/xfce4-panel/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.14 2007/01/23 11:53:47 martti Exp $ +$NetBSD: distinfo,v 1.15 2007/04/12 09:55:23 martti Exp $ -SHA1 (xfce4-panel-4.2.4.tar.gz) = c3dd474066e620e79e610e03b6d2a1a0ba104356 -RMD160 (xfce4-panel-4.2.4.tar.gz) = 369816f53f041d76e87addcdf9db38025f79de3f -Size (xfce4-panel-4.2.4.tar.gz) = 1376855 bytes -SHA1 (patch-aa) = e0a6484138e5b103f05f1067f5b8b47af90f69d1 +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 diff --git a/x11/xfce4-panel/patches/patch-aa b/x11/xfce4-panel/patches/patch-aa deleted file mode 100644 index 1fa6e8329ab..00000000000 --- a/x11/xfce4-panel/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2007/01/23 11:53:47 martti Exp $ - ---- Makefile.in.orig 2007-01-14 21:06:10.000000000 +0000 -+++ Makefile.in 2007-01-23 12:18:33.000000000 +0000 -@@ -238,7 +238,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --confdir = $(sysconfdir)/xdg/xfce4/panel -+confdir = $(datadir)/examples/xfce4/panel - conf_DATA = \ - contents.xml \ - contents.xml.ar \ diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index e626338a763..491f1a2b9c4 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,31 +1,26 @@ -# $NetBSD: Makefile,v 1.18 2007/02/03 09:27:33 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2007/04/12 09:55:24 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= xfce4-session-${XFCE4_VERSION} -#PKGREVISION= 1 -CATEGORIES= x11 -COMMENT= Xfce session manager - +DISTNAME= xfce4-session-${XFCE4_VERSION} +CATEGORIES= x11 +COMMENT= Xfce session manager PKG_SYSCONFSUBDIR= xdg/xfce4-session EGDIR= ${XFCE4_EGBASE}/session CONF_FILES= ${EGDIR:Q}/xfce4-session.rc \ ${PKG_SYSCONFDIR:Q}/xfce4-session.rc -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} \ - ICEAUTH=${TOOLS_PATH.iceauth:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} +CONFIGURE_ARGS+= ICEAUTH=${TOOLS_PATH.iceauth:Q} REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} +BUILD_DEFS+= PKG_SYSCONFBASE -USE_DIRS+= xdg-1.4 -USE_TOOLS+= iceauth:run - -BUILDLINK_DEPMETHOD.libXt?= build +USE_TOOLS+= iceauth:run +USE_TOOLS+= intltool +USE_DIRS+= xdg-1.4 .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST index d921216eaab..9d12f916286 100644 --- a/x11/xfce4-session/PLIST +++ b/x11/xfce4-session/PLIST @@ -1,6 +1,9 @@ -@comment $NetBSD: PLIST,v 1.8 2007/01/23 11:53:47 martti Exp $ +@comment $NetBSD: PLIST,v 1.9 2007/04/12 09:55:24 martti Exp $ +bin/xfce4-autostart-editor bin/xfce4-session bin/xfce4-session-logout +bin/xfce4-tips +etc/xdg/autostart/xfce4-tips-autostart.desktop include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h lib/libxfsm-4.2.la @@ -17,25 +20,27 @@ man/man1/xfce4-session-logout.1 man/man1/xfce4-session.1 share/applications/xfce-session-settings.desktop share/applications/xfce-splash-settings.desktop +share/applications/xfce4-autostart-editor.desktop share/examples/xfce4/session/xfce4-session.rc share/icons/hicolor/128x128/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-splash.png +share/icons/hicolor/48x48/apps/xfsm-logout.png +share/icons/hicolor/48x48/apps/xfsm-reboot.png share/icons/hicolor/48x48/apps/xfsm-shutdown.png share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png 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/af/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 share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo share/locale/ca/LC_MESSAGES/xfce4-session.mo share/locale/cs/LC_MESSAGES/xfce4-session.mo -share/locale/da/LC_MESSAGES/xfce4-session.mo share/locale/de/LC_MESSAGES/xfce4-session.mo +share/locale/dz/LC_MESSAGES/xfce4-session.mo share/locale/el/LC_MESSAGES/xfce4-session.mo share/locale/en_GB/LC_MESSAGES/xfce4-session.mo share/locale/eo/LC_MESSAGES/xfce4-session.mo @@ -46,15 +51,17 @@ share/locale/eu/LC_MESSAGES/xfce4-session.mo share/locale/fa/LC_MESSAGES/xfce4-session.mo share/locale/fi/LC_MESSAGES/xfce4-session.mo share/locale/fr/LC_MESSAGES/xfce4-session.mo +share/locale/gl/LC_MESSAGES/xfce4-session.mo share/locale/gu/LC_MESSAGES/xfce4-session.mo share/locale/he/LC_MESSAGES/xfce4-session.mo share/locale/hi/LC_MESSAGES/xfce4-session.mo share/locale/hu/LC_MESSAGES/xfce4-session.mo share/locale/it/LC_MESSAGES/xfce4-session.mo 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/ku/LC_MESSAGES/xfce4-session.mo share/locale/lt/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 share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo @@ -66,8 +73,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo share/locale/ro/LC_MESSAGES/xfce4-session.mo share/locale/ru/LC_MESSAGES/xfce4-session.mo share/locale/sk/LC_MESSAGES/xfce4-session.mo -share/locale/sl/LC_MESSAGES/xfce4-session.mo -share/locale/sq/LC_MESSAGES/xfce4-session.mo share/locale/sv/LC_MESSAGES/xfce4-session.mo share/locale/ta/LC_MESSAGES/xfce4-session.mo share/locale/tr/LC_MESSAGES/xfce4-session.mo @@ -85,12 +90,15 @@ share/xfce4/doc/fr/images/xfsm-advanced.png share/xfce4/doc/fr/images/xfsm-general.png share/xfce4/doc/fr/images/xfsm-splash.png share/xfce4/doc/fr/xfce4-session.html -share/xfce4/doc/he/images/xfsm-advanced.png -share/xfce4/doc/he/images/xfsm-general.png -share/xfce4/doc/he/images/xfsm-splash.png -share/xfce4/doc/he/xfce4-session.html +share/xfce4/tips/tips +share/xfce4/tips/tips.dat +@dirrm share/xfce4/tips @dirrm share/themes/Default/balou +@dirrm share/examples/xfce4/session @dirrm lib/xfce4/splash/engines @dirrm lib/xfce4/splash @dirrm include/xfce4/xfce4-session-4.2/libxfsm @dirrm include/xfce4/xfce4-session-4.2 +@dirrm etc/xdg/xfce4-session +@dirrm etc/xdg/autostart +@unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE} diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk index bf8510c97cc..898c06f97f1 100644 --- a/x11/xfce4-session/buildlink3.mk +++ b/x11/xfce4-session/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/01/23 11:53:47 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:24 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_SESSION_BUILDLINK3_MK:= ${XFCE4_SESSION_BUILDLINK3_MK}+ @@ -12,12 +12,13 @@ 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.2.4 +BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.4.1 BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session .endif # XFCE4_SESSION_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index 8ffff22458f..6e6319328d3 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2007/01/23 11:53:48 martti Exp $ +$NetBSD: distinfo,v 1.8 2007/04/12 09:55:24 martti Exp $ -SHA1 (xfce4-session-4.2.4.tar.gz) = 61e20cbf624e74f69f65c8a338c0599c4bd44040 -RMD160 (xfce4-session-4.2.4.tar.gz) = c715e5ed4055e8689e5a0ac1d80e2e5f157b6c90 -Size (xfce4-session-4.2.4.tar.gz) = 1595909 bytes -SHA1 (patch-aa) = acf3953b39f632423fddd799ba66eb8b4b6893bc +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 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195 diff --git a/x11/xfce4-session/patches/patch-aa b/x11/xfce4-session/patches/patch-aa index 63f9b350f8f..af69a182f1d 100644 --- a/x11/xfce4-session/patches/patch-aa +++ b/x11/xfce4-session/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1 2005/06/15 09:03:28 hira Exp $ +$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:24 martti Exp $ ---- Makefile.in.orig 2005-06-13 18:25:08.000000000 +0900 -+++ Makefile.in 2005-06-13 18:26:18.000000000 +0900 -@@ -249,7 +249,7 @@ - xfce4-session-logout \ +--- Makefile.in.orig 2006-07-10 12:12:02.000000000 +0000 ++++ Makefile.in 2006-07-14 09:28:20.000000000 +0000 +@@ -278,7 +278,7 @@ + xfce4-tips \ xfsm-shutdown-helper -configdir = $(sysconfdir)/xdg/xfce4-session +configdir = $(datadir)/examples/xfce4/session config_DATA = xfce4-session.rc EXTRA_DIST = \ - $(config_DATA) \ + BUGS \ diff --git a/x11/xfce4-toys/DESCR b/x11/xfce4-toys/DESCR deleted file mode 100644 index 0639fe6d7f9..00000000000 --- a/x11/xfce4-toys/DESCR +++ /dev/null @@ -1 +0,0 @@ -Additional toys for Xfce. diff --git a/x11/xfce4-toys/Makefile b/x11/xfce4-toys/Makefile deleted file mode 100644 index 2bd909c6f0d..00000000000 --- a/x11/xfce4-toys/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: Makefile,v 1.17 2007/01/23 11:53:48 martti Exp $ - -.include "../../meta-pkgs/xfce4/Makefile.common" - -DISTNAME= xfce4-toys-${XFCE4_VERSION} -#PKGREVISION= 1 -CATEGORIES= x11 -COMMENT= Xfce toys - -BUILDLINK_DEPMETHOD.libXt?= build - -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-toys/PLIST b/x11/xfce4-toys/PLIST deleted file mode 100644 index 024a63b9106..00000000000 --- a/x11/xfce4-toys/PLIST +++ /dev/null @@ -1,78 +0,0 @@ -@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:48 martti Exp $ -bin/xfce4-tips -lib/xfce4/panel-plugins/libeyes.la -share/locale/af/LC_MESSAGES/xfce4-toys.mo -share/locale/ar/LC_MESSAGES/xfce4-toys.mo -share/locale/az/LC_MESSAGES/xfce4-toys.mo -share/locale/be/LC_MESSAGES/xfce4-toys.mo -share/locale/bg/LC_MESSAGES/xfce4-toys.mo -share/locale/bn_IN/LC_MESSAGES/xfce4-toys.mo -share/locale/ca/LC_MESSAGES/xfce4-toys.mo -share/locale/cs/LC_MESSAGES/xfce4-toys.mo -share/locale/da/LC_MESSAGES/xfce4-toys.mo -share/locale/de/LC_MESSAGES/xfce4-toys.mo -share/locale/el/LC_MESSAGES/xfce4-toys.mo -share/locale/en_GB/LC_MESSAGES/xfce4-toys.mo -share/locale/eo/LC_MESSAGES/xfce4-toys.mo -share/locale/es/LC_MESSAGES/xfce4-toys.mo -share/locale/es_MX/LC_MESSAGES/xfce4-toys.mo -share/locale/et/LC_MESSAGES/xfce4-toys.mo -share/locale/eu/LC_MESSAGES/xfce4-toys.mo -share/locale/fa/LC_MESSAGES/xfce4-toys.mo -share/locale/fi/LC_MESSAGES/xfce4-toys.mo -share/locale/fr/LC_MESSAGES/xfce4-toys.mo -share/locale/gu/LC_MESSAGES/xfce4-toys.mo -share/locale/he/LC_MESSAGES/xfce4-toys.mo -share/locale/hi/LC_MESSAGES/xfce4-toys.mo -share/locale/hu/LC_MESSAGES/xfce4-toys.mo -share/locale/it/LC_MESSAGES/xfce4-toys.mo -share/locale/ja/LC_MESSAGES/xfce4-toys.mo -share/locale/ka/LC_MESSAGES/xfce4-toys.mo -share/locale/ko/LC_MESSAGES/xfce4-toys.mo -share/locale/ku/LC_MESSAGES/xfce4-toys.mo -share/locale/lt/LC_MESSAGES/xfce4-toys.mo -share/locale/mr/LC_MESSAGES/xfce4-toys.mo -share/locale/ms/LC_MESSAGES/xfce4-toys.mo -share/locale/nb_NO/LC_MESSAGES/xfce4-toys.mo -share/locale/nl/LC_MESSAGES/xfce4-toys.mo -share/locale/pa/LC_MESSAGES/xfce4-toys.mo -share/locale/pl/LC_MESSAGES/xfce4-toys.mo -share/locale/pt_BR/LC_MESSAGES/xfce4-toys.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-toys.mo -share/locale/ro/LC_MESSAGES/xfce4-toys.mo -share/locale/ru/LC_MESSAGES/xfce4-toys.mo -share/locale/sk/LC_MESSAGES/xfce4-toys.mo -share/locale/sl/LC_MESSAGES/xfce4-toys.mo -share/locale/sq/LC_MESSAGES/xfce4-toys.mo -share/locale/sv/LC_MESSAGES/xfce4-toys.mo -share/locale/ta/LC_MESSAGES/xfce4-toys.mo -share/locale/tr/LC_MESSAGES/xfce4-toys.mo -share/locale/uk/LC_MESSAGES/xfce4-toys.mo -share/locale/vi/LC_MESSAGES/xfce4-toys.mo -share/locale/zh_CN/LC_MESSAGES/xfce4-toys.mo -share/locale/zh_TW/LC_MESSAGES/xfce4-toys.mo -share/xfce4/eyes/themes/Bizarre/Bizarre-eye.png -share/xfce4/eyes/themes/Bizarre/Bizarre-pupil.png -share/xfce4/eyes/themes/Bizarre/config -share/xfce4/eyes/themes/Bloodshot/Bloodshot-eye.png -share/xfce4/eyes/themes/Bloodshot/Bloodshot-pupil.png -share/xfce4/eyes/themes/Bloodshot/config -share/xfce4/eyes/themes/Default-tiny/Default-tiny-eye.png -share/xfce4/eyes/themes/Default-tiny/Default-tiny-pupil.png -share/xfce4/eyes/themes/Default-tiny/config -share/xfce4/eyes/themes/Default/Default-eye.png -share/xfce4/eyes/themes/Default/Default-pupil.png -share/xfce4/eyes/themes/Default/config -share/xfce4/eyes/themes/Horrid/Horrid-eye.png -share/xfce4/eyes/themes/Horrid/Horrid-pupil.png -share/xfce4/eyes/themes/Horrid/config -share/xfce4/tips/tips -share/xfce4/tips/tips.dat -@dirrm share/xfce4/tips -@dirrm share/xfce4/eyes/themes/Horrid -@dirrm share/xfce4/eyes/themes/Default-tiny -@dirrm share/xfce4/eyes/themes/Default -@dirrm share/xfce4/eyes/themes/Bloodshot -@dirrm share/xfce4/eyes/themes/Bizarre -@dirrm share/xfce4/eyes/themes -@dirrm share/xfce4/eyes diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk deleted file mode 100644 index 7faf9cace43..00000000000 --- a/x11/xfce4-toys/buildlink3.mk +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.18 2007/01/23 11:53:48 martti Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_TOYS_BUILDLINK3_MK:= ${XFCE4_TOYS_BUILDLINK3_MK}+ - -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-toys -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-toys} -BUILDLINK_PACKAGES+= xfce4-toys -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-toys - -.if ${XFCE4_TOYS_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-toys+= xfce4-toys>=4.2.4 -BUILDLINK_PKGSRCDIR.xfce4-toys?= ../../x11/xfce4-toys -.endif # XFCE4_TOYS_BUILDLINK3_MK - -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-toys/distinfo b/x11/xfce4-toys/distinfo deleted file mode 100644 index b4c72cbb442..00000000000 --- a/x11/xfce4-toys/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.13 2007/01/23 11:53:48 martti Exp $ - -SHA1 (xfce4-toys-4.2.4.tar.gz) = 1cea76250afe2ce5338727f70d6b9ad9f09ee4ac -RMD160 (xfce4-toys-4.2.4.tar.gz) = f7a80c717e6ec7faa2fc6199f6b11326475d2d36 -Size (xfce4-toys-4.2.4.tar.gz) = 442908 bytes diff --git a/x11/xfce4-trigger-launcher/DESCR b/x11/xfce4-trigger-launcher/DESCR deleted file mode 100644 index 56b2d8231f0..00000000000 --- a/x11/xfce4-trigger-launcher/DESCR +++ /dev/null @@ -1 +0,0 @@ -Trigger launcher for Xfce. diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile deleted file mode 100644 index 60c21d18763..00000000000 --- a/x11/xfce4-trigger-launcher/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2007/01/23 11:53:48 martti Exp $ - -.include "../../meta-pkgs/xfce4/Makefile.common" - -DISTNAME= xfce4-trigger-launcher-${XFCE4_VERSION} -#PKGREVISION= 1 -CATEGORIES= x11 -COMMENT= Xfce trigger-launcher - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-trigger-launcher/PLIST b/x11/xfce4-trigger-launcher/PLIST deleted file mode 100644 index f569d3dfbff..00000000000 --- a/x11/xfce4-trigger-launcher/PLIST +++ /dev/null @@ -1,51 +0,0 @@ -@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:48 martti Exp $ -lib/xfce4/panel-plugins/libtriggerlauncher.la -share/locale/af/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ar/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/az/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/be/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/bg/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/bn_IN/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ca/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/cs/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/da/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/de/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/el/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/en_GB/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/eo/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/es/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/es_MX/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/et/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/eu/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/fa/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/fi/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/fr/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/gu/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/he/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/hi/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/hu/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/it/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ja/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ka/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ko/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ku/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/lt/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/mr/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ms/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/nl/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/pa/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/pl/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/pt_BR/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/pt_PT/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ro/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ru/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/sk/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/sl/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/sq/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/sv/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/ta/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/tr/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/uk/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/vi/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/zh_CN/LC_MESSAGES/xfce4-trigger-launcher.mo -share/locale/zh_TW/LC_MESSAGES/xfce4-trigger-launcher.mo diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk deleted file mode 100644 index 56e6bc81f5c..00000000000 --- a/x11/xfce4-trigger-launcher/buildlink3.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:48 martti Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:= ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+ - -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-trigger-launcher -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher} -BUILDLINK_PACKAGES+= xfce4-trigger-launcher -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-trigger-launcher - -.if ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.xfce4-trigger-launcher+= xfce4-trigger-launcher>=4.2.4 -BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?= ../../x11/xfce4-trigger-launcher -.endif # XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK - -.include "../../x11/xfce4-panel/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-trigger-launcher/distinfo b/x11/xfce4-trigger-launcher/distinfo deleted file mode 100644 index fe038dbeec0..00000000000 --- a/x11/xfce4-trigger-launcher/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.13 2007/01/23 11:53:48 martti Exp $ - -SHA1 (xfce4-trigger-launcher-4.2.4.tar.gz) = 931db72a5e9d88eb6f5cfa2f45a8b5847670e11e -RMD160 (xfce4-trigger-launcher-4.2.4.tar.gz) = 9d91ce07dd21a84671b6be196e51c61e722c7bbe -Size (xfce4-trigger-launcher-4.2.4.tar.gz) = 384020 bytes diff --git a/x11/xfce4-utils/MESSAGE b/x11/xfce4-utils/MESSAGE index 47807c3d2c7..08929999385 100644 --- a/x11/xfce4-utils/MESSAGE +++ b/x11/xfce4-utils/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2004/10/05 09:58:52 martti Exp $ +$NetBSD: MESSAGE,v 1.2 2007/04/12 09:55:26 martti Exp $ You may want to install one of these packages: diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile index 763524eebf2..ef069436b29 100644 --- a/x11/xfce4-utils/Makefile +++ b/x11/xfce4-utils/Makefile @@ -1,14 +1,12 @@ -# $NetBSD: Makefile,v 1.29 2007/01/23 17:42:27 drochner Exp $ +# $NetBSD: Makefile,v 1.30 2007/04/12 09:55:26 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xfce-utils-${XFCE4_VERSION} PKGNAME= xfce4-utils-${XFCE4_VERSION} -#PKGREVISION= 1 CATEGORIES= x11 COMMENT= Xfce utilities - PKG_SYSCONFSUBDIR= xdg/xfce4 EGDIR= ${XFCE4_EGBASE} CONF_FILES= ${EGDIR:Q}/xinitrc ${PKG_SYSCONFDIR:Q}/xinitrc @@ -16,15 +14,12 @@ USE_TOOLS+= xinit:run REQD_DIRS+= ${EGDIR} +BUILD_DEFS+= PKG_SYSCONFBASE + CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} .include "options.mk" -BUILDLINK_DEPMETHOD.libXt?= build - .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST index 94fb74474fc..b2f473e4b53 100644 --- a/x11/xfce4-utils/PLIST +++ b/x11/xfce4-utils/PLIST @@ -1,18 +1,14 @@ -@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:48 martti Exp $ +@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:26 martti Exp $ bin/startxfce4 +bin/xfbrowser4 bin/xfce4-about bin/xfhelp4 bin/xflock4 bin/xfmountdev4 bin/xfrun4 -bin/xftaskbar4 bin/xfterm4 -lib/xfce4/mcs-plugins/xftaskbar_plugin.la -share/applications/xfce-taskbar-settings.desktop share/examples/xfce4/xinitrc share/icons/hicolor/48x48/apps/xfce4-logo.png -share/icons/hicolor/48x48/apps/xfce4-taskbar.png -share/icons/hicolor/scalable/apps/xfce4-taskbar.svg share/locale/af/LC_MESSAGES/xfce-utils.mo share/locale/ar/LC_MESSAGES/xfce-utils.mo share/locale/az/LC_MESSAGES/xfce-utils.mo @@ -21,8 +17,8 @@ share/locale/bg/LC_MESSAGES/xfce-utils.mo share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo share/locale/ca/LC_MESSAGES/xfce-utils.mo share/locale/cs/LC_MESSAGES/xfce-utils.mo -share/locale/da/LC_MESSAGES/xfce-utils.mo share/locale/de/LC_MESSAGES/xfce-utils.mo +share/locale/dz/LC_MESSAGES/xfce-utils.mo share/locale/el/LC_MESSAGES/xfce-utils.mo share/locale/en_GB/LC_MESSAGES/xfce-utils.mo share/locale/eo/LC_MESSAGES/xfce-utils.mo @@ -33,6 +29,7 @@ share/locale/eu/LC_MESSAGES/xfce-utils.mo share/locale/fa/LC_MESSAGES/xfce-utils.mo share/locale/fi/LC_MESSAGES/xfce-utils.mo share/locale/fr/LC_MESSAGES/xfce-utils.mo +share/locale/gl/LC_MESSAGES/xfce-utils.mo share/locale/gu/LC_MESSAGES/xfce-utils.mo share/locale/he/LC_MESSAGES/xfce-utils.mo share/locale/hi/LC_MESSAGES/xfce-utils.mo @@ -40,9 +37,10 @@ share/locale/hu/LC_MESSAGES/xfce-utils.mo share/locale/hy/LC_MESSAGES/xfce-utils.mo share/locale/it/LC_MESSAGES/xfce-utils.mo 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/ku/LC_MESSAGES/xfce-utils.mo share/locale/lt/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/nl/LC_MESSAGES/xfce-utils.mo @@ -53,8 +51,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo share/locale/ro/LC_MESSAGES/xfce-utils.mo share/locale/ru/LC_MESSAGES/xfce-utils.mo share/locale/sk/LC_MESSAGES/xfce-utils.mo -share/locale/sl/LC_MESSAGES/xfce-utils.mo -share/locale/sq/LC_MESSAGES/xfce-utils.mo share/locale/sv/LC_MESSAGES/xfce-utils.mo share/locale/ta/LC_MESSAGES/xfce-utils.mo share/locale/tr/LC_MESSAGES/xfce-utils.mo @@ -63,71 +59,20 @@ share/locale/vi/LC_MESSAGES/xfce-utils.mo share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo share/xfce4/AUTHORS -share/xfce4/AUTHORS.az -share/xfce4/AUTHORS.ca -share/xfce4/AUTHORS.de -share/xfce4/AUTHORS.es -share/xfce4/AUTHORS.eu -share/xfce4/AUTHORS.fi -share/xfce4/AUTHORS.fr -share/xfce4/AUTHORS.he -share/xfce4/AUTHORS.html -share/xfce4/AUTHORS.html.az -share/xfce4/AUTHORS.html.ca -share/xfce4/AUTHORS.html.de -share/xfce4/AUTHORS.html.es -share/xfce4/AUTHORS.html.eu -share/xfce4/AUTHORS.html.fi -share/xfce4/AUTHORS.html.fr -share/xfce4/AUTHORS.html.it -share/xfce4/AUTHORS.html.ja -share/xfce4/AUTHORS.html.lt -share/xfce4/AUTHORS.html.ro -share/xfce4/AUTHORS.html.ru -share/xfce4/AUTHORS.html.sk -share/xfce4/AUTHORS.html.vi -share/xfce4/AUTHORS.html.zh_TW -share/xfce4/AUTHORS.it -share/xfce4/AUTHORS.ja -share/xfce4/AUTHORS.lt -share/xfce4/AUTHORS.ro -share/xfce4/AUTHORS.ru -share/xfce4/AUTHORS.sk -share/xfce4/AUTHORS.uk -share/xfce4/AUTHORS.vi -share/xfce4/AUTHORS.zh_TW share/xfce4/BSD -share/xfce4/BSD.html share/xfce4/COPYING -share/xfce4/COPYING.html -share/xfce4/COPYING.vi share/xfce4/GPL -share/xfce4/GPL.html share/xfce4/INFO share/xfce4/INFO.ca share/xfce4/INFO.es share/xfce4/INFO.fi share/xfce4/INFO.fr -share/xfce4/INFO.html -share/xfce4/INFO.html.ca -share/xfce4/INFO.html.de -share/xfce4/INFO.html.es -share/xfce4/INFO.html.fi -share/xfce4/INFO.html.fr -share/xfce4/INFO.html.it -share/xfce4/INFO.html.ja -share/xfce4/INFO.html.lt -share/xfce4/INFO.html.ro -share/xfce4/INFO.html.ru share/xfce4/INFO.it share/xfce4/INFO.ja -share/xfce4/INFO.lt -share/xfce4/INFO.ro share/xfce4/INFO.ru share/xfce4/INFO.uk share/xfce4/INFO.vi share/xfce4/LGPL -share/xfce4/LGPL.html share/xfce4/doc/C/BSD.html share/xfce4/doc/C/GPL.html share/xfce4/doc/C/LGPL.html @@ -144,38 +89,8 @@ share/xfce4/doc/C/xfce4-install.html share/xfce4/doc/C/xfce4-intro.html share/xfce4/doc/C/xfce4-use.html share/xfce4/doc/C/xfce4-user-guide.html -share/xfce4/doc/fr/BSD.html -share/xfce4/doc/fr/GPL.html -share/xfce4/doc/fr/LGPL.html -share/xfce4/doc/fr/images/about-dialog.png -share/xfce4/doc/fr/images/default-session.png -share/xfce4/doc/fr/images/link_xfce.jpg -share/xfce4/doc/fr/images/run-dialog.png -share/xfce4/doc/fr/images/taskbar_settings.png share/xfce4/doc/fr/index.html -share/xfce4/doc/fr/xfce-utils.html -share/xfce4/doc/fr/xfce4-components.html -share/xfce4/doc/fr/xfce4-copyright.html -share/xfce4/doc/fr/xfce4-install.html -share/xfce4/doc/fr/xfce4-intro.html -share/xfce4/doc/fr/xfce4-use.html -share/xfce4/doc/fr/xfce4-user-guide.html -share/xfce4/doc/he/BSD.html -share/xfce4/doc/he/GPL.html -share/xfce4/doc/he/LGPL.html -share/xfce4/doc/he/images/about-dialog.png -share/xfce4/doc/he/images/default-session.png -share/xfce4/doc/he/images/link_xfce.jpg -share/xfce4/doc/he/images/run-dialog.png -share/xfce4/doc/he/images/taskbar_settings.png -share/xfce4/doc/he/index.html -share/xfce4/doc/he/xfce-utils.html -share/xfce4/doc/he/xfce4-components.html -share/xfce4/doc/he/xfce4-copyright.html -share/xfce4/doc/he/xfce4-install.html -share/xfce4/doc/he/xfce4-intro.html -share/xfce4/doc/he/xfce4-use.html -share/xfce4/doc/he/xfce4-user-guide.html +share/xfce4/doc/it/index.html +share/xfce4/doc/xfce-chunk.css share/xfce4/doc/xfce-mouse.png -share/xfce4/doc/xfce-rtl.css share/xfce4/doc/xfce.css diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk index 9ecc6b0fac5..f220fbc109f 100644 --- a/x11/xfce4-utils/buildlink3.mk +++ b/x11/xfce4-utils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2007/01/23 11:53:48 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2007/04/12 09:55:26 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_UTILS_BUILDLINK3_MK:= ${XFCE4_UTILS_BUILDLINK3_MK}+ @@ -12,12 +12,13 @@ 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.2.4 +BUILDLINK_API_DEPENDS.xfce4-utils+= xfce4-utils>=4.4.1 BUILDLINK_PKGSRCDIR.xfce4-utils?= ../../x11/xfce4-utils .endif # XFCE4_UTILS_BUILDLINK3_MK .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo index 52c801a3b31..867fcd7f6e2 100644 --- a/x11/xfce4-utils/distinfo +++ b/x11/xfce4-utils/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.16 2007/01/23 11:53:48 martti Exp $ +$NetBSD: distinfo,v 1.17 2007/04/12 09:55:26 martti Exp $ -SHA1 (xfce-utils-4.2.4.tar.gz) = eebc2f5ea2de22d6afab259476feb4f0e5cc54c2 -RMD160 (xfce-utils-4.2.4.tar.gz) = e415bebb909dfcc382e9b261378eb60d7bad6f00 -Size (xfce-utils-4.2.4.tar.gz) = 1295235 bytes -SHA1 (patch-aa) = deafbcd8b3c367d377aa25416c9d25043f907e60 -SHA1 (patch-ab) = 39c4fd41775cefc4cc2f10bc86060d9bbcc7b795 -SHA1 (patch-ac) = 5eb98ebc693c677dbd1e39efbf6016fb3fbf5f90 +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 diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa index b57ffe0c515..a91f41fe58d 100644 --- a/x11/xfce4-utils/patches/patch-aa +++ b/x11/xfce4-utils/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.1 2005/06/15 09:04:32 hira Exp $ +$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:26 martti Exp $ ---- scripts/Makefile.in.orig 2005-06-13 18:05:51.000000000 +0900 -+++ scripts/Makefile.in 2005-06-13 18:07:08.000000000 +0900 -@@ -233,7 +233,7 @@ - -e 's,@sysconfdir\@,$(sysconfdir),g' \ - -e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' +--- 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 @@ + -e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \ + -e 's,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g' -conffilesdir = @sysconfdir@/xdg/xfce4 +conffilesdir = @datadir@/examples/xfce4 diff --git a/x11/xfce4-utils/patches/patch-ab b/x11/xfce4-utils/patches/patch-ab deleted file mode 100644 index 31352f30591..00000000000 --- a/x11/xfce4-utils/patches/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/03/20 06:29:09 martti Exp $ - ---- scripts/xinitrc.orig 2005-11-05 19:03:34.000000000 +0200 -+++ scripts/xinitrc 2006-03-20 06:20:23.000000000 +0200 -@@ -1,8 +1,17 @@ - #!/bin/sh - - # fix broken $UID on some system... -+OPSYS=`uname -s` -+case "$OPSYS" in -+ *SunOS*) -+ ID_EXEC=/usr/xpg4/bin/id -+ ;; -+ *) -+ ID_EXEC=id -+ ;; -+esac - if test "x$UID" = "x"; then -- UID=`id -u` -+ UID=`$ID_EXEC -u` - fi - - # create temp file for X resources diff --git a/x11/xfce4-utils/patches/patch-ac b/x11/xfce4-utils/patches/patch-ac deleted file mode 100644 index c838e09147c..00000000000 --- a/x11/xfce4-utils/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2006/12/12 06:19:34 martti Exp $ - ---- xfce4-about/info.c.orig 2006-12-12 08:11:49.000000000 +0000 -+++ xfce4-about/info.c 2006-12-12 08:12:02.000000000 +0000 -@@ -140,7 +140,7 @@ - gchar *path; - gchar *hfilename; - gchar *buf; -- int n; -+ gsize n; - - err = NULL; - |