From a8c631d8352aabfcd6ef68f77e1906be240fd347 Mon Sep 17 00:00:00 2001 From: landry Date: Tue, 28 Apr 2009 19:47:15 +0000 Subject: [PATCH] Update to xfce-utils 4.6.1, tweak COMMENT for consistency. Remove a Makefile.in patch and use FAKE_FLAGS instead. --- x11/xfce4/xfce-utils/Makefile | 7 +++++-- x11/xfce4/xfce-utils/distinfo | 10 ++++----- .../patches/patch-scripts_Makefile_in | 21 ------------------- x11/xfce4/xfce-utils/pkg/PLIST | 10 ++++----- 4 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 x11/xfce4/xfce-utils/patches/patch-scripts_Makefile_in diff --git a/x11/xfce4/xfce-utils/Makefile b/x11/xfce4/xfce-utils/Makefile index 8ddc9a9e31c..f40d87bb9e5 100644 --- a/x11/xfce4/xfce-utils/Makefile +++ b/x11/xfce4/xfce-utils/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.24 2009/03/08 17:24:38 landry Exp $ +# $OpenBSD: Makefile,v 1.25 2009/04/28 19:47:15 landry Exp $ -COMMENT= essential utilities and scripts for xfce4 +COMMENT= Xfce4 essential utilities and scripts XFCE_PROJECT= xfce-utils @@ -29,4 +29,7 @@ WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ CONFIGURE_ARGS+=--with-browser="xterm -e lynx" \ --with-xsession-prefix=${PREFIX} + +FAKE_FLAGS= conffilesdir=${PREFIX}/share/examples/xfce-utils \ + autostartdir=${PREFIX}/share/examples/xfce-utils .include diff --git a/x11/xfce4/xfce-utils/distinfo b/x11/xfce4/xfce-utils/distinfo index a7ad4aac622..b03a12b22f5 100644 --- a/x11/xfce4/xfce-utils/distinfo +++ b/x11/xfce4/xfce-utils/distinfo @@ -1,5 +1,5 @@ -MD5 (xfce4/xfce-utils-4.6.0.tar.bz2) = sZKUCAGnvZu4AOVwopns3g== -RMD160 (xfce4/xfce-utils-4.6.0.tar.bz2) = LIfd4wCy90RklytgCHwyBczoPN0= -SHA1 (xfce4/xfce-utils-4.6.0.tar.bz2) = LKlID5oSq05YTie8PZ6Z7B+rEEE= -SHA256 (xfce4/xfce-utils-4.6.0.tar.bz2) = nmjH6ELMTjNyLbsCVBm4zTFoC/Ulm+jT2uOmcTEzQf8= -SIZE (xfce4/xfce-utils-4.6.0.tar.bz2) = 612886 +MD5 (xfce4/xfce-utils-4.6.1.tar.bz2) = GqI2KxHnnlbVLODSZfrxtg== +RMD160 (xfce4/xfce-utils-4.6.1.tar.bz2) = REbDiCcW6EHADjmN9iudVARrnSY= +SHA1 (xfce4/xfce-utils-4.6.1.tar.bz2) = C9tbbklPFTctjAgmrJO6ykdsnxY= +SHA256 (xfce4/xfce-utils-4.6.1.tar.bz2) = gxCtNpRWfcfL4NV/QoNxLKnldspzydxTpXa1RvC2tXE= +SIZE (xfce4/xfce-utils-4.6.1.tar.bz2) = 614143 diff --git a/x11/xfce4/xfce-utils/patches/patch-scripts_Makefile_in b/x11/xfce4/xfce-utils/patches/patch-scripts_Makefile_in deleted file mode 100644 index 7b331aad24f..00000000000 --- a/x11/xfce4/xfce-utils/patches/patch-scripts_Makefile_in +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-scripts_Makefile_in,v 1.4 2009/03/08 17:24:38 landry Exp $ ---- scripts/Makefile.in.orig Sun Sep 7 11:25:14 2008 -+++ scripts/Makefile.in Sun Sep 7 11:44:53 2008 -@@ -262,7 +262,7 @@ edit = sed \ - -e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g' \ - -e 's,@TERMINAL_DEFAULT\@,@TERMINAL_DEFAULT@,g' - --conffilesdir = @sysconfdir@/xdg/xfce4 -+conffilesdir = ${prefix}/share/examples/xfce-utils - conffiles_DATA = \ - xinitrc \ - Xft.xrdb -@@ -270,7 +270,7 @@ conffiles_DATA = \ - @XFCONF_MIGRATION_TRUE@migrationscriptdir = $(libexecdir)/xfce4/xfconf-migration - @XFCONF_MIGRATION_TRUE@migrationscript_in_files = xfconf-migration-4.6.pl.in - @XFCONF_MIGRATION_TRUE@migrationscript_SCRIPTS = $(migrationscript_in_files:.pl.in=.pl) --@XFCONF_MIGRATION_TRUE@autostartdir = $(sysconfdir)/xdg/autostart -+@XFCONF_MIGRATION_TRUE@autostartdir = $(prefix)/share/examples/xfce-utils - @XFCONF_MIGRATION_TRUE@autostart_in_files = xfconf-migration-4.6.desktop.in - @XFCONF_MIGRATION_TRUE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) - EXTRA_DIST = \ diff --git a/x11/xfce4/xfce-utils/pkg/PLIST b/x11/xfce4/xfce-utils/pkg/PLIST index e68ece58b2e..1b571594edf 100644 --- a/x11/xfce4/xfce-utils/pkg/PLIST +++ b/x11/xfce4/xfce-utils/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.11 2009/03/08 17:24:38 landry Exp $ +@comment $OpenBSD: PLIST,v 1.12 2009/04/28 19:47:15 landry Exp $ bin/startxfce4 bin/xfbrowser4 @bin bin/xfce4-about @@ -66,12 +66,12 @@ share/locale/lv/LC_MESSAGES/xfce-utils.mo share/locale/mk/LC_MESSAGES/xfce-utils.mo share/locale/mr/LC_MESSAGES/xfce-utils.mo share/locale/ms/LC_MESSAGES/xfce-utils.mo -share/locale/nb_NO/LC_MESSAGES/xfce-utils.mo +share/locale/nb/LC_MESSAGES/xfce-utils.mo share/locale/nl/LC_MESSAGES/xfce-utils.mo share/locale/pa/LC_MESSAGES/xfce-utils.mo share/locale/pl/LC_MESSAGES/xfce-utils.mo +share/locale/pt/LC_MESSAGES/xfce-utils.mo share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo -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/si/LC_MESSAGES/xfce-utils.mo @@ -118,11 +118,11 @@ 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/index.html -share/xfce4/doc/it/ share/xfce4/doc/it/index.html share/xfce4/doc/xfce-chunk.css share/xfce4/doc/xfce-mouse.png share/xfce4/doc/xfce.css +share/xsessions/ +share/xsessions/xfce.desktop @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true @unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true -share/xsessions/xfce.desktop