From nobody Mon Jan 22 10:55:14 2024 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 4TJRvR0qJqz57fN4; Mon, 22 Jan 2024 10:55:15 +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 4TJRvR0J8gz4bsJ; Mon, 22 Jan 2024 10:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705920915; 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=h+Ii2KWShrNC5x8GX+OUzO7Wy3nORRdf467MDtFtL5k=; b=gA7UAz0Njc/LwPhyAVShsMpIxDNSktflqStNY+yKlzWo4jSnMInNuDBcJ0PaA198nIMrbE idFODuM5qZ/ZOimjPsoiOcsweNk2LNqo9xz7zzwsJlbW8gfiXTI1dinogLOH/8zOPKJevT uRoLm87okVURtp6UR/aIywSGrHVDUyo/JSs4IBti9E9Q/WCE+sDlKcl8PBLNDcJhuqEK/d w3JDfowYbQncNWBTLvResLHbrQWn8158RQZxYOEdVUuoebHLmhjBHHzGy1P4AgiodDLo9Y oZkFfhlsTh4TFaGMOtCjm0ZEMzAzlzU48O5bJyJ8RqtViQISi6Lias1ImKkwuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705920915; 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=h+Ii2KWShrNC5x8GX+OUzO7Wy3nORRdf467MDtFtL5k=; b=UastSZlOKtb5UeWtFgDuJNe5+KU2HTVAYYzQtHN/okUKnVrKF5++lSU1O1RkEDjlJ3KEaW mhrL+gRL1AbhIwIJiUi60Hfu5J07ZrLEu1PKDu8+Kp82B3GHt5HfDUgspqNEiHS8mHW9Y2 u4XHRUfst2NzWhRBEyrbbH2MhJqfI5ostkRN1Xb4wvykytihyKtJgrQJIesW1pWbh6WYtP uMvfrDs0HLd01WGaczbmz4QF2Cy8gg504r9lAJoIxK0hjjdgQhzOmJQW49DPgmGioGLz9b QDZszV8m4wBPXiRP20ovYSMBGe3mSgsQLgx1JCLtSYb9AQAZY0l8iL96LolJvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705920915; a=rsa-sha256; cv=none; b=wNX+o88rBl2vsh50fosaMPMSVVMDbiVQnDI3HY22erLkzmkyXbuXjWV8veNsd1UJpHCZky V9GNSchKsWwZTTox59VmTRbPVK8f0VXXerAFiNCFWwAsclwch58FzYo8Zi4ibgePR7+rlK Qh3+ed1Bu9dX+D51+90ZlOFF+F9w83FUI9qOUkReKd94qbXHI/l4+Q9zMJbRtiWpd+18+k Hw1afr4w1ZzFH4FmcfxLTbVvTgkTk/w0BvipDrN6lF53b5WgyWxm6+FsG1DHeS9FZDYgBy XTNr66w7MXvnRLDuIA3mQEcH1RNQ/QGYbqx/h5PlHW+kO2YouQhMT9vw2yxxFg== 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 4TJRvQ6QZQzyXw; Mon, 22 Jan 2024 10:55:14 +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 40MAtEgL044709; Mon, 22 Jan 2024 10:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MAtEKU044706; Mon, 22 Jan 2024 10:55:14 GMT (envelope-from git) Date: Mon, 22 Jan 2024 10:55:14 GMT Message-Id: <202401221055.40MAtEKU044706@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: b0da15216ec6 - main - editors/heme: convert MAKE_ARGS to patch file (for manpages) 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: b0da15216ec6de453d01652e62328a0ce3be536d Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b0da15216ec6de453d01652e62328a0ce3be536d commit b0da15216ec6de453d01652e62328a0ce3be536d Author: Alexey Dokuchaev AuthorDate: 2024-01-22 10:54:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-01-22 10:54:24 +0000 editors/heme: convert MAKE_ARGS to patch file (for manpages) Now that default manpage installation prefix had been changed, patching the Makefile statically would be more readable than combination of MAKE_ARGS + REINPLACE_CMD. While here, do not unconditionally try to strip the binary (respect WITH_DEBUG). --- editors/heme/Makefile | 5 +---- editors/heme/files/patch-Makefile | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/editors/heme/Makefile b/editors/heme/Makefile index 276583e9c520..ecc844487ec3 100644 --- a/editors/heme/Makefile +++ b/editors/heme/Makefile @@ -11,11 +11,8 @@ LICENSE= GPLv2 USES= ncurses ALL_TARGET= ${PORTNAME} -MAKE_ARGS= CFLAGS="${CFLAGS} -Wall -DHAVE_MMAP" \ - LDFLAGS="${LDFLAGS} -lncurses" \ - INSTALL_PREFIX="${STAGEDIR}${PREFIX}" -PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PLIST_FILES= bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz PORTDOCS= README OPTIONS_DEFINE= DOCS diff --git a/editors/heme/files/patch-Makefile b/editors/heme/files/patch-Makefile new file mode 100644 index 000000000000..249ac3d9461c --- /dev/null +++ b/editors/heme/files/patch-Makefile @@ -0,0 +1,26 @@ +--- Makefile.orig 2006-11-22 22:24:17 UTC ++++ Makefile +@@ -1,18 +1,18 @@ + INSTALL_PREFIX = /usr/local +-CFLAGS = -Wall -DHAVE_MMAP # remove -DHAVE_MMAP if you don't have mmap +-LDFLAGS = -lcurses ++CFLAGS += -Wall -DHAVE_MMAP ++LDFLAGS += -lcurses + OBJECTS = heme.o xmalloc.o error.o pconfig.o pgetopt.o + TARGET = heme + + $(TARGET): $(OBJECTS) +- $(CC) $(OBJECTS) -o $(TARGET) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(OBJECTS) -o $(TARGET) $(LDFLAGS) + + .c.o: + $(CC) $(CFLAGS) -c $< -o $@ + + install: $(TARGET) +- install -s -m 0755 $(TARGET) $(INSTALL_PREFIX)/bin +- install -m 0644 heme.1 $(INSTALL_PREFIX)/man/man1 ++ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(PREFIX)/bin ++ $(BSD_INSTALL_DATA) heme.1 $(DESTDIR)$(PREFIX)/share/man/man1 + + uninstall: + rm -f $(INSTALL_PREFIX)/bin/$(TARGET)