cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to xfce4-session 4.10.0. Bump shlib major, now xfce4-session can

Browse Source 
make use of upower/consolekit/policykit (meta/xfce's README will be
amended accordingly). startxfce4 from xfce-utils package migrated here
so add @conflict & @pkgpath for smooth updates.
This commit is contained in:
landry 2012-04-30 12:55:58 +00:00
parent de52d72619
commit 30e6ccbd95
5 changed files with 34 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
x11/xfce4/xfce4-session/Makefile
View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.56 2012/03/04 18:02:58 landry Exp $
# $OpenBSD: Makefile,v 1.57 2012/04/30 12:55:58 landry Exp $
COMMENT= Xfce4 session manager
XFCE_PROJECT= xfce4-session
XFCE_VERSION= 4.8.2
REVISION= 3
SHARED_LIBS += xfsm-4.6 0.0 # .0.0
SHARED_LIBS += xfsm-4.6 1.0 # .0.0
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
@ -18,17 +16,14 @@ MODULES= x11/xfce4
MODXFCE_DESKTOP_FILE= Yes
MODXFCE_ICON_CACHE= Yes
CONFIGURE_ENV= ac_cv_header_sys_user_h=yes
CONFIGURE_ARGS= --disable-linker-opts \
--disable-hal \
--disable-polkit \
--disable-consolekit \
--disable-upower
--with-xsession-prefix=${PREFIX}
#CONFIGURE_ARGS+= --enable-session-screenshots
#XXX session-screenshots broken?
# http://bugzilla.xfce.org/show_bug.cgi?id=6885
LIB_DEPENDS= x11/xfce4/libxfce4ui>=4.8.0\
x11/xfce4/xfce4-panel>=4.8.0 \
x11/xfce4/xfconf>=4.8.0 \
LIB_DEPENDS= x11/xfce4/libxfce4ui>=4.9.0\
x11/xfce4/xfconf>=4.9.0 \
devel/libwnck
WANTLIB += GL ICE SM X11 X11-xcb XRes Xau Xcomposite Xcursor Xdamage
@ -38,14 +33,10 @@ WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs startup-notification-1 wnck-1 xcb xcb-aux
WANTLIB += xcb-render xcb-shm xfce4panel-1.0 xfce4ui-1 xfce4util
WANTLIB += xfconf-0 z
WANTLIB += xcb-render xcb-shm stdc++ xfce4ui-1 xfce4util xfconf-0 z
FAKE_FLAGS= settingsdir=${PREFIX}/share/examples/xfce4-session
# XXX workaround for pkg_add bug when a symlink to a dir becomes a real dir
post-install:
rm -Rf ${PREFIX}/share/doc/xfce4-session/html/el/images/
ln -s ${TRUEPREFIX}/share/doc/xfce4-session/html/C/images ${PREFIX}/share/doc/xfce4-session/html/el/images
FAKE_FLAGS= settingsdir=${PREFIX}/share/examples/xfce4-session \
conffilesdir=${PREFIX}/share/examples/xfce4-session \
autostartdir=${PREFIX}/share/examples/xfce4-session
.include <bsd.port.mk>

10
x11/xfce4/xfce4-session/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xfce4/xfce4-session-4.8.2.tar.bz2) = SHgMvPeEq2TevJMS8Xdl8g==
RMD160 (xfce4/xfce4-session-4.8.2.tar.bz2) = Q7u+ZKme+9ZVzllJsEArC0xX9dY=
SHA1 (xfce4/xfce4-session-4.8.2.tar.bz2) = Y2wpg1UoYalZIl5VSJhnUVKk2BI=
SHA256 (xfce4/xfce4-session-4.8.2.tar.bz2) = MbyipVngWoqFnxUDlKkBUX5YQkFO8XGoXF2iNONEwNA=
SIZE (xfce4/xfce4-session-4.8.2.tar.bz2) = 1607774
MD5 (xfce4/xfce4-session-4.10.0.tar.bz2) = R2jhpBoCh69qrRizKaDyMA==
RMD160 (xfce4/xfce4-session-4.10.0.tar.bz2) = IFdiSs7ahINtzXUsk+P8eMZ1f7w=
SHA1 (xfce4/xfce4-session-4.10.0.tar.bz2) = qVa2eBb7BsUJkMYE0KCcQCsgMCw=
SHA256 (xfce4/xfce4-session-4.10.0.tar.bz2) = u4qpp0w9OChAWW+0h1FE1mx/P0fI6e6B0x40KKcsRs4=
SIZE (xfce4/xfce4-session-4.10.0.tar.bz2) = 1257385

