1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-15 07:56:36 +00:00

The sysutils/xfce4-utils port has been discontinued, and installs files that

conflict with the new versions of misc/xfce4-appfinder and
x11-wm/xfce4-session.

Approved by:	silence on xfce@
This commit is contained in:
Doug Barton 2012-06-23 10:43:21 +00:00
parent 17e0c572d2
commit 297c2240c4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=299809
8 changed files with 11 additions and 329 deletions

1
MOVED
View File

@ -3530,3 +3530,4 @@ devel/bazaar-ng|devel/bzr|2012-06-17|Project renamed
ftp/IglooFTP||2012-06-18|Has expired: No longer supported
audio/libtunepimp||2012-06-20|MusicBrainz RDF webservice no longer functions
audio/libtunepimp-old||2012-06-20|MusicBrainz RDF webservice no longer functions
sysutils/xfce4-utils||2012-06-23|No longer relevant, see UPDATING

View File

@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20120623:
AFFECTS: users of sysutils/xfce4-utils
AUTHOR: xfce@FreeBSD.org
The port has been discontinued, and installs files that conflict with
the new versions of misc/xfce4-appfinder and x11-wm/xfce4-session.
# pkg_delete -f xfce4-utils-\*
# portmaster misc/xfce4-appfinder x11-wm/xfce4-session
20120618:
AFFECTS: users of databases/db5
AUTHOR: mandree@FreeBSD.org
@ -183,20 +193,6 @@ you update your ports collection, before attempting any port upgrades.
Qt started using the raster graphics system engine, which relies on
shared memory. Be sure to check pkg-message.
20120526:
AFFECTS: users of x11-wm/xfce4
AUTHOR: xfce@FreeBSD.org
When upgrading from Xfce 4.8 to 4.10 make sure you uninstall the following
ports:
misc/xfce4-utils
x11-fm/thunar-vfs
You may uninstall them before you start the upgrade procedure (preferred)
or even afterwards when the upgrade went fine.
20120525:
AFFECTS: users of deskutils/kdepim4, deskutils/kdepim4-runtime
AUTHOR: kde@FreeBSD.org

View File

@ -1016,7 +1016,6 @@
SUBDIR += xfce4-power-manager
SUBDIR += xfce4-settings
SUBDIR += xfce4-systemload-plugin
SUBDIR += xfce4-utils
SUBDIR += xfce4-wavelan-plugin
SUBDIR += xfsm
SUBDIR += xfsprogs

View File

@ -1,78 +0,0 @@
# New ports collection makefile for: xfce4-utils
# Date created: 7 June 2003
# Whom: James Earl <jdearl@telus.net>
#
# $FreeBSD$
#
PORTNAME= xfce4-utils
PORTVERSION= 4.8.3
PORTREVISION= 5
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/xfce/xfce-utils/${PORTVERSION:R}
DISTNAME= xfce-utils-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= xfce@FreeBSD.org
COMMENT= Xfce 4 essential utilities and scripts
BUILD_DEPENDS= p5-XML-Parser>=2.40:${PORTSDIR}/textproc/p5-XML-Parser
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/4//}
CONFIGURE_ARGS+=--with-xsession-prefix=${PREFIX} \
--with-vendor-info=FreeBSD
CONFIGURE_ENV+= ac_cv_prog_AWK="${AWK}"
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_GNOME= gnomehack gtk20 intltool intlhack desktopfileutils pkgconfig
USE_XFCE= configenv libmenu libutil xfconf
USE_XORG= x11
OPTIONS= DBUS "Enable D-BUS support" on \
NLS "Enable Native Language Support" on \
XLOCK "Use xlock for 'lock screen'" on \
XSCREENSAVER "Use xscreensaver for 'lock screen'" off
.include <bsd.port.options.mk>
.if !defined(WITHOUT_DBUS)
LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
CONFIGURE_ARGS+=--enable-dbus
PLIST_SUB+= WITH_DBUS=""
.else
CONFIGURE_ARGS+=--disable-dbus
PLIST_SUB+= WITH_DBUS="@comment "
.endif
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.endif
.if !defined(WITHOUT_XLOCK)
RUN_DEPENDS+= xlock:${PORTSDIR}/x11/xlockmore
.endif
.if !defined(WITHOUT_XSCREENSAVER)
RUN_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver
.endif
.if defined(WITH_XLOCK) && defined(WITH_XSCREENSAVER)
IGNORE= should only have one locking option defined
.endif
post-install:
@-update-desktop-database
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (xfce4/xfce-utils-4.8.3.tar.bz2) = 035070d7e608b29dbaeeb6ec541d8c2edbd28152d3ef111316c33871ab02b926
SIZE (xfce4/xfce-utils-4.8.3.tar.bz2) = 880263

