From nobody Fri Aug 4 12:24:40 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RHPzX4fBkz4kNKR; Fri, 4 Aug 2023 12:24:40 +0000 (UTC) (envelope-from git@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 4RHPzX43Jhz4YCy; Fri, 4 Aug 2023 12:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691151880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/F8tESvm+jkyouIgf3vuM45/HcI2fDcRsZCizInqMAY=; b=B2zD3HAWR/9X16DYXQSncg5WSqfKn7bYryPe9DFt0CoyQ4AsyWYMMMhZrQ/VRlEH/1txpg schdqZ13Wzl2+uV7P6bS71gGMyH+J+u/7C52ig3BUr7RLI6rQqf89HIKC1P4ht36pu9dIF 5BmYI1HcR9/8E8Wdn1dKFtNJrF2DhRjXFnUPq65fCNm/Aa/oqy88jRrkZtwEILmQikwZNR H51BKb2QNqxSxEV/6RMjv65KB3rCIFfSZkfGasx0+DpuTVBXo9tsKO3OizK3eOuaGeNzO8 ErbkTdYlijUmnpOlr3ZJFvxGan36XWCugOnGx56Q1TBPncwzcP+fAetfnJtZcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691151880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/F8tESvm+jkyouIgf3vuM45/HcI2fDcRsZCizInqMAY=; b=aEO7xBzUSxFUbTAbw1G1X+R+n9CO1RkLngVmDJZQWgY4ZlyouzKoT0ombwkU677EVm60yH bzyDC/RIMniKBqEy9v9g7ei8HicUDRE+7Xs5iGZiqWJfyjAlj3xqb72yymO1UAcUFrry9f Vx2PuMiyK+skSrZb274Dea1HwKaa0fHXhsl7OkW31TkO/GZbf0t+eNlW7o5KI3GjCW+ZdG 4KRBYlwbfk+KTvTfGEQCbJbolnK8TbLrPC57jMBd/FtUhXL/m/UErDLx1h5WNfEGOWQn2P 9vzERPMk4+NpQLRPN4xe1CJgCXBtrhr8KkvLZwQY97LtfBgCNrBWX1tkLtyeIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691151880; a=rsa-sha256; cv=none; b=OGIsz18PbfywGDyv+OZJJ4rQZXO+VKLTr5Tr4DfuDR9N6QI7o22DfAwYOyo68ynR5zca6Y D058bWISEZ/q3JsY6oiW2ySJxUprLEdPn07qukdDBCmOiBYH1Dxt7WdLCYrPcmyitDlvaz M+TVhK+eTTAf4a34BMzPxiRTScPoHAyU05+FauJZ83DUEB2Fq3hB1bE7B0kLn5GQU23ntd QkXxdWKE5SO7Xvi3PYlJCrxzIxa2LQdWK5rzPsQtiTwh5QvVGy7yofNQmHUFk6RB2GfA90 IDncO9XoOZIvpGGJ8S7zYGC5J0ZUXJv3CM6VvF9luKH+DY6x1zO2U0HU5bNzBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RHPzX35tcz12Gk; Fri, 4 Aug 2023 12:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374COetW019574; Fri, 4 Aug 2023 12:24:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374COe6G019573; Fri, 4 Aug 2023 12:24:40 GMT (envelope-from git) Date: Fri, 4 Aug 2023 12:24:40 GMT Message-Id: <202308041224.374COe6G019573@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a8d80b64596d - main - x11/ly: fix forgotten makefile update List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8d80b64596d24bf1c339034bdc8d2ab5dd01eba Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8d80b64596d24bf1c339034bdc8d2ab5dd01eba commit a8d80b64596d24bf1c339034bdc8d2ab5dd01eba Author: Baptiste Daroussin AuthorDate: 2023-08-04 12:23:42 +0000 Commit: Baptiste Daroussin CommitDate: 2023-08-04 12:24:38 +0000 x11/ly: fix forgotten makefile update When upgrading to 0.6.0 I have updated the makefile patch but actually forgot to push it. --- x11/ly/files/patch-makefile | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/x11/ly/files/patch-makefile b/x11/ly/files/patch-makefile index 6df28fdfe1a8..d8da24fa3b66 100644 --- a/x11/ly/files/patch-makefile +++ b/x11/ly/files/patch-makefile @@ -20,6 +20,15 @@ BIND = bin OBJD = obj +@@ -20,7 +24,7 @@ TESTD = tests + RESD = res + TESTD = tests + +-DATADIR ?= ${DESTDIR}/etc/ly ++DATADIR ?= ${DESTDIR}$(PREFIX)/etc/ly + FLAGS+= -DDATADIR=\"$(DATADIR)\" + + INCL = -I$(SRCD) @@ -71,14 +75,14 @@ install: $(BIND)/$(NAME) install: $(BIND)/$(NAME) @@ -32,14 +41,14 @@ - @install -dZ $(DATADIR)/lang - @install -DZ $(RESD)/lang/* -t $(DATADIR)/lang - @install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d -+ @install -d ${DESTDIR}/etc/ly -+ @install $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin -+ @install $(RESD)/config.ini -t ${DESTDIR}/etc/ly -+ @install $(RESD)/xsetup.sh -t $(DATADIR) -+ @install $(RESD)/wsetup.sh -t $(DATADIR) ++ @install -d ${DESTDIR}$(PREFIX)/etc/ly ++ @install $(BIND)/$(NAME) ${DESTDIR}$(PREFIX)/bin ++ @install $(RESD)/config.ini ${DESTDIR}$(PREFIX)/etc/ly ++ @install $(RESD)/xsetup.sh $(DATADIR) ++ @install $(RESD)/wsetup.sh $(DATADIR) + @install -d $(DATADIR)/lang -+ @install $(RESD)/lang/* -t $(DATADIR)/lang -+ @install $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d ++ @install $(RESD)/lang/* $(DATADIR)/lang ++ @install -m 644 $(RESD)/pam.d/ly ${DESTDIR}$(PREFIX)/etc/pam.d installnoconf: $(BIND)/$(NAME) @echo "installing ly without the configuration file"