diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
| commit | 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch) | |
| tree | 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /x11-wm/xfce4 | |
| parent | 7aad84f808b93baa6a7077ce0b47573b9c4c79a0 (diff) | |
| download | ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.tar.gz ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.zip | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Notes
Notes:
svn path=/head/; revision=175261
Diffstat (limited to 'x11-wm/xfce4')
| -rw-r--r-- | x11-wm/xfce4/Makefile | 28 | ||||
| -rw-r--r-- | x11-wm/xfce4/pkg-plist | 8 |
2 files changed, 18 insertions, 18 deletions
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index bc23a12907f9..5073527b830e 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce PORTVERSION= 4.2.3.2 -PORTREVISION= 0 +PORTREVISION= 3 CATEGORIES= x11-wm xfce MASTER_SITES= # empty DISTFILES= # empty @@ -16,25 +16,25 @@ EXTRACT_ONLY= # empty MAINTAINER= oliver@FreeBSD.org COMMENT= The "meta-port" for the XFce 4 desktop environment -RUN_DEPENDS= ${X11BASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/xfce4-mcs-plugins \ +RUN_DEPENDS= ${LOCALBASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/xfce4-mcs-plugins \ xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \ xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder \ xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \ xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \ - ${X11BASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \ + ${LOCALBASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \ xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \ startxfce4:${PORTSDIR}/sysutils/xfce4-utils \ xffm:${PORTSDIR}/x11-fm/xfce4-fm \ xfprint4:${PORTSDIR}/print/xfce4-print \ xfce4-iconbox:${PORTSDIR}/misc/xfce4-iconbox \ - ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine + ${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine -.if exists(${X11BASE}/sbin/gdm) +.if exists(${LOCALBASE}/sbin/gdm) WITH_GDM= yes .endif .if defined(WITH_GDM) -RUN_DEPENDS+= ${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm +RUN_DEPENDS+= ${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm PLIST_SUB+= GDM="" .else PLIST_SUB+= GDM="@comment " @@ -42,28 +42,28 @@ PLIST_SUB+= GDM="@comment " .if !defined(WITHOUT_EXTRAS) .if !defined(WITHOUT_THEMES) -RUN_DEPENDS+= ${X11BASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme +RUN_DEPENDS+= ${LOCALBASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme .endif .if !defined(WITHOUT_PLUGINS) -RUN_DEPENDS+= ${X11BASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/xfce4-mixer \ - ${X11BASE}/lib/xfce4/panel-plugins/libsystray.so:${PORTSDIR}/x11-wm/xfce4-systray \ +RUN_DEPENDS+= ${LOCALBASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/xfce4-mixer \ + ${LOCALBASE}/lib/xfce4/panel-plugins/libsystray.so:${PORTSDIR}/x11-wm/xfce4-systray \ xfce4-tips:${PORTSDIR}/games/xfce4-toys .endif .endif LATEST_LINK= xfce4 NO_BUILD= yes -USE_X_PREFIX= yes +USE_GNOME= gtk20 do-install: # empty post-install: .if defined(WITH_GDM) - @${TEST} -d ${X11BASE}/etc/gdm/Sessions || \ - ${MKDIR} -p ${X11BASE}/etc/gdm/Sessions - @${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${X11BASE}/etc/gdm/Sessions - @${INSTALL_DATA} ${FILESDIR}/XFce4.desktop ${X11BASE}/etc/dm/Sessions + @${TEST} -d ${LOCALBASE}/etc/gdm/Sessions || \ + ${MKDIR} -p ${LOCALBASE}/etc/gdm/Sessions + @${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${LOCALBASE}/etc/gdm/Sessions + @${INSTALL_DATA} ${FILESDIR}/XFce4.desktop ${LOCALBASE}/etc/dm/Sessions .endif .include <bsd.port.mk> diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist index f1b32f03f7d6..d8ef9ae74228 100644 --- a/x11-wm/xfce4/pkg-plist +++ b/x11-wm/xfce4/pkg-plist @@ -1,4 +1,4 @@ -%%GDM%%etc/dm/Sessions/XFce4.desktop -%%GDM%%etc/gdm/Sessions/XFce4 -%%GDM%%@dirrmtry etc/gdm/Sessions -%%GDM%%@dirrmtry etc/gdm +%%GDM%%@unexec rm -f %%LOCAL1BASE%%/etc/dm/Sessions/XFce4.desktop +%%GDM%%@unexec rm -f %%LOCALBASE%%/etc/gdm/Sessions/XFce4 +%%GDM%%@dirrmtry %%LOCALBASE%%/etc/gdm/Sessions +%%GDM%%@dirrmtry %%LOCALBASE%%/etc/gdm |