diff options
author | Chris Rees <crees@FreeBSD.org> | 2011-12-18 17:51:44 +0000 |
---|---|---|
committer | Chris Rees <crees@FreeBSD.org> | 2011-12-18 17:51:44 +0000 |
commit | 643de2b827b6b86f9652a7eb8bf4877ff3480170 (patch) | |
tree | 3cf86f1562badd9a965a0905e7b6cee5672809c7 | |
parent | fce0cd9cfc45398809ceb0d5113369bdaa1192cd (diff) |
- Make xlockmore dependency optional
- Use bsd.port.options.mk
PR: ports/163434
Submitted by: Thomas Zander <thomas.e.zander@googlemail.com>, dougb
Notes
Notes:
svn path=/head/; revision=287602
-rw-r--r-- | sysutils/xfce4-utils/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile index f65ec800e776..d76e86b00d78 100644 --- a/sysutils/xfce4-utils/Makefile +++ b/sysutils/xfce4-utils/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-utils PORTVERSION= 4.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/xfce-utils/${PORTVERSION:R} @@ -19,8 +19,6 @@ COMMENT= Xfce 4 essential utilities and scripts BUILD_DEPENDS= p5-XML-Parser>=2.40:${PORTSDIR}/textproc/p5-XML-Parser -RUN_DEPENDS= xlock:${PORTSDIR}/x11/xlockmore - DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/4//} CONFIGURE_ARGS+=--with-xsession-prefix=${PREFIX} \ @@ -38,9 +36,10 @@ USE_XFCE= configenv libmenu libutil xfconf USE_XORG= x11 OPTIONS= DBUS "Enable D-BUS support" on \ - NLS "Enable Native Language Support" on + NLS "Enable Native Language Support" on \ + XLOCK "Use xlock for 'lock screen'" off -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if !defined(WITHOUT_DBUS) LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib @@ -60,7 +59,11 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif +.if !defined(WITHOUT_XLOCK) +RUN_DEPENDS+= xlock:${PORTSDIR}/x11/xlockmore +.endif + post-install: @-update-desktop-database -.include <bsd.port.post.mk> +.include <bsd.port.mk> |