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@clogic.com.ua (maintainer)
MFH:		2018Q2

4 files changed, 63 insertions, 98 deletions

diff --git a/x11-wm/bspwm/Makefile b/x11-wm/bspwm/Makefile
index cdb7e121211a..72316839972a 100644
--- a/x11-wm/bspwm/Makefile
+++ b/x11-wm/bspwm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bspwm
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.5
 CATEGORIES=	x11-wm
 
 MAINTAINER=	gor@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
+OPTIONS_DEFINE=	DOCS EXAMPLES CONTRIB
+OPTIONS_SUB=	yes
+CONTRIB_DESC=	Install contrib (shell completions, etc.)
+
+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>
diff --git a/x11-wm/bspwm/distinfo b/x11-wm/bspwm/distinfo
index ba077e57b653..55a1dc02d49e 100644
--- a/x11-wm/bspwm/distinfo
+++ b/x11-wm/bspwm/distinfo
@@ -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
diff --git a/x11-wm/bspwm/files/patch-Makefile b/x11-wm/bspwm/files/patch-Makefile
deleted file mode 100644
index 109e866f1f2c..000000000000
--- a/x11-wm/bspwm/files/patch-Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
---- Makefile.orig	2017-07-14 19:01:20 UTC
-+++ Makefile
-@@ -1,17 +1,18 @@
- VERCMD  ?= git describe 2> /dev/null
- VERSION := $(shell $(VERCMD) || cat VERSION)
- 
--CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
-+CPPFLAGS += $(shell pkg-config --cflags xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -DVERSION=\"$(VERSION)\"
- CFLAGS   += -std=c99 -pedantic -Wall -Wextra
--LDLIBS    = -lm -lxcb -lxcb-util -lxcb-keysyms -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama
-+LDLIBS    = $(shell pkg-config --libs xcb-keysyms xcb-ewmh xcb-event xcb-icccm xcb-randr xcb-util xcb-xinerama) -lm
- 
- PREFIX    ?= /usr/local
--BINPREFIX ?= $(PREFIX)/bin
--MANPREFIX ?= $(PREFIX)/share/man
--DOCPREFIX ?= $(PREFIX)/share/doc/bspwm
--BASHCPL   ?= $(PREFIX)/share/bash-completion/completions
--FISHCPL   ?= $(PREFIX)/share/fish/vendor_completions.d
--ZSHCPL    ?= $(PREFIX)/share/zsh/site-functions
-+BINPREFIX  = $(PREFIX)/bin
-+MANPREFIX  = $(PREFIX)/man
-+DOCPREFIX  = $(PREFIX)/share/doc/bspwm
-+EXPREFIX   = $(PREFIX)/share/examples/bspwm
-+BASHCPL    = $(PREFIX)/share/bash-completion/completions
-+FISHCPL    = $(PREFIX)/share/fish/vendor_completions.d
-+ZSHCPL     = $(PREFIX)/share/zsh/site-functions
- 
- MD_DOCS    = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
- XSESSIONS ?= $(PREFIX)/share/xsessions
-@@ -39,23 +40,44 @@ bspc: $(CLI_OBJ)
- 
- install:
- 	mkdir -p "$(DESTDIR)$(BINPREFIX)"
--	cp -pf bspwm "$(DESTDIR)$(BINPREFIX)"
--	cp -pf bspc "$(DESTDIR)$(BINPREFIX)"
-+	${BSD_INSTALL_PROGRAM} bspwm "$(DESTDIR)$(BINPREFIX)"
-+	${BSD_INSTALL_PROGRAM} bspc "$(DESTDIR)$(BINPREFIX)"
- 	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
--	cp -p doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1
--	cp -Pp doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
-+	${BSD_INSTALL_MAN} doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1
-+	${BSD_INSTALL_MAN} doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
- 	mkdir -p "$(DESTDIR)$(BASHCPL)"
--	cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
-+	${BSD_INSTALL_DATA} contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
- 	mkdir -p "$(DESTDIR)$(FISHCPL)"
--	cp -p contrib/fish_completion "$(DESTDIR)$(FISHCPL)"/bspc.fish
-+	${BSD_INSTALL_DATA} contrib/fish_completion "$(DESTDIR)$(FISHCPL)"/bspc.fish
- 	mkdir -p "$(DESTDIR)$(ZSHCPL)"
--	cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
-+	${BSD_INSTALL_DATA} contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
- 	mkdir -p "$(DESTDIR)$(DOCPREFIX)"
--	cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
--	mkdir -p "$(DESTDIR)$(DOCPREFIX)"/examples
--	cp -pr examples/* "$(DESTDIR)$(DOCPREFIX)"/examples
-+	${BSD_INSTALL_DATA} $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)"
-+	${BSD_INSTALL_DATA} examples/bspwmrc "$(DESTDIR)$(EXPREFIX)"
-+	${BSD_INSTALL_DATA} examples/sxhkdrc "$(DESTDIR)$(EXPREFIX)"
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/external_rules
-+	${BSD_INSTALL_DATA} examples/external_rules/bspwmrc \
-+		"$(DESTDIR)$(EXPREFIX)"/external_rules
-+	${BSD_INSTALL_DATA} examples/external_rules/external_rules \
-+		"$(DESTDIR)$(EXPREFIX)"/external_rules
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/external_rules/pseudo_automatic_mode
-+	${BSD_INSTALL_DATA} examples/external_rules/pseudo_automatic_mode/* \
-+		"$(DESTDIR)$(EXPREFIX)"/external_rules/pseudo_automatic_mode
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/loop
-+	${BSD_INSTALL_DATA} examples/loop/* \
-+		"$(DESTDIR)$(EXPREFIX)"/loop
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/overlapping_borders
-+	${BSD_INSTALL_DATA} examples/overlapping_borders/* \
-+		"$(DESTDIR)$(EXPREFIX)"/overlapping_borders
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/panel
-+	${BSD_INSTALL_DATA} examples/panel/* \
-+		"$(DESTDIR)$(EXPREFIX)"/panel
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)"/receptacles
-+	${BSD_INSTALL_DATA} examples/receptacles/* \
-+		"$(DESTDIR)$(EXPREFIX)"/receptacles
- 	mkdir -p "$(DESTDIR)$(XSESSIONS)"
--	cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
-+	${BSD_INSTALL_DATA} contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
- 
- uninstall:
- 	rm -f "$(DESTDIR)$(BINPREFIX)"/bspwm
diff --git a/x11-wm/bspwm/pkg-plist b/x11-wm/bspwm/pkg-plist
index 04a9f35e58ab..c6066de188fb 100644
--- a/x11-wm/bspwm/pkg-plist
+++ b/x11-wm/bspwm/pkg-plist
@@ -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