svn commit: r475000 - head/x11-wm/dwm

[Mateusz Piotrowski]

Author: 0mp
Date: Fri Jul 20 09:40:25 2018
New Revision: 475000
URL: https://svnweb.freebsd.org/changeset/ports/475000

Log:
  x11-wm/dwm: New option, which adds st and dmenu to runtime dependencies
  
  This patch adds an option to the dwm port, which makes x11/dmenu
  and x11/sterm be runtime dependencies of dwm. The option is enabled
  by default so that it's useful to users depending on pkg.
  
  While here:
  - Remove unused PATCH_SITES.
  - Silence STRIP_CMD.
  - Remove now outdated pkg-message.
  
  PR:		227966
  Reported by:	wkoszek
  Reviewed by:	krion (mentor)
  Approved by:	krion (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16358

Deleted:
  head/x11-wm/dwm/pkg-message
Modified:
  head/x11-wm/dwm/Makefile

Modified: head/x11-wm/dwm/Makefile
==============================================================================
--- head/x11-wm/dwm/Makefile	Fri Jul 20 09:37:48 2018	(r474999)
+++ head/x11-wm/dwm/Makefile	Fri Jul 20 09:40:25 2018	(r475000)
@@ -3,13 +3,11 @@
 
 PORTNAME=	dwm
 PORTVERSION=	6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://dl.suckless.org/${PORTNAME}/ \
 		http://schot.a-eskwadraat.nl/files/
 
-PATCH_SITES=	http://dwm.suckless.org/patches/
-
 MAINTAINER=	0mp at FreeBSD.org
 COMMENT=	Dynamic, small, fast and simple window manager
 
@@ -27,12 +25,16 @@ PLIST_FILES=	bin/dwm \
 		man/man1/dwm.1.gz
 PORTDOCS=	README
 
-OPTIONS_DEFINE=	XINERAMA DOCS SUPERASMODKEY VOLUMECONTROL
-OPTIONS_DEFAULT=XINERAMA
+OPTIONS_DEFINE=	DMENUANDSTERM DOCS SUPERASMODKEY VOLUMECONTROL XINERAMA
+OPTIONS_DEFAULT=DMENUANDSTERM XINERAMA
 
+DMENUANDSTERM_DESC=	Install x11/dmenu and x11/st as runtime dependencies
 SUPERASMODKEY_DESC=	Use Super instead of Alt for the dwm mod key
 VOLUMECONTROL_DESC=	Use keys on keyboard to raise or lower volume
 
+DMENUANDSTERM_RUN_DEPENDS=	dmenu:x11/dmenu \
+				st:x11/sterm
+
 SUPERASMODKEY_EXTRA_PATCHES=	${PATCHDIR}/superasmodkey-patch-config.def.h
 VOLUMECONTROL_EXTRA_PATCHES=	${PATCHDIR}/volumecontrol-patch-config.def.h
 
@@ -51,7 +53,7 @@ post-extract:
 	fi
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dwm
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dwm
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}