svn commit: r468606 - in branches/2018Q2/x11-wm/bspwm: . files

[Thomas Zander]

Author: riggs
Date: Sun Apr 29 07:16:09 2018
New Revision: 468606
URL: https://svnweb.freebsd.org/changeset/ports/468606

Log:
  MFH: r468605
  
  Update to upstream version 0.9.5
  
  Details:
  - Introduce CONTRIB OPTION
  - USES localbase:ldflags
  - Have port Makefile manage installation due to problematic upstream
    install target
  
  PR:		227105
  Submitted by:	gor at clogic.com.ua (maintainer)
  
  Approved by:	ports-secteam (riggs)

Deleted:
  branches/2018Q2/x11-wm/bspwm/files/patch-Makefile
Modified:
  branches/2018Q2/x11-wm/bspwm/Makefile
  branches/2018Q2/x11-wm/bspwm/distinfo
  branches/2018Q2/x11-wm/bspwm/pkg-plist
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/x11-wm/bspwm/Makefile
==============================================================================
--- branches/2018Q2/x11-wm/bspwm/Makefile	Sun Apr 29 07:14:14 2018	(r468605)
+++ branches/2018Q2/x11-wm/bspwm/Makefile	Sun Apr 29 07:16:09 2018	(r468606)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bspwm
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.5
 CATEGORIES=	x11-wm
 
 MAINTAINER=	gor at clogic.com.ua
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
 		libxcb-keysyms.so:x11/xcb-util-keysyms
 RUN_DEPENDS=	sxhkd:x11/sxhkd
 
-USES=		gmake pkgconfig
+USES=		gmake localbase:ldflags
 
 USE_XORG=	xcb
 
@@ -25,9 +25,33 @@ GH_ACCOUNT=	baskerville
 
 SUB_FILES=	pkg-message
 
-PORTDOCS=	*
-PORTEXAMPLES=	*
+OPTIONS_DEFINE=	DOCS EXAMPLES CONTRIB
+OPTIONS_SUB=	yes
+CONTRIB_DESC=	Install contrib (shell completions, etc.)
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+do-install:
+	${MKDIR} ${STAGEDIR}${BINDIR} ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/bspc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bspwm ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/bspc.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/bspwm.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.md ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+
+post-install-CONTRIB-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
+	${INSTALL_DATA} ${WRKSRC}/contrib/bash_completion ${STAGEDIR}${PREFIX}/share/bash-completion/completions/bspc
+	${INSTALL_DATA} ${WRKSRC}/contrib/fish_completion ${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/bspc.fish
+	${INSTALL_DATA} ${WRKSRC}/contrib/zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_bspc
+	${INSTALL_DATA} ${WRKSRC}/contrib/freedesktop/bspwm.desktop ${STAGEDIR}${PREFIX}/share/xsessions/bspwm.desktop
 
 .include <bsd.port.mk>

Modified: branches/2018Q2/x11-wm/bspwm/distinfo
==============================================================================
--- branches/2018Q2/x11-wm/bspwm/distinfo	Sun Apr 29 07:14:14 2018	(r468605)
+++ branches/2018Q2/x11-wm/bspwm/distinfo	Sun Apr 29 07:16:09 2018	(r468606)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500268835
-SHA256 (baskerville-bspwm-0.9.3_GH0.tar.gz) = b356e3ff5754c63c94b36d904274c0ba16f9a8494e78a1c93bb23113f891bc9d
-SIZE (baskerville-bspwm-0.9.3_GH0.tar.gz) = 95779
+TIMESTAMP = 1523938971
+SHA256 (baskerville-bspwm-0.9.5_GH0.tar.gz) = 273591baf6a15d317cfedf4a423c51c132c52dd05b0328d6994f7bdc3982f782
+SIZE (baskerville-bspwm-0.9.5_GH0.tar.gz) = 106893

Modified: branches/2018Q2/x11-wm/bspwm/pkg-plist
==============================================================================
--- branches/2018Q2/x11-wm/bspwm/pkg-plist	Sun Apr 29 07:14:14 2018	(r468605)
+++ branches/2018Q2/x11-wm/bspwm/pkg-plist	Sun Apr 29 07:16:09 2018	(r468606)
@@ -2,7 +2,33 @@ bin/bspc
 bin/bspwm
 man/man1/bspc.1.gz
 man/man1/bspwm.1.gz
-share/bash-completion/completions/bspc
-share/fish/vendor_completions.d/bspc.fish
-share/xsessions/bspwm.desktop
-share/zsh/site-functions/_bspc
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
+%%PORTDOCS%%%%DOCSDIR%%/MISC.md
+%%PORTDOCS%%%%DOCSDIR%%/TODO.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bspwmrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/bspwmrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/external_rules
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/pseudo_automatic_mode/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/pseudo_automatic_mode/external_rules
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/bspwmrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/profile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/sxhkdrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/wm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/xinitrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlapping_borders/bspwmrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/bspwmrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_bar
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_colors
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/profile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/sxhkdrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/receptacles/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/receptacles/extract_canvas
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/receptacles/induce_rules
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sxhkdrc
+%%CONTRIB%%share/bash-completion/completions/bspc
+%%CONTRIB%%share/fish/vendor_completions.d/bspc.fish
+%%CONTRIB%%share/xsessions/bspwm.desktop
+%%CONTRIB%%share/zsh/site-functions/_bspc