From owner-svn-ports-head@freebsd.org Sun Aug 2 16:34:26 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 826D43A204E; Sun, 2 Aug 2020 16:34:26 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BKRS22wjHz4f5J; Sun, 2 Aug 2020 16:34:26 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D4342669F; Sun, 2 Aug 2020 16:34:26 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 072GYQlu002858; Sun, 2 Aug 2020 16:34:26 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 072GYPjj002855; Sun, 2 Aug 2020 16:34:25 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202008021634.072GYPjj002855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Sun, 2 Aug 2020 16:34:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543974 - in head/x11/dmenu: . files X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in head/x11/dmenu: . files X-SVN-Commit-Revision: 543974 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2020 16:34:26 -0000 Author: 0mp Date: Sun Aug 2 16:34:25 2020 New Revision: 543974 URL: https://svnweb.freebsd.org/changeset/ports/543974 Log: x11/dmenu: Get the latest bug fixes from upstream Users are still reporting issues with the dmenu version 4.9. The patch we have currently in the ports tree was meant to be a temporary fix as we waited for a new dmenu release. A new release is not coming apparently, so let's just get the latest patches from upstream. Also, switch to a GitHub-hosted mirror of the dmenu repository as it is painful to get artifacts from https://git.suckless.org/ without a Git client. While here, replace REINPLACE_CMD with patches. Reported by: Scott Robbins MFH: 2020Q3 Added: head/x11/dmenu/files/patch-config.mk (contents, props changed) Deleted: head/x11/dmenu/files/patch-dmenu.c Modified: head/x11/dmenu/Makefile head/x11/dmenu/distinfo Modified: head/x11/dmenu/Makefile ============================================================================== --- head/x11/dmenu/Makefile Sun Aug 2 16:04:58 2020 (r543973) +++ head/x11/dmenu/Makefile Sun Aug 2 16:34:25 2020 (r543974) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= dmenu -DISTVERSION= 4.9 -PORTREVISION= 1 +DISTVERSION= 4.9-6 +DISTVERSIONSUFFIX= -g9b38fda CATEGORIES= x11 -MASTER_SITES= http://dl.suckless.org/tools/ \ - http://schot.a-eskwadraat.nl/files/ MAINTAINER= 0mp@FreeBSD.org COMMENT= X11 menu application designed for the dwm window manager @@ -20,6 +18,9 @@ OPTIONS_DEFINE= XINERAMA OPTIONS_DEFAULT= XINERAMA USES= xorg +USE_GITHUB= yes +GH_ACCOUNT= 0mp +GH_PROJECT= freebsd-${PORTNAME} USE_XORG= x11 xft MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \ X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib" \ @@ -30,13 +31,6 @@ PLIST_FILES= bin/dmenu bin/dmenu_path bin/dmenu_run bi XINERAMA_USE= XORG=xinerama XINERAMA_MAKE_ARGS_OFF= XINERAMAFLAGS= XINERAMALIBS= - -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/dmenu \ Modified: head/x11/dmenu/distinfo ============================================================================== --- head/x11/dmenu/distinfo Sun Aug 2 16:04:58 2020 (r543973) +++ head/x11/dmenu/distinfo Sun Aug 2 16:34:25 2020 (r543974) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551305095 -SHA256 (dmenu-4.9.tar.gz) = b3971f4f354476a37b2afb498693649009b201550b0c7c88e866af8132b64945 -SIZE (dmenu-4.9.tar.gz) = 15972 +TIMESTAMP = 1596384435 +SHA256 (0mp-freebsd-dmenu-4.9-6-g9b38fda_GH0.tar.gz) = b111ecec87cdd1191e711ded09ba2d33b4b69fb2cc9ea2b90fd86d64ab87943a +SIZE (0mp-freebsd-dmenu-4.9-6-g9b38fda_GH0.tar.gz) = 16012 Added: head/x11/dmenu/files/patch-config.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/dmenu/files/patch-config.mk Sun Aug 2 16:34:25 2020 (r543974) @@ -0,0 +1,15 @@ +--- config.mk.orig 2020-08-02 16:25:39 UTC ++++ config.mk +@@ -23,9 +23,9 @@ INCS = -I$(X11INC) -I$(FREETYPEINC) + LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) + + # flags +-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) +-CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) +-LDFLAGS = $(LIBS) ++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) ++CFLAGS += -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) ++LDFLAGS += $(LIBS) + + # compiler and linker + CC = cc