From 88055d38db35e36a4104fbde78870853b6cb0ead Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Tue, 16 Jun 2015 00:08:58 +0000 Subject: [PATCH] - Don't duplicate examples in DOCSDIR PR: 200094 Submitted by: udvzsolt@gmail.com Approved by: antont@inbox.lv (maintainer) --- x11-wm/bspwm/Makefile | 9 ++++----- x11-wm/bspwm/files/patch-Makefile | 11 ++++++++++- x11-wm/bspwm/pkg-plist | 16 ---------------- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/x11-wm/bspwm/Makefile b/x11-wm/bspwm/Makefile index 1a15482b7a8f..50f4a39b5834 100644 --- a/x11-wm/bspwm/Makefile +++ b/x11-wm/bspwm/Makefile @@ -3,13 +3,14 @@ PORTNAME= bspwm PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MAINTAINER= antont@inbox.lv COMMENT= Tiling window manager based on binary space partitioning LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm RUN_DEPENDS= sxhkd:${PORTSDIR}/x11/sxhkd @@ -20,10 +21,8 @@ GH_ACCOUNT= baskerville USES= gmake shebangfix SHEBANG_FILES= contrib/freedesktop/bspwm-session +MAKE_ENV+= EXAMPLESDIR=${EXAMPLESDIR} + OPTIONS_DEFINE= DOCS EXAMPLES -post-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) - .include diff --git a/x11-wm/bspwm/files/patch-Makefile b/x11-wm/bspwm/files/patch-Makefile index 6dd944ad21bc..0ec8d278ba1c 100644 --- a/x11-wm/bspwm/files/patch-Makefile +++ b/x11-wm/bspwm/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2014-12-15 20:58:41 UTC +--- Makefile.orig 2015-03-20 21:29:14 UTC +++ Makefile @@ -8,7 +8,7 @@ LDFLAGS += -L$(PREFIX)/lib @@ -8,4 +8,13 @@ +MANPREFIX = $(PREFIX)/man BASHCPL = $(PREFIX)/share/bash-completion/completions ZSHCPL = $(PREFIX)/share/zsh/site-functions + DOCPREFIX = $(PREFIX)/share/doc/bspwm +@@ -56,7 +56,7 @@ install: + cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc + mkdir -p "$(DESTDIR)$(DOCPREFIX)" + cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)" +- cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples ++ cp -pr examples "$(DESTDIR)$(EXAMPLESDIR)" + mkdir -p "$(DESTDIR)$(XSESSIONS)" + cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)" diff --git a/x11-wm/bspwm/pkg-plist b/x11-wm/bspwm/pkg-plist index 30ae97b70666..09c5b4b66b6b 100644 --- a/x11-wm/bspwm/pkg-plist +++ b/x11-wm/bspwm/pkg-plist @@ -8,22 +8,6 @@ share/bash-completion/completions/bspc %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md %%PORTDOCS%%%%DOCSDIR%%/MISC.md %%PORTDOCS%%%%DOCSDIR%%/TODO.md -%%PORTDOCS%%%%DOCSDIR%%/examples/bspwmrc -%%PORTDOCS%%%%DOCSDIR%%/examples/external_rules/bspwmrc -%%PORTDOCS%%%%DOCSDIR%%/examples/external_rules/external_rules -%%PORTDOCS%%%%DOCSDIR%%/examples/loop/bspwmrc -%%PORTDOCS%%%%DOCSDIR%%/examples/loop/profile -%%PORTDOCS%%%%DOCSDIR%%/examples/loop/sxhkdrc -%%PORTDOCS%%%%DOCSDIR%%/examples/loop/wm -%%PORTDOCS%%%%DOCSDIR%%/examples/loop/xinitrc -%%PORTDOCS%%%%DOCSDIR%%/examples/overlapping_borders/bspwmrc -%%PORTDOCS%%%%DOCSDIR%%/examples/panel/bspwmrc -%%PORTDOCS%%%%DOCSDIR%%/examples/panel/panel -%%PORTDOCS%%%%DOCSDIR%%/examples/panel/panel_bar -%%PORTDOCS%%%%DOCSDIR%%/examples/panel/panel_colors -%%PORTDOCS%%%%DOCSDIR%%/examples/panel/profile -%%PORTDOCS%%%%DOCSDIR%%/examples/panel/sxhkdrc -%%PORTDOCS%%%%DOCSDIR%%/examples/sxhkdrc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bspwmrc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/bspwmrc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/external_rules