update to 4.4.1

from Landry Breuil <gaston at gcu.info>
This commit is contained in:
steven 2007-05-08 14:14:03 +00:00
parent 9e4be9b427
commit 0bfcba0689
9 changed files with 86 additions and 53 deletions

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.11 2006/12/16 12:22:37 espie Exp $
# $OpenBSD: Makefile,v 1.12 2007/05/08 14:14:03 steven Exp $
COMMENT= "xfce4 session manager"
V= 4.2.3
DISTNAME= xfce4-session-${V}
PKGNAME= ${DISTNAME}p2
SHARED_LIBS= xfsm-4.2 0.1
MODGNU_SHARED_LIBS= xfsm-4.2 -export-dynamic
LIBxfsm-4.2_ALIAS= xfsm_4_2
MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/
HOMEPAGE= http://www.xfce.org/
V= 4.4.1
DISTNAME= xfce4-session-${V}
SHARED_LIBS += xfsm-4.2 0.1 # .0.1
HOMEPAGE= http://www.xfce.org/projects/xfce4-session/
MAINTAINER= Landry Breuil <gaston@gcu.info>
# GPL
PERMIT_DISTFILES_CDROM= Yes
@ -17,12 +16,22 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/
EXTRACT_SUFX= .tar.bz2
USE_GMAKE= Yes
CONFIGURE_ARGS= --disable-dbus
MODULES= devel/gettext
BUILD_DEPENDS= :xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager
LIB_DEPENDS= xfcegui4.>=3.4::x11/xfce4/libxfcegui4 \
xfce4mcs-client.>=2.3::x11/xfce4/libxfce4mcs
RUN_DEPENDS= :xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager
WANTLIB= ICE SM X11 Xext Xrender c fontconfig freetype m \
BUILD_DEPENDS= :xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager \
::textproc/intltool
LIB_DEPENDS= xfcegui4.>=4.0::x11/xfce4/libxfcegui4 \
xfce4mcs-client.>=3.5::x11/xfce4/libxfce4mcs
RUN_DEPENDS= :xfce-mcs-manager->=4.4.1:x11/xfce4/xfce-mcs-manager
WANTLIB= ICE SM X11 Xau Xdmcp Xrender c fontconfig freetype m \
Xcursor Xext Xfixes Xi Xinerama Xrandr expat \
atk-1.0 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
gmodule-2.0 gobject-2.0 gtk-x11-2.0 pango-1.0 \
pangoft2-1.0 pangocairo-1.0 cairo glitz png z \

View File

@ -1,5 +1,5 @@
MD5 (xfce4/xfce4-session-4.2.3.tar.gz) = 42hazgB/Bl6tvXrM5vph6A==
RMD160 (xfce4/xfce4-session-4.2.3.tar.gz) = 4vpgjxPPp5v8nbLiCREA9cFF0sc=
SHA1 (xfce4/xfce4-session-4.2.3.tar.gz) = mek9z8Ph6qQDtVtG7IfXq9x0yUk=
SHA256 (xfce4/xfce4-session-4.2.3.tar.gz) = y/X2uNaMDSn1A7gFohQ9c7YZL5bOPWZ8OFIdsW8Jyos=
SIZE (xfce4/xfce4-session-4.2.3.tar.gz) = 1629362
MD5 (xfce4/xfce4-session-4.4.1.tar.bz2) = gsMa7yhW4w68CdKRHpuW7g==
RMD160 (xfce4/xfce4-session-4.4.1.tar.bz2) = dkUMe1PWuB03hknVIDXcvT1oqZk=
SHA1 (xfce4/xfce4-session-4.4.1.tar.bz2) = BaR9VYMKn5uRSYpqP9G/PrGX1Co=
SHA256 (xfce4/xfce4-session-4.4.1.tar.bz2) = yrXygXOUS0yZw2VwQFuE9zDs6AxR6qGwHmcmwpsVgGU=
SIZE (xfce4/xfce4-session-4.4.1.tar.bz2) = 1289278

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.2 2005/10/26 06:20:11 jolan Exp $
--- Makefile.in.orig Sun May 15 12:16:16 2005
+++ Makefile.in Wed Oct 26 01:16:58 2005
@@ -249,7 +249,7 @@ SUBDIRS = \
xfce4-session-logout \
$OpenBSD: patch-Makefile_in,v 1.3 2007/05/08 14:14:03 steven Exp $
--- Makefile.in.orig Sat Jan 20 18:49:50 2007
+++ Makefile.in Sat Mar 31 16:18:03 2007
@@ -284,7 +284,7 @@ SUBDIRS = \
xfce4-tips \
xfsm-shutdown-helper
-configdir = $(sysconfdir)/xdg/xfce4-session
+configdir = $(prefix)/share/examples/xfce4-session
config_DATA = xfce4-session.rc
EXTRA_DIST = \
$(config_DATA) \
BUGS \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-xfce4-session_xfsm-shutdown-helper-sudo_c,v 1.1.1.1 2005/05/12 04:38:38 jolan Exp $
--- xfce4-session/xfsm-shutdown-helper-sudo.c.orig Mon Nov 1 15:00:12 2004
+++ xfce4-session/xfsm-shutdown-helper-sudo.c Wed May 11 19:55:17 2005
@@ -129,7 +129,7 @@ xfsm_shutdown_helper_spawn (void)
/* execute sudo with the helper */
execl (helper->sudo, "sudo", "-H", "-S", "-p",
- "XFSM_SUDO_PASS ", "--", XFSM_SHUTDOWN_HELPER, NULL);
+ "XFSM_SUDO_PASS ", "--", XFSM_SHUTDOWN_HELPER,(void *)NULL);
_exit (127);
}

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-xfce4-tips_main_c,v 1.1 2007/05/08 14:14:03 steven Exp $
--- xfce4-tips/main.c.orig Tue Apr 24 23:40:51 2007
+++ xfce4-tips/main.c Tue Apr 24 23:41:12 2007
@@ -115,11 +115,11 @@ next_cb(GtkWidget *btn, GtkTextBuffer *textbuf)
switch (option) {
case OPTION_TIPS:
- strcpy(buffer, "fortune " TIPSDIR "/tips");
+ strcpy(buffer, "/usr/games/fortune " TIPSDIR "/tips");
break;
case OPTION_FORTUNES:
- strcpy(buffer, "fortune");
+ strcpy(buffer, "/usr/games/fortune");
break;
}

