Date: Mon, 14 Oct 2013 20:03:16 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330350 - in head/x11-wm: xfce4-desktop xfce4-panel xfce4-session xfce4-wm Message-ID: <201310142003.r9EK3Gll025304@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Mon Oct 14 20:03:16 2013 New Revision: 330350 URL: http://svnweb.freebsd.org/changeset/ports/330350 Log: - Support STAGEDIR - Switch to USES= gmake (xfce4-desktop, xfce4-wm) - Convert to new LIB_DEPENDS format (xfce4-desktop, xfce4-panel, xfce4-wm) Modified: head/x11-wm/xfce4-desktop/Makefile head/x11-wm/xfce4-desktop/pkg-plist head/x11-wm/xfce4-panel/Makefile head/x11-wm/xfce4-session/Makefile head/x11-wm/xfce4-session/pkg-plist head/x11-wm/xfce4-wm/Makefile Modified: head/x11-wm/xfce4-desktop/Makefile ============================================================================== --- head/x11-wm/xfce4-desktop/Makefile Mon Oct 14 19:53:58 2013 (r330349) +++ head/x11-wm/xfce4-desktop/Makefile Mon Oct 14 20:03:16 2013 (r330350) @@ -13,17 +13,16 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's desktop manager -LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - wnck-1:${PORTSDIR}/x11-toolkits/libwnck \ - notify:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \ + libnotify.so:${PORTSDIR}/devel/libnotify GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_BZIP2= yes -USE_GMAKE= yes -USE_GNOME= glib20 gtk20 intltool intlhack desktopfileutils +USE_GNOME= glib20 gtk20 intltool intlhack USE_XFCE= configenv garcon libmenu libutil libexo xfconf -USES= pathfix pkgconfig +USES= pathfix pkgconfig gmake USE_XORG= x11 sm CONFIGURE_ARGS+=--enable-gio-unix \ @@ -33,9 +32,6 @@ OPTIONS_DEFINE= THUNAR NLS OPTIONS_DEFAULT= THUNAR NLS THUNAR_DESC= Enable thunar support -MAN1= xfdesktop.1 - -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MTHUNAR} @@ -59,7 +55,4 @@ post-patch: @${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in .endif -post-install: - @-update-desktop-database - .include <bsd.port.mk> Modified: head/x11-wm/xfce4-desktop/pkg-plist ============================================================================== --- head/x11-wm/xfce4-desktop/pkg-plist Mon Oct 14 19:53:58 2013 (r330349) +++ head/x11-wm/xfce4-desktop/pkg-plist Mon Oct 14 20:03:16 2013 (r330350) @@ -1,5 +1,6 @@ bin/xfdesktop bin/xfdesktop-settings +man/man1/xfdesktop.1.gz share/applications/xfce-backdrop-settings.desktop share/backgrounds/xfce/xfce-blue.jpg share/icons/hicolor/32x32/apps/xfce4-backdrop.png @@ -80,8 +81,6 @@ share/pixmaps/xfce4_xicon2.png share/pixmaps/xfce4_xicon3.png share/pixmaps/xfce4_xicon4.png share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png -@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true @dirrm share/pixmaps/xfdesktop %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ur_PK Modified: head/x11-wm/xfce4-panel/Makefile ============================================================================== --- head/x11-wm/xfce4-panel/Makefile Mon Oct 14 19:53:58 2013 (r330349) +++ head/x11-wm/xfce4-panel/Makefile Mon Oct 14 20:03:16 2013 (r330350) @@ -11,9 +11,9 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's panel -LIB_DEPENDS= wnck-1:${PORTSDIR}/x11-toolkits/libwnck \ - cairo:${PORTSDIR}/graphics/cairo \ - dbus-glib-1:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \ + libcairo.so:${PORTSDIR}/graphics/cairo \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib USES= desktop-file-utils gmake pathfix perl5 pkgconfig GNU_CONFIGURE= yes @@ -28,7 +28,6 @@ CONFIGURE_ARGS+=--enable-gio-unix OPTIONS_DEFINE= NLS DOCS -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} Modified: head/x11-wm/xfce4-session/Makefile ============================================================================== --- head/x11-wm/xfce4-session/Makefile Mon Oct 14 19:53:58 2013 (r330349) +++ head/x11-wm/xfce4-session/Makefile Mon Oct 14 20:03:16 2013 (r330350) @@ -39,11 +39,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS_DEFINE= NLS -MAN1= xfce4-session.1 xfce4-session-logout.1 - PLIST_SUB= VERSION="4.6" -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -55,9 +52,4 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - .include <bsd.port.mk> Modified: head/x11-wm/xfce4-session/pkg-plist ============================================================================== --- head/x11-wm/xfce4-session/pkg-plist Mon Oct 14 19:53:58 2013 (r330349) +++ head/x11-wm/xfce4-session/pkg-plist Mon Oct 14 20:03:16 2013 (r330350) @@ -26,6 +26,8 @@ lib/xfce4/session/splash-engines/libsimp lib/xfce4/session/splash-engines/libsimple.so lib/xfce4/session/xfsm-shutdown-helper libdata/pkgconfig/xfce4-session-2.0.pc +man/man1/xfce4-session-logout.1.gz +man/man1/xfce4-session.1.gz share/applications/xfce-session-settings.desktop share/applications/xfce4-session-logout.desktop share/xsessions/xfce.desktop Modified: head/x11-wm/xfce4-wm/Makefile ============================================================================== --- head/x11-wm/xfce4-wm/Makefile Mon Oct 14 19:53:58 2013 (r330349) +++ head/x11-wm/xfce4-wm/Makefile Mon Oct 14 20:03:16 2013 (r330350) @@ -12,8 +12,8 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's window manager -LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ - wnck-1:${PORTSDIR}/x11-toolkits/libwnck +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck CONFIGURE_ARGS= --enable-xsync \ --enable-render \ @@ -22,8 +22,7 @@ CONFIGURE_ARGS= --enable-xsync \ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_BZIP2= yes -USES= pathfix pkgconfig -USE_GMAKE= yes +USES= pathfix pkgconfig gmake USE_GNOME= gtk20 intltool intlhack USE_LDCONFIG= yes USE_XFCE= configenv libmenu libutil xfconf @@ -34,7 +33,6 @@ OPTIONS_DEFINE= COMPOSITE NLS NOTIFY RE OPTIONS_DEFAULT= COMPOSITE NOTIFY REVMOUSE_DESC= Reverse mouse workspace changing direction -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCOMPOSITE} @@ -53,7 +51,7 @@ PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= startup-notification-1:${PORTSDIR}/x11/startup-notification +LIB_DEPENDS+= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification CONFIGURE_ARGS+=--enable-startup-notification .else CONFIGURE_ARGS+=--disable-startup-notification
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310142003.r9EK3Gll025304>