svn commit: r522109 - in head/x11-wm/cwm: . files
Tobias Kortkamp
tobik at FreeBSD.org
Sun Jan 5 05:32:08 UTC 2020
Author: tobik
Date: Sun Jan 5 05:32:07 2020
New Revision: 522109
URL: https://svnweb.freebsd.org/changeset/ports/522109
Log:
x11-wm/cwm: Update to 6.6
- After >2 years stop installing the config migration script
- Drop conditional post-patch. DragonFly has reallocarray in its
libc too nowadays. We can just have one static patch now.
Changes: https://github.com/leahneukirchen/cwm/blob/v6.6/README
Added:
head/x11-wm/cwm/files/
head/x11-wm/cwm/files/patch-Makefile (contents, props changed)
Modified:
head/x11-wm/cwm/Makefile
head/x11-wm/cwm/distinfo
Modified: head/x11-wm/cwm/Makefile
==============================================================================
--- head/x11-wm/cwm/Makefile Sun Jan 5 04:49:42 2020 (r522108)
+++ head/x11-wm/cwm/Makefile Sun Jan 5 05:32:07 2020 (r522109)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cwm
-DISTVERSION= 6.3
+DISTVERSION= 6.6
CATEGORIES= x11-wm
MASTER_SITES= https://leahneukirchen.org/releases/
@@ -13,30 +13,17 @@ LICENSE= ISCL
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= pkgconfig shebangfix xorg
-USE_XORG= x11 xft xinerama xrandr
-
+USES= pkgconfig xorg
+USE_XORG= x11 xft xrandr
+MAKE_ARGS= MANPREFIX="${MANPREFIX}/man"
PLIST_FILES= bin/cwm \
- bin/cwm-migrate-config.pl \
man/man1/cwm.1.gz \
man/man5/cwmrc.5.gz
-SHEBANG_FILES= migrate-config.pl
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} 's@/usr/X11R6@${LOCALBASE}@' ${WRKSRC}/cwmrc.5
- @${REINPLACE_CMD} -e 's at strlcpy.o strlcat.o@@' \
- -e 's at strtonum.o@@' ${WRKSRC}/Makefile
-.if ${OPSYS} == FreeBSD
- @${REINPLACE_CMD} 's at reallocarray.o@@' ${WRKSRC}/Makefile
-.endif
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/cwm ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/migrate-config.pl \
- ${STAGEDIR}${PREFIX}/bin/cwm-migrate-config.pl
- ${INSTALL_MAN} ${WRKSRC}/cwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/cwmrc.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cwm
.include <bsd.port.mk>
Modified: head/x11-wm/cwm/distinfo
==============================================================================
--- head/x11-wm/cwm/distinfo Sun Jan 5 04:49:42 2020 (r522108)
+++ head/x11-wm/cwm/distinfo Sun Jan 5 05:32:07 2020 (r522109)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526324643
-SHA256 (cwm-6.3.tar.gz) = 4cd57ffac72841c128cccaea8ba210679d8913cd841690861d56c0e758baed9e
-SIZE (cwm-6.3.tar.gz) = 52419
+TIMESTAMP = 1578172523
+SHA256 (cwm-6.6.tar.gz) = 223d086dbebfb2f35f05af0c72c3d1b04fdd341123121c65105524ebd605655c
+SIZE (cwm-6.6.tar.gz) = 53062
Added: head/x11-wm/cwm/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/cwm/files/patch-Makefile Sun Jan 5 05:32:07 2020 (r522109)
@@ -0,0 +1,14 @@
+Prefer libc version over custom strlcpy, strlcat, reallocarray, strtonum
+
+--- Makefile.orig 2020-01-04 21:20:03 UTC
++++ Makefile
+@@ -11,8 +11,7 @@ SRCS= calmwm.c screen.c xmalloc.c client.c menu.c \
+
+ OBJS= calmwm.o screen.o xmalloc.o client.o menu.o \
+ search.o util.o xutil.o conf.o xevents.o group.o \
+- kbfunc.o strlcpy.o strlcat.o y.tab.o \
+- strtonum.o reallocarray.o
++ kbfunc.o y.tab.o
+
+ CPPFLAGS+= `pkg-config --cflags x11 xft xrandr`
+
More information about the svn-ports-all
mailing list