aboutsummaryrefslogtreecommitdiffstats
path: root/x11-wm
diff options
context:
space:
mode:
author0mp <0mp@FreeBSD.org>2018-07-20 17:40:25 +0800
committer0mp <0mp@FreeBSD.org>2018-07-20 17:40:25 +0800
commitca54f0019d2fd191387843a71a84d9fa4eb6553d (patch)
tree2bc43dbcc04eda344e5c0d194de59e39631bae07 /x11-wm
parent6dca1cb641019aa11d47195923d7617829bd9c01 (diff)
downloadfreebsd-ports-gnome-ca54f0019d2fd191387843a71a84d9fa4eb6553d.tar.gz
freebsd-ports-gnome-ca54f0019d2fd191387843a71a84d9fa4eb6553d.tar.zst
freebsd-ports-gnome-ca54f0019d2fd191387843a71a84d9fa4eb6553d.zip
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
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/dwm/Makefile14
-rw-r--r--x11-wm/dwm/pkg-message6
2 files changed, 8 insertions, 12 deletions
diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index b723e7ae4a3f..00c5765ffca8 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -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@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}
diff --git a/x11-wm/dwm/pkg-message b/x11-wm/dwm/pkg-message
deleted file mode 100644
index ccc4997c7455..000000000000
--- a/x11-wm/dwm/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-*************************************************************
-
-When using the default dwm config.h installation of sterm and
-dmenu packages is recommended.
-
-*************************************************************