From 5c55d9fca806b4856ddefdf79c0244ccd2e55ae0 Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 15 Aug 2014 10:47:01 +0000 Subject: x11-wm/herbsluftwm: Strip binary, allow disable install of default config This eliminates need for shells/bash as a run dependency. Assign maintainership to submitter as well. PR: 191549 Submitted by: Zsolt Udvari Approved by: maintainer timeout (2.5 months) --- x11-wm/herbstluftwm/Makefile | 19 ++++++++++++++----- x11-wm/herbstluftwm/pkg-plist | 10 +++++----- 2 files changed, 19 insertions(+), 10 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile index a89dbdde3b13..adfcfdedf2e8 100644 --- a/x11-wm/herbstluftwm/Makefile +++ b/x11-wm/herbstluftwm/Makefile @@ -2,18 +2,17 @@ PORTNAME= herbstluftwm PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://herbstluftwm.org/tarballs/ -MAINTAINER= crshd@mail.com +MAINTAINER= udvzsolt@gmail.com COMMENT= Manual tiling window manager for X11 LICENSE= BSD2CLAUSE -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash - USES= gmake pkgconfig shebangfix -SHEBANG_FILES=scripts/*.sh +SHEBANG_FILES= scripts/*.sh share/autostart share/*.sh USE_XORG= x11 xinerama USE_GNOME= glib20 @@ -21,9 +20,13 @@ MAKE_ARGS= PREFIX=${PREFIX} SYSCONFDIR=${PREFIX}/etc \ DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \ MANDIR=${PREFIX}/man -OPTIONS_DEFINE= BASH ZSH DOCS EXAMPLES +OPTIONS_DEFINE= BASH ZSH DOCS EXAMPLES DEFAULTCONF +DEFAULTCONF_DESC=Install default configuration (requires bash) +OPTIONS_DEFAULT+=DEFAULTCONF OPTIONS_SUB= yes +DEFAULTCONF_RUN_DEPENDS=bash:${PORTSDIR}/shells/bash + .include post-patch: @@ -40,5 +43,11 @@ post-patch: .if ! ${PORT_OPTIONS:MEXAMPLES} ${REINPLACE_CMD} -e '/EXAMPLESDIR/d' ${WRKSRC}/Makefile .endif +.if ! ${PORT_OPTIONS:MDEFAULTCONF} + ${REINPLACE_CMD} -e '/CONFIGDIR/d' ${WRKSRC}/Makefile +.endif + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/herbst* .include diff --git a/x11-wm/herbstluftwm/pkg-plist b/x11-wm/herbstluftwm/pkg-plist index 0d91621af79a..2d51bdac48aa 100644 --- a/x11-wm/herbstluftwm/pkg-plist +++ b/x11-wm/herbstluftwm/pkg-plist @@ -1,8 +1,8 @@ bin/herbstclient bin/herbstluftwm -etc/xdg/herbstluftwm/autostart -etc/xdg/herbstluftwm/panel.sh -etc/xdg/herbstluftwm/restartpanels.sh +%%DEFAULTCONF%%etc/xdg/herbstluftwm/autostart +%%DEFAULTCONF%%etc/xdg/herbstluftwm/panel.sh +%%DEFAULTCONF%%etc/xdg/herbstluftwm/restartpanels.sh %%BASH%%etc/bash_completion.d/herbstclient-completion %%BASH%%@dirrmtry etc/bash_completion.d man/man1/herbstclient.1.gz @@ -36,5 +36,5 @@ share/xsessions/herbstluftwm.desktop %%ZSH%%@dirrmtry share/zsh/functions/Completion %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/xdg/herbstluftwm -@dirrmtry etc/xdg +%%DEFAULTCONF%%@dirrm etc/xdg/herbstluftwm +%%DEFAULTCONF%%@dirrmtry etc/xdg -- cgit v1.2.3