Update to xfce-utils 4.6.0, provides a perl settings migration script from

4.4.x config, which will be run at first login.
This commit is contained in:
landry 2009-03-08 17:24:38 +00:00
parent 44e79acebd
commit 0d3255653c
4 changed files with 43 additions and 22 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2008/11/06 15:34:46 landry Exp $
# $OpenBSD: Makefile,v 1.24 2009/03/08 17:24:38 landry Exp $
COMMENT= essential utilities and scripts for xfce4
@ -15,18 +15,18 @@ MODULES= x11/xfce4
LIB_DEPENDS= xfcegui4.>=4::x11/xfce4/libxfcegui4 \
dbus-glib-1::x11/dbus-glib \
dbus-1.>=6::x11/dbus
RUN_DEPENDS= ::x11/xfce4/xfce-mcs-manager \
RUN_DEPENDS= ::x11/xfce4/xfce4-settings \
::x11/xfce4/xfce4-session \
::x11/xfce4/exo
BUILD_DEPENDS= ::x11/xfce4/xfce-mcs-manager
::x11/xfce4/exo \
::textproc/p5-XML-Parser
WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread \
startup-notification-1 xfce4util z
CONFIGURE_ARGS+=--with-browser="xterm -e lynx"
CONFIGURE_ARGS+=--with-browser="xterm -e lynx" \
--with-xsession-prefix=${PREFIX}
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (xfce4/xfce-utils-4.4.3.tar.bz2) = bWrh8Ejh3BNIrQUEmK9aGA==
RMD160 (xfce4/xfce-utils-4.4.3.tar.bz2) = YsM3zdQK6+WKvKRomkRKs7Wz4eY=
SHA1 (xfce4/xfce-utils-4.4.3.tar.bz2) = cSkK959juyUR0nsDE+xM17xKgbQ=
SHA256 (xfce4/xfce-utils-4.4.3.tar.bz2) = kZo+H8glvyJhWCG2b2XTDV0rPXxEo3pU/rtRLU4QLAg=
SIZE (xfce4/xfce-utils-4.4.3.tar.bz2) = 644408
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

View File

@ -1,12 +1,21 @@
$OpenBSD: patch-scripts_Makefile_in,v 1.3 2007/05/08 15:28:36 steven Exp $
--- scripts/Makefile.in.orig Mon Apr 9 17:59:01 2007
+++ scripts/Makefile.in Tue May 8 19:20:59 2007
@@ -240,7 +240,7 @@ edit = sed \
$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/xfce4
+conffilesdir = ${prefix}/share/examples/xfce-utils
conffiles_DATA = \
xinitrc
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 = \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2008/11/06 15:34:46 landry Exp $
@comment $OpenBSD: PLIST,v 1.11 2009/03/08 17:24:38 landry Exp $
bin/startxfce4
bin/xfbrowser4
@bin bin/xfce4-about
@ -7,12 +7,20 @@ bin/xflock4
bin/xfmountdev4
@bin bin/xfrun4
bin/xfterm4
libexec/xfce4/
libexec/xfce4/xfconf-migration/
libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl
share/dbus-1/
share/dbus-1/services/
share/dbus-1/services/org.xfce.RunDialog.service
share/examples/xfce-utils/
@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/xfce4/
share/examples/xfce4/Xft.xrdb
share/examples/xfce4/xinitrc
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/xfce-utils/Xft.xrdb
share/examples/xfce-utils/xfconf-migration-4.6.desktop
@sample ${SYSCONFDIR}/xdg/autostart/xfconf-migration-4.6.desktop
share/examples/xfce-utils/xinitrc
@sample ${SYSCONFDIR}/xdg/xfce4/xinitrc
share/icons/hicolor/48x48/apps/xfce4-logo.png
share/locale/af/
@ -68,6 +76,7 @@ share/locale/ro/LC_MESSAGES/xfce-utils.mo
share/locale/ru/LC_MESSAGES/xfce-utils.mo
share/locale/si/LC_MESSAGES/xfce-utils.mo
share/locale/sk/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
@ -82,6 +91,7 @@ share/xfce4/COPYING
share/xfce4/GPL
share/xfce4/INFO
share/xfce4/INFO.ca
share/xfce4/INFO.de
share/xfce4/INFO.es
share/xfce4/INFO.fi
share/xfce4/INFO.fr
@ -108,9 +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
@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