From nobody Fri May 12 08:23:16 2023 X-Original-To: dev-commits-ports-main@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 4QHhbm4vbFz4Bht7; Fri, 12 May 2023 08:23:16 +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 4QHhbm4NNHz3F1J; Fri, 12 May 2023 08:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683879796; 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=4jsbszxu0f3vyc9Nzej6PERjdDPfz7WrSOAHzbXb0bU=; b=cBtKPaobAIRb0nQVqslJuP9thPy1/vCOv8ATpqfSLk5vGqCevEL1DoOZQbdZYWY+rtsLAM 5SmsD4UKbWBeg7ium7wlyyBM+yMiZpKB6vdjekiqEI3cH488WzvkIG9yoy0dMRZGwWCJcM Hdr+1ge8O26KUst8NmGNpqH5XjwsdlHtoQ7PL5+SHK33jv6VHWWpmSVxWHjdXvRgCoR9SD 63ZMlkYOx7Jw48p3sDF/PCdSPbZa8UFxxxyVRNX9otzYS+8P4ZJNW2N1tf7iisG11Ap0NW ygS7r/YpqfrfZ/gybIPJoiITHImqeubwC48xpoAbC+w0tVAKAwHY8P4K+MDVQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683879796; 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=4jsbszxu0f3vyc9Nzej6PERjdDPfz7WrSOAHzbXb0bU=; b=yKAjXIpBtXZ+RW+Uadz3AIKckZmEygVkVQUwUNeHJ9B28s2NOrVjrDTkSdkSmStOp2XsiP wp1nJ1ENK7m5QiprCOmFFjjFi/iKqTL1jL4Skuo3vzKr4AK4Nj1jbpvhm2caSdTRzgJA6g bw7VtOQ+ygR3Rp8qgH5VWU/HjYronDFoUsNZUIwyccT24b/EGp+ibeAYMDQhi72c/faiy2 9TsC1yzy8ixapLSVX7Qw1KskRbmWrnCfvb1GXcCUEfuKc17IL0KjEHXyYIUbJ4CH85/exN khiNMyrucQyxmrJaZxAkPKhRQ6KBeu361bjpPlGXEmvUlKiznClIscZ2w7XATQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683879796; a=rsa-sha256; cv=none; b=Z+6AWVgq+LVB+ljSVbG+a1yYbOdydmogwFuofIl4LZiN1CwBNq5KEqkTu9Sj6FWwunqWr+ 0xsTVyxj2mfMYHmdTgjYRqd7rAQog+4VBGULHnfwuDJ12LlTF+j4pm09E7+5Xai0C8k9a8 lN/yseS1E/UsZB5xz78h102irGxX0+R/RYluwLgW/JVnjlU37rw8PGjiNztASmglzBhbnO xOaKjwd8yPyI6kMt9Ls3VStN5CtEbxOZiOILHirFDk+37NAFkmKiN66B9VXpiRDQzBm/py /v5khaHbRMgqV8yqHWLapqmbaNU4J6+SObxwV2GryPweH9/210QtTGYjaK7rDw== 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 4QHhbm3RT5zT57; Fri, 12 May 2023 08:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34C8NGfA038553; Fri, 12 May 2023 08:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34C8NGSr038552; Fri, 12 May 2023 08:23:16 GMT (envelope-from git) Date: Fri, 12 May 2023 08:23:16 GMT Message-Id: <202305120823.34C8NGSr038552@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: f1a221f38e05 - main - x11/mons: the port had been improved (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1a221f38e050d365327449754490ab954af65f9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1a221f38e050d365327449754490ab954af65f9 commit f1a221f38e050d365327449754490ab954af65f9 Author: Alexey Dokuchaev AuthorDate: 2023-05-12 08:21:46 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-12 08:21:46 +0000 x11/mons: the port had been improved (+) Patch the Makefile the right way and remove MAKE_ARGS: let our framework deal with the LICENSE file, pass correct DESTDIR and PREFIX values, and create the symlink to `liblist.sh' where it is expected. --- x11/mons/Makefile | 6 +----- x11/mons/files/patch-Makefile | 36 +++++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/x11/mons/Makefile b/x11/mons/Makefile index 76415711ca78..8a1da3d8c116 100644 --- a/x11/mons/Makefile +++ b/x11/mons/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= help2man:misc/help2man -RUN_DEPENDS= xrandr>0:x11/xrandr +RUN_DEPENDS= xrandr:x11/xrandr USE_GITHUB= yes GH_ACCOUNT= Ventto @@ -21,10 +21,6 @@ GH_SUBDIR= libshlist:libshlist NO_ARCH= yes NO_BUILD= yes -MAKE_ARGS= DESTDIR=${STAGEDIR} \ - PREFIX=${PREFIX} \ - MANDIR=${STAGEDIR}${PREFIX}/man/man1 \ - LIB=${WRKSRC_libshlist}/liblist.sh OPTIONS_DEFINE= DOCS diff --git a/x11/mons/files/patch-Makefile b/x11/mons/files/patch-Makefile index 11d94bf9299b..e63630a59a18 100644 --- a/x11/mons/files/patch-Makefile +++ b/x11/mons/files/patch-Makefile @@ -1,22 +1,32 @@ --- Makefile.orig 2017-11-25 13:46:52 UTC +++ Makefile -@@ -1,11 +1,12 @@ --PKGNAME = mons --PKGDESC = POSIX Shell script to quickly manage 2-monitors display. -+PKGNAME = mons -+PKGDESC = POSIX Shell script to quickly manage 2-monitors display. +@@ -1,10 +1,9 @@ + PKGNAME = mons + PKGDESC = POSIX Shell script to quickly manage 2-monitors display. -LICENSEDIR = $(DESTDIR)/usr/share/licenses/$(PKGNAME) -MANDIR = $(DESTDIR)/usr/share/man/man1 -BINDIR = $(DESTDIR)/usr/bin -LIBDIR = $(DESTDIR)/usr/lib/libshlist --LIB = libshlist/liblist.sh -+PREFIX = /usr -+LICENSEDIR = $(DESTDIR)$(PREFIX)/share/licenses/$(PKGNAME) -+MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1 -+BINDIR = $(DESTDIR)$(PREFIX)/bin -+LIBDIR = $(DESTDIR)$(PREFIX)/lib/libshlist -+LIB = libshlist/liblist.sh ++MANDIR = $(DESTDIR)$(PREFIX)/man/man1 ++BINDIR = $(DESTDIR)$(PREFIX)/bin ++LIBDIR = $(DESTDIR)$(PREFIX)/lib/libshlist + LIB = libshlist/liblist.sh install: - @if ! [ -r "$(LIB)" ]; then \ +@@ -18,15 +17,12 @@ install: + exit 1; \ + fi + mkdir -p $(MANDIR) +- mkdir -p $(LICENSEDIR) + mkdir -p $(LIBDIR) + mkdir -p $(BINDIR) + chmod 644 $(PKGNAME).1.gz +- chmod 644 LICENSE + chmod 644 $(LIB) + chmod 755 mons + cp $(PKGNAME).1.gz $(MANDIR)/$(PKGNAME).1.gz +- cp LICENSE $(LICENSEDIR)/LICENSE + cp $(LIB) $(LIBDIR)/liblist.sh + cp mons $(BINDIR)/mons +