Page MenuHomeFreeBSD
Files F150758810

D19416.diff
No OneTemporary
Actions

D19416.diff
View Options

Index: head/x11-wm/dwm/Makefile
===================================================================
--- head/x11-wm/dwm/Makefile
+++ head/x11-wm/dwm/Makefile
@@ -2,11 +2,9 @@
# $FreeBSD$
PORTNAME= dwm
-PORTVERSION= 6.1
-PORTREVISION= 3
+DISTVERSION= 6.2
CATEGORIES= x11-wm
-MASTER_SITES= http://dl.suckless.org/${PORTNAME}/ \
- http://schot.a-eskwadraat.nl/files/
+MASTER_SITES= http://dl.suckless.org/${PORTNAME}/
MAINTAINER= 0mp@FreeBSD.org
COMMENT= Dynamic, small, fast and simple window manager
@@ -15,11 +13,19 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
+# Kyua is not used by the upstream to test. It's only used in the port's
+# do-test target.
+TEST_DEPENDS= ${LOCALBASE}/libexec/atf-check:devel/kyua
USE_XORG= x11 xft
-MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
- X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib"
+MAKE_ARGS= CC="${CC}" \
+ FREETYPEINC="${LOCALBASE}/include/freetype2" \
+ MANPREFIX="${MANPREFIX}/man" \
+ PREFIX="${PREFIX}" \
+ VERSION="${PORTVERSION}" \
+ X11INC="${LOCALBASE}/include" \
+ X11LIB="${LOCALBASE}/lib"
PLIST_FILES= bin/dwm \
man/man1/dwm.1.gz
@@ -30,7 +36,7 @@
DMENUANDSTERM_DESC= Install x11/dmenu and x11/sterm 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
+VOLUMECONTROL_DESC= Use multimedia keys to raise or lower volume
DMENUANDSTERM_RUN_DEPENDS= dmenu:x11/dmenu \
st:x11/sterm
@@ -46,17 +52,28 @@
@${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean"
@${ECHO_MSG} "Note: Pre-${PORTVERSION} config.h-files may not work."
+.if exists(${DWM_CONF})
post-extract:
- @if [ -e "${DWM_CONF}" ]; then \
- ${ECHO_MSG} "Creating symlink: config.h -> ${DWM_CONF}"; \
- ${LN} -fs "${DWM_CONF}" ${WRKSRC}/config.h; \
- fi
+ @${ECHO_MSG} "Creating symlink: config.h -> ${DWM_CONF}"
+ ${LN} -fs "${DWM_CONF}" ${WRKSRC}/config.h
+.endif
+post-configure:
+ @${REINPLACE_CMD} -E \
+ -e "s|(CFLAGS[[:space:]]*)= |\1+= |" \
+ -e "s|(CPPFLAGS[[:space:]]*)= |\1+= |" \
+ -e "s|(LDFLAGS[[:space:]]*)= |\1+= |" \
+ ${WRKSRC}/config.mk
+
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dwm
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
+do-test:
+ ${LOCALBASE}/libexec/atf-check -s exit:1 -e match:"dwm-${PORTVERSION}" \
+ ${STAGEDIR}${PREFIX}/bin/dwm -v
.include <bsd.port.mk>
Index: head/x11-wm/dwm/distinfo
===================================================================
--- head/x11-wm/dwm/distinfo
+++ head/x11-wm/dwm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dwm-6.1.tar.gz) = c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe
-SIZE (dwm-6.1.tar.gz) = 25887
+TIMESTAMP = 1551437504
+SHA256 (dwm-6.2.tar.gz) = 97902e2e007aaeaa3c6e3bed1f81785b817b7413947f1db1d3b62b8da4cd110e
+SIZE (dwm-6.2.tar.gz) = 25273
Index: head/x11-wm/dwm/files/patch-config.mk
===================================================================
--- head/x11-wm/dwm/files/patch-config.mk
+++ head/x11-wm/dwm/files/patch-config.mk
@@ -1,17 +0,0 @@
---- config.mk.orig 2015-11-08 22:39:37 UTC
-+++ config.mk
-@@ -25,10 +25,10 @@ INCS = -I${X11INC} -I${FREETYPEINC}
- LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-
- # flags
--CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
--CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
--LDFLAGS = -s ${LIBS}
-+CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-+#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-+CFLAGS+= -std=c99 -Wno-deprecated-declarations ${INCS} ${CPPFLAGS}
-+LDFLAGS+= ${LIBS}
-
- # Solaris
- #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 9:02 PM (5 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30843385
Default Alt Text
D19416.diff (3 KB)

Event Timeline