12
x11/xfce4/xfce4-session/patches/patch-xfce4-tips_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-xfce4-tips_Makefile_in,v 1.3 2011/01/18 20:36:51 landry Exp $
--- xfce4-tips/Makefile.in.orig Wed Nov 3 21:11:43 2010
+++ xfce4-tips/Makefile.in Fri Nov 5 23:49:30 2010
@@ -366,7 +366,7 @@ xfce4_tips_LDADD = \
@LIBXFCE4UI_LIBS@ \
@XFCONF_LIBS@
-desktopdir = $(sysconfdir)/xdg/autostart
+desktopdir = $(prefix)/share/examples/xfce4-session
desktop_in_files = xfce4-tips-autostart.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \

6
x11/xfce4/xfce4-session/pkg/PFRAG.shared
View File

@ -1,6 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2011/01/18 20:36:51 landry Exp $
@lib lib/libxfsm-4.6.so.${LIBxfsm-4.6_VERSION}
lib/xfce4/panel/plugins/libxfsm-logout-plugin.so
lib/xfce4/session/splash-engines/libbalou.so
lib/xfce4/session/splash-engines/libmice.so
lib/xfce4/session/splash-engines/libsimple.so

143
x11/xfce4/xfce4-session/pkg/PLIST
View File

@ -1,95 +1,51 @@
@comment $OpenBSD: PLIST,v 1.22 2012/03/04 18:02:58 landry Exp $
@comment $OpenBSD: PLIST,v 1.23 2012/04/30 12:55:58 landry Exp $
@conflict xfce4-toys-*
%%SHARED%%
@conflict xfce-utils-*
@pkgpath x11/xfce4/xfce-utils
bin/startxfce4
@bin bin/xfce4-session
@bin bin/xfce4-session-logout
@bin bin/xfce4-session-settings
@bin bin/xfce4-tips
include/xfce4/
bin/xflock4
include/xfce4/xfce4-session-4.6/
include/xfce4/xfce4-session-4.6/libxfsm/
include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h
include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h
lib/libxfsm-4.6.a
lib/libxfsm-4.6.la
lib/pkgconfig/
@lib lib/libxfsm-4.6.so.${LIBxfsm-4.6_VERSION}
lib/pkgconfig/xfce4-session-2.0.pc
lib/xfce4/
lib/xfce4/panel/
lib/xfce4/panel/plugins/
lib/xfce4/panel/plugins/libxfsm-logout-plugin.a
lib/xfce4/panel/plugins/libxfsm-logout-plugin.la
lib/xfce4/session/
lib/xfce4/session/balou-export-theme
lib/xfce4/session/balou-install-theme
lib/xfce4/session/splash-engines/
@comment lib/xfce4/session/splash-engines/libbalou.a
@comment lib/xfce4/session/splash-engines/libbalou.la
lib/xfce4/session/splash-engines/libbalou.so
@comment lib/xfce4/session/splash-engines/libmice.a
@comment lib/xfce4/session/splash-engines/libmice.la
lib/xfce4/session/splash-engines/libmice.so
@comment lib/xfce4/session/splash-engines/libsimple.a
@comment lib/xfce4/session/splash-engines/libsimple.la
lib/xfce4/session/splash-engines/libsimple.so
@bin lib/xfce4/session/xfsm-shutdown-helper
@man man/man1/xfce4-session-logout.1
@man man/man1/xfce4-session.1
share/applications/xfce-session-settings.desktop
share/applications/xfce4-session-logout.desktop
share/doc/xfce4-session/
share/doc/xfce4-session/html/
share/doc/xfce4-session/html/C/
share/doc/xfce4-session/html/C/images/
share/doc/xfce4-session/html/C/images/xfsm-advanced.png
share/doc/xfce4-session/html/C/images/xfsm-general.png
share/doc/xfce4-session/html/C/images/xfsm-splash.png
share/doc/xfce4-session/html/C/index.html
share/doc/xfce4-session/html/da/
share/doc/xfce4-session/html/da/images
share/doc/xfce4-session/html/da/index.html
share/doc/xfce4-session/html/el/
share/doc/xfce4-session/html/el/images
share/doc/xfce4-session/html/el/index.html
share/doc/xfce4-session/html/gl/
share/doc/xfce4-session/html/gl/images
share/doc/xfce4-session/html/gl/index.html
share/doc/xfce4-session/html/it/
share/doc/xfce4-session/html/it/images
share/doc/xfce4-session/html/it/index.html
share/doc/xfce4-session/html/ja/
share/doc/xfce4-session/html/ja/images
share/doc/xfce4-session/html/ja/index.html
share/doc/xfce4-session/html/ru/
share/doc/xfce4-session/html/ru/images
share/doc/xfce4-session/html/ru/index.html
share/doc/xfce4-session/html/sv/
share/doc/xfce4-session/html/sv/images
share/doc/xfce4-session/html/sv/index.html
share/doc/xfce4-session/html/tr/
share/doc/xfce4-session/html/tr/images
share/doc/xfce4-session/html/tr/index.html
share/doc/xfce4-session/html/ug/
share/doc/xfce4-session/html/ug/images
share/doc/xfce4-session/html/ug/index.html
share/doc/xfce4-session/html/xfce4-session.css
share/doc/xfce4-session/html/zh_CN/
share/doc/xfce4-session/html/zh_CN/images
share/doc/xfce4-session/html/zh_CN/index.html
share/examples/xfce4-session/
@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/xfce4/xfconf/
@sample ${SYSCONFDIR}/xdg/xfce4/xfconf/xfce-perchannel-xml/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/xfce4-session/Xft.xrdb
share/examples/xfce4-session/xfce4-session.xml
@sample ${SYSCONFDIR}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
share/examples/xfce4-session/xfce4-tips-autostart.desktop
@sample ${SYSCONFDIR}/xdg/autostart/xfce4-tips-autostart.desktop
share/icons/
share/icons/hicolor/
share/icons/hicolor/128x128/
share/icons/hicolor/128x128/apps/
share/examples/xfce4-session/xinitrc
@sample ${SYSCONFDIR}/xdg/xfce4/xinitrc
share/examples/xfce4-session/xscreensaver.desktop
@sample ${SYSCONFDIR}/xdg/autostart/xscreensaver.desktop
share/icons/hicolor/128x128/apps/xfce4-session.png
share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png
share/icons/hicolor/48x48/apps/xfce4-session.png
share/icons/hicolor/48x48/apps/xfce4-splash.png
share/icons/hicolor/48x48/apps/xfsm-hibernate.png
@ -97,46 +53,22 @@ 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/48x48/apps/xfsm-suspend.png
share/icons/hicolor/64x64/
share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
share/icons/hicolor/72x72/
share/icons/hicolor/72x72/apps/
share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
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/am/
share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/xfce4-session.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/xfce4-session.mo
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/xfce4-session.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/xfce4-session.mo
share/locale/be/LC_MESSAGES/xfce4-session.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/xfce4-session.mo
share/locale/bn/LC_MESSAGES/xfce4-session.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
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/
share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/xfce4-session.mo
share/locale/el/LC_MESSAGES/xfce4-session.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
share/locale/eo/LC_MESSAGES/xfce4-session.mo
share/locale/es/LC_MESSAGES/xfce4-session.mo
@ -145,92 +77,55 @@ share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
share/locale/et/LC_MESSAGES/xfce4-session.mo
share/locale/eu/LC_MESSAGES/xfce4-session.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
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/
share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/xfce4-session.mo
share/locale/he/LC_MESSAGES/xfce4-session.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/xfce4-session.mo
share/locale/hr/LC_MESSAGES/xfce4-session.mo
share/locale/hu/LC_MESSAGES/xfce4-session.mo
share/locale/id/LC_MESSAGES/xfce4-session.mo
share/locale/is/LC_MESSAGES/xfce4-session.mo
share/locale/it/LC_MESSAGES/xfce4-session.mo
share/locale/ja/LC_MESSAGES/xfce4-session.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/xfce4-session.mo
share/locale/kk/
share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/xfce4-session.mo
share/locale/ko/LC_MESSAGES/xfce4-session.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/xfce4-session.mo
share/locale/lv/LC_MESSAGES/xfce4-session.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/xfce4-session.mo
share/locale/mr/
share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/xfce4-session.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/xfce4-session.mo
share/locale/nb/LC_MESSAGES/xfce4-session.mo
share/locale/nl/LC_MESSAGES/xfce4-session.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/nn/LC_MESSAGES/xfce4-session.mo
share/locale/pa/LC_MESSAGES/xfce4-session.mo
share/locale/pl/LC_MESSAGES/xfce4-session.mo
share/locale/pt/LC_MESSAGES/xfce4-session.mo
share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo
share/locale/ro/LC_MESSAGES/xfce4-session.mo
share/locale/ru/LC_MESSAGES/xfce4-session.mo
share/locale/si/
share/locale/si/LC_MESSAGES/
share/locale/si/LC_MESSAGES/xfce4-session.mo
share/locale/sk/LC_MESSAGES/xfce4-session.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/xfce4-session.mo
share/locale/sv/LC_MESSAGES/xfce4-session.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/xfce4-session.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/xfce4-session.mo
share/locale/tr/LC_MESSAGES/xfce4-session.mo
share/locale/ug/
share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/xfce4-session.mo
share/locale/uk/LC_MESSAGES/xfce4-session.mo
share/locale/ur/
share/locale/ur/LC_MESSAGES/
share/locale/ur/LC_MESSAGES/xfce4-session.mo
share/locale/ur_PK/
share/locale/ur_PK/LC_MESSAGES/
share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo
share/locale/vi/LC_MESSAGES/xfce4-session.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
share/themes/
share/themes/Default/
share/themes/Default/balou/
share/themes/Default/balou/logo.png
share/themes/Default/balou/themerc
share/xfce4/
share/xfce4/panel-plugins/
share/xfce4/panel-plugins/xfsm-logout-plugin.desktop
share/xfce4/tips/
share/xfce4/tips/tips
share/xsessions/
share/xsessions/xfce.desktop
@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
@exec %D/bin/update-desktop-database