From owner-svn-ports-all@freebsd.org Tue Mar 16 08:48:43 2021 Return-Path: Delivered-To: svn-ports-all@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 1DF2857C56F; Tue, 16 Mar 2021 08:48:43 +0000 (UTC) (envelope-from jbeich@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F06QM0QFwz3kqf; Tue, 16 Mar 2021 08:48:43 +0000 (UTC) (envelope-from jbeich@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 0131C208D2; Tue, 16 Mar 2021 08:48:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12G8mgv1099511; Tue, 16 Mar 2021 08:48:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12G8mgie099510; Tue, 16 Mar 2021 08:48:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202103160848.12G8mgie099510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 16 Mar 2021 08:48:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568544 - head/x11-wm/river X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/x11-wm/river X-SVN-Commit-Revision: 568544 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 08:48:43 -0000 Author: jbeich Date: Tue Mar 16 08:48:42 2021 New Revision: 568544 URL: https://svnweb.freebsd.org/changeset/ports/568544 Log: x11-wm/river: don't overwrite system-wide config Modified: head/x11-wm/river/Makefile (contents, props changed) Modified: head/x11-wm/river/Makefile ============================================================================== --- head/x11-wm/river/Makefile Tue Mar 16 08:30:24 2021 (r568543) +++ head/x11-wm/river/Makefile Tue Mar 16 08:48:42 2021 (r568544) @@ -2,6 +2,7 @@ PORTNAME= river PORTVERSION= s20210314 +PORTREVISION= 1 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org @@ -35,7 +36,7 @@ NO_INSTALL= yes # strip(1) breaks runtime PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}ctl \ bin/${PORTNAME}tile \ - ${ETCDIR}/init \ + "@sample ${ETCDIR}/init.sample" \ share/bash-completion/completions/${PORTNAME}ctl \ share/zsh/site-functions/_${PORTNAME}ctl \ ${NULL} @@ -65,5 +66,9 @@ do-build: do-test: @(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS}) + +post-install: +# Let @sample handle default files under etc/ + @${MV} ${STAGEDIR}${ETCDIR}/init ${STAGEDIR}${ETCDIR}/init.sample .include