View File

@ -0,0 +1,11 @@
--- xfce4-tips/Makefile.in.old Mon Feb 19 10:07:27 2007
+++ xfce4-tips/Makefile.in Mon Feb 19 10:08:27 2007
@@ -292,7 +292,7 @@
xfce4_tips_LDADD = \
@LIBXFCEGUI4_LIBS@
-desktopdir = $(sysconfdir)/xdg/autostart
+desktopdir = $(prefix)/share/examples/autostart
desktop_in_files = xfce4-tips-autostart.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-xfsm-shutdown-helper_main_c,v 1.1 2005/10/26 06:20:11 jolan Exp $
--- xfsm-shutdown-helper/main.c.orig Sun May 15 03:21:04 2005
+++ xfsm-shutdown-helper/main.c Wed Oct 26 01:16:58 2005
$OpenBSD: patch-xfsm-shutdown-helper_main_c,v 1.2 2007/05/08 14:14:03 steven Exp $
--- xfsm-shutdown-helper/main.c.orig Sun Apr 1 14:19:19 2007
+++ xfsm-shutdown-helper/main.c Sun Apr 1 14:19:34 2007
@@ -58,7 +58,7 @@
#endif
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#define POWEROFF_CMD "/sbin/shutdown -p now"
+#define POWEROFF_CMD "/sbin/shutdown -p -h now"
#define REBOOT_CMD "/sbin/shutdown -r now"
#else
#define POWEROFF_CMD "/sbin/shutdown -h now"
#elif defined(sun) || defined(__sun)
#define POWEROFF_CMD "/usr/sbin/shutdown -i 5 -g 0 -y"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/27 21:06:09 naddy Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2007/05/08 14:14:03 steven Exp $
@lib lib/libxfsm-4.2.so.${LIBxfsm-4.2_VERSION}
lib/xfce4/mcs-plugins/session_settings.so
lib/xfce4/mcs-plugins/splash_settings.so

View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.3 2005/11/10 22:57:40 jolan Exp $
@comment $OpenBSD: PLIST,v 1.4 2007/05/08 14:14:03 steven Exp $
%%SHARED%%
bin/xfce4-autostart-editor
bin/xfce4-session
bin/xfce4-session-logout
bin/xfce4-tips
include/xfce4/xfce4-session-4.2/
include/xfce4/xfce4-session-4.2/libxfsm/
include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
@ -30,6 +32,11 @@ libexec/xfsm-shutdown-helper
@man 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/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/autostart/xfce4-tips-autostart.desktop
@sample ${SYSCONFDIR}/xdg/autostart/xfce4-tips-autostart.desktop
share/examples/xfce4-session/
@sample ${SYSCONFDIR}/xdg/xfce4-session/
share/examples/xfce4-session/xfce4-session.rc
@ -39,6 +46,8 @@ share/icons/hicolor/128x128/apps/
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/
share/icons/hicolor/64x64/apps/
@ -51,15 +60,14 @@ share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
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
@ -70,15 +78,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
@ -90,7 +100,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/sv/LC_MESSAGES/xfce4-session.mo
share/locale/ta/LC_MESSAGES/xfce4-session.mo
share/locale/tr/LC_MESSAGES/xfce4-session.mo
@ -111,7 +120,6 @@ 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/
share/xfce4/tips/tips
share/xfce4/tips/tips.dat