diff options
| author | linimon <linimon@FreeBSD.org> | 2007-03-14 12:12:32 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2007-03-14 12:12:32 +0800 |
| commit | b75bd659b4240b2e1fb40c0fedc30148f797104b (patch) | |
| tree | 519ae913d21e53dc9719afaa635fcd3ff46e3bb6 /x11-wm | |
| parent | 8dd75d9ef26f20305fcf39eda7b3932a7080eeda (diff) | |
| download | freebsd-ports-gnome-b75bd659b4240b2e1fb40c0fedc30148f797104b.tar.gz freebsd-ports-gnome-b75bd659b4240b2e1fb40c0fedc30148f797104b.tar.zst freebsd-ports-gnome-b75bd659b4240b2e1fb40c0fedc30148f797104b.zip | |
Switch to using new files Mk/bsd.ocaml.mk [1] and Mk/bsd.xfce.mk [2].
PR: 101029 [1], 108862 [2]
Submitted by: Stanislav Sedov <ssedov at mbsd dot msk dot ru> [1], oliver [2]
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xfce4-desktop/Makefile | 7 | ||||
| -rw-r--r-- | x11-wm/xfce4-panel/Makefile | 1 | ||||
| -rw-r--r-- | x11-wm/xfce4-session/Makefile | 4 | ||||
| -rw-r--r-- | x11-wm/xfce4-wm/Makefile | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index 8810a26c7c00..4af0eab2a400 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -28,7 +28,8 @@ USE_LDCONFIG= yes USE_XFCE= configenv libgui libmcs libutil mcsmanager panel USE_XLIB= yes -OPTIONS= THUNAR "Enable thunar support" on +OPTIONS= FAM "Enable FAM support" on \ + THUNAR "Enable thunar support" on MAN1= xfdesktop.1 @@ -41,7 +42,9 @@ USE_XFCE+= libexo thunar CONFIGURE_ARGS+=--disable-thunar-vfs --disable-thunarx --disable-exo .endif -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" +.if !defined(WITHOUT_FAM) +.else +.endif post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index 38b8f42b797a..66c7cd579bf4 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -29,7 +29,6 @@ OPTIONS= GTKDOC "install the library documentation" off \ STARTUP "Enable startup notification support" on .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_GTKDOC) BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index 3fb94e4d6116..b0e41a3a22db 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -32,6 +32,4 @@ MAN1= xfce4-session.1 xfce4-session-logout.1 post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index 903e7dace3c9..46e45a06a1c2 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -30,7 +30,6 @@ OPTIONS= COMPOSITE "Support the experimental X11 Composite extension" on \ STARTUP "Enable startup notification support" on .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if !defined(WITHOUT_COMPOSITE) CONFIGURE_ARGS+=--enable-compositor |