Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Aug 2014 10:47:02 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r364959 - head/x11-wm/herbstluftwm
Message-ID:  <201408151047.s7FAl28p086787@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Fri Aug 15 10:47:01 2014
New Revision: 364959
URL: http://svnweb.freebsd.org/changeset/ports/364959
QAT: https://qat.redports.org/buildarchive/r364959/

Log:
  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)

Modified:
  head/x11-wm/herbstluftwm/Makefile
  head/x11-wm/herbstluftwm/pkg-plist

Modified: head/x11-wm/herbstluftwm/Makefile
==============================================================================
--- head/x11-wm/herbstluftwm/Makefile	Fri Aug 15 10:46:47 2014	(r364958)
+++ head/x11-wm/herbstluftwm/Makefile	Fri Aug 15 10:47:01 2014	(r364959)
@@ -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=$
 		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 <bsd.port.options.mk>
 
 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 <bsd.port.mk>

Modified: head/x11-wm/herbstluftwm/pkg-plist
==============================================================================
--- head/x11-wm/herbstluftwm/pkg-plist	Fri Aug 15 10:46:47 2014	(r364958)
+++ head/x11-wm/herbstluftwm/pkg-plist	Fri Aug 15 10:47:01 2014	(r364959)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408151047.s7FAl28p086787>