View File

@ -1,16 +0,0 @@
--- scripts/xinitrc.in.in.orig 2012-04-09 22:20:51.000000000 +0200
+++ scripts/xinitrc.in.in 2012-04-09 22:21:29.000000000 +0200
@@ -155,11 +155,11 @@
case "$ssh_agent_type" in
gpg-agent)
if test -z "$SSH_AGENT_PID"; then
- eval `gpg-agent --daemon --enable-ssh-support --write-env-file $XDG_CACHE_HOME/gpg-agent-info`
+ eval `gpg-agent --sh --daemon --enable-ssh-support --write-env-file $XDG_CACHE_HOME/gpg-agent-info`
ssh_agent_kill_cmd="kill -INT $SSH_AGENT_PID; rm -f $XDG_CACHE_HOME/gpg-agent-info"
elif test -z "$GPG_AGENT_INFO"; then
echo "ssh-agent is already running; starting gpg-agent without ssh support"
- eval `gpg-agent --daemon --write-env-file $XDG_CACHE_HOME/gpg-agent-info`
+ eval `gpg-agent --sh --daemon --write-env-file $XDG_CACHE_HOME/gpg-agent-info`
ssh_agent_kill_cmd="pkill -INT ^gpg-agent\$; rm -f $XDG_CACHE_HOME/gpg-agent-info"
else
echo "gpg-agent is already running"

View File

@ -1,5 +0,0 @@
The utilities and scripts provides an about dialog for Xfce 4, an
application launcher, and several useful scripts that are also used
by other Xfce components such as the panel and the desktop menu.
WWW: http://www.xfce.org/projects/xfce-utils/

View File

@ -1,213 +0,0 @@
bin/startxfce4
bin/xfbrowser4
bin/xfhelp4
bin/xflock4
bin/xfmountdev4
bin/xfrun4
bin/xfterm4
etc/xdg/autostart/xfconf-migration-4.6.desktop
etc/xdg/xfce4/Xft.xrdb
etc/xdg/xfce4/xinitrc
lib/xfce4/xfconf-migration/xfconf-migration-4.6.pl
share/applications/xfhelp4.desktop
share/applications/xfrun4.desktop
%%WITH_DBUS%%share/dbus-1/services/org.xfce.RunDialog.service
%%DOCSDIR%%/html/C/BSD.html
%%DOCSDIR%%/html/C/GPL.html
%%DOCSDIR%%/html/C/LGPL.html
%%DOCSDIR%%/html/C/images/about-dialog.png
%%DOCSDIR%%/html/C/images/default-session.png
%%DOCSDIR%%/html/C/images/run-dialog.png
%%DOCSDIR%%/html/C/images/xfce-mouse.png
%%DOCSDIR%%/html/C/index.html
%%DOCSDIR%%/html/C/xfce-user-guide.html
%%DOCSDIR%%/html/C/xfce-utils.html
%%DOCSDIR%%/html/da/BSD.html
%%DOCSDIR%%/html/da/GPL.html
%%DOCSDIR%%/html/da/LGPL.html
%%DOCSDIR%%/html/da/images
%%DOCSDIR%%/html/da/index.html
%%DOCSDIR%%/html/da/xfce-user-guide.html
%%DOCSDIR%%/html/da/xfce-utils.html
%%DOCSDIR%%/html/el/BSD.html
%%DOCSDIR%%/html/el/GPL.html
%%DOCSDIR%%/html/el/LGPL.html
%%DOCSDIR%%/html/el/images/about-dialog.png
%%DOCSDIR%%/html/el/images/default-session.png
%%DOCSDIR%%/html/el/images/run-dialog.png
%%DOCSDIR%%/html/el/images/xfce-mouse.png
%%DOCSDIR%%/html/el/index.html
%%DOCSDIR%%/html/el/xfce-user-guide.html
%%DOCSDIR%%/html/el/xfce-utils.html
%%DOCSDIR%%/html/gl/BSD.html
%%DOCSDIR%%/html/gl/GPL.html
%%DOCSDIR%%/html/gl/LGPL.html
%%DOCSDIR%%/html/gl/images
%%DOCSDIR%%/html/gl/index.html
%%DOCSDIR%%/html/gl/xfce-user-guide.html
%%DOCSDIR%%/html/gl/xfce-utils.html
%%DOCSDIR%%/html/it/BSD.html
%%DOCSDIR%%/html/it/GPL.html
%%DOCSDIR%%/html/it/LGPL.html
%%DOCSDIR%%/html/it/images
%%DOCSDIR%%/html/it/index.html
%%DOCSDIR%%/html/it/xfce-user-guide.html
%%DOCSDIR%%/html/it/xfce-utils.html
%%DOCSDIR%%/html/ja/BSD.html
%%DOCSDIR%%/html/ja/GPL.html
%%DOCSDIR%%/html/ja/LGPL.html
%%DOCSDIR%%/html/ja/images
%%DOCSDIR%%/html/ja/index.html
%%DOCSDIR%%/html/ja/xfce-user-guide.html
%%DOCSDIR%%/html/ja/xfce-utils.html
%%DOCSDIR%%/html/ru/BSD.html
%%DOCSDIR%%/html/ru/GPL.html
%%DOCSDIR%%/html/ru/LGPL.html
%%DOCSDIR%%/html/ru/images
%%DOCSDIR%%/html/ru/index.html
%%DOCSDIR%%/html/ru/xfce-user-guide.html
%%DOCSDIR%%/html/ru/xfce-utils.html
%%DOCSDIR%%/html/sv/BSD.html
%%DOCSDIR%%/html/sv/GPL.html
%%DOCSDIR%%/html/sv/LGPL.html
%%DOCSDIR%%/html/sv/images
%%DOCSDIR%%/html/sv/index.html
%%DOCSDIR%%/html/sv/xfce-user-guide.html
%%DOCSDIR%%/html/sv/xfce-utils.html
%%DOCSDIR%%/html/tr/BSD.html
%%DOCSDIR%%/html/tr/GPL.html
%%DOCSDIR%%/html/tr/LGPL.html
%%DOCSDIR%%/html/tr/images
%%DOCSDIR%%/html/tr/index.html
%%DOCSDIR%%/html/tr/xfce-user-guide.html
%%DOCSDIR%%/html/tr/xfce-utils.html
%%DOCSDIR%%/html/ug/BSD.html
%%DOCSDIR%%/html/ug/GPL.html
%%DOCSDIR%%/html/ug/LGPL.html
%%DOCSDIR%%/html/ug/images
%%DOCSDIR%%/html/ug/index.html
%%DOCSDIR%%/html/ug/xfce-user-guide.html
%%DOCSDIR%%/html/ug/xfce-utils.html
%%DOCSDIR%%/html/xfce-utils.css
%%DOCSDIR%%/html/zh_CN/BSD.html
%%DOCSDIR%%/html/zh_CN/GPL.html
%%DOCSDIR%%/html/zh_CN/LGPL.html
%%DOCSDIR%%/html/zh_CN/images
%%DOCSDIR%%/html/zh_CN/index.html
%%DOCSDIR%%/html/zh_CN/xfce-user-guide.html
%%DOCSDIR%%/html/zh_CN/xfce-utils.html
%%NLS%%share/locale/af/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/am/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/az/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/be/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/bn/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/da/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/de/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/dz/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/eo/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/et/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/fa/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/gu/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/hi/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/hr/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/hy/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ka/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/kk/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ko/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ku/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/lt/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/lv/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/mk/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/mr/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ms/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/pa/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/pt/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ro/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/si/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/sq/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/sv/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ta/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/te/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/tr/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ug/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/uk/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ur/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/vi/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
share/xsessions/xfce.desktop
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrm share/xsessions
%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur_PK
%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur
%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ug
%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/te
%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/si
%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/mr
%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ku
%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/kk
%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/hy
%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/dz
%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/bn_IN
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
@dirrm %%DOCSDIR%%/html/zh_CN
@dirrm %%DOCSDIR%%/html/ug
@dirrm %%DOCSDIR%%/html/tr
@dirrm %%DOCSDIR%%/html/sv
@dirrm %%DOCSDIR%%/html/ru
@dirrm %%DOCSDIR%%/html/ja
@dirrm %%DOCSDIR%%/html/it
@dirrm %%DOCSDIR%%/html/gl
@dirrm %%DOCSDIR%%/html/el/images
@dirrm %%DOCSDIR%%/html/el
@dirrm %%DOCSDIR%%/html/da
@dirrm %%DOCSDIR%%/html/C/images
@dirrm %%DOCSDIR%%/html/C
@dirrm %%DOCSDIR%%/html
@dirrm %%DOCSDIR%%
%%WITH_DBUS%%@dirrmtry share/dbus-1/services
%%WITH_DBUS%%@dirrmtry share/dbus-1
@dirrm lib/xfce4/xfconf-migration
@dirrmtry lib/xfce4
@dirrmtry etc/xdg/xfce4
@dirrmtry etc/xdg/autostart
@dirrmtry etc/xdg