From nobody Fri Jan 13 09:05:47 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 4Ntb9l42Wmz2sb2p; Fri, 13 Jan 2023 09:05:47 +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 4Ntb9l3b2yz3Kd0; Fri, 13 Jan 2023 09:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673600747; 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=5NwrN2OoisLaGvrtC5htUTw6U2qPtLzCjpwI/6xVk6I=; b=HqjRDyK7a6OYimxhvXQt9iFyI7NmNclCo1z31WwDJMLPYFB2RKdbmg18pyPAYZQEKiTzgR vlTcdyZ+8nclXZG0ARuSqzVuCS19cR9xhhkJsal/87d/z9n5ARsi7n1yKNr5xAB6sp56+1 2m4qupr5kl36IQGcISLEn1J4w288wVHYsCrVKw0EpC9wLMag2VPPc4q+mr40Ft0CihAkky DteDdAWDXoVSQ84lg0xYKs0qjOHLJpDC9DldTz4jtuqmNINbGr5F4g1RjRyDXJByNGfpo0 uxyKXC7HAxty0is2PMW4g8gclXtQUzUeV1mrKdSnH4mz+SFTZ3gQOJ271L79Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673600747; 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=5NwrN2OoisLaGvrtC5htUTw6U2qPtLzCjpwI/6xVk6I=; b=vkZ/BbcQ/Q5BfRizcdBPrKONpI4Nf1sXFo+Fp0Dfj+srkWKpK3su9+CwsEaup5K/YfWYOS wQ/AQXrao8+O8fnmJzEENS0lOYl2idWb1Zd3dzxY2WKhoe/GrYAUqiF/RRizbn9CGIbpfw z5vu2VSP65H3vQ+KC2eVxy+YtsFCl9WkHME/3Tf6w7R2k/glEdjhevS2cxA9Cbs92ZG7H1 KRJat7VT5/rnmaBvqMl9G8NBCtDQ5sadC95kR/kUcTpGffFn5zxVWDBXRTgHxdKppthgRG 3UXvI97+9h3yspPPoM/bsb1fkOkwvu4+UX/tKYehcDAt3AYZDOVuRXFgBwe41Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673600747; a=rsa-sha256; cv=none; b=Vp45JrwvunSbC7TSlv4splE3jecKjKzvf4Af01IlfvfWrPIOtRBEQuAFQ8sM1tBs9USCFN mvPlnlgnkBPdr69f/kGvjDK6ROO5bdIQ0JPgxK1o610hdMGMkmELNewIlQdOTjRH4vYIO4 Uo1SNqEL2RwP9D8zx7uAMM2JOBBGI8cwdZESl5R+7vdi1h8jEUV97QDOfERD5u7pbCv8gk 0Vaq+VWXzEwv0Ei4ZfCsmhs1HTByQc6L5/k3uoGzGdyP0sqlTggXzmq2+cmmygOhX7rPQ8 7sFQ+bWGeCxfQRRid6OQGmXSqcPC9l04dqIfA5PD9xVGJDHAqFoMjQ1x1LaP0Q== 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 4Ntb9l1rWtz11mJ; Fri, 13 Jan 2023 09:05:47 +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 30D95lMh081021; Fri, 13 Jan 2023 09:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30D95lOg081020; Fri, 13 Jan 2023 09:05:47 GMT (envelope-from git) Date: Fri, 13 Jan 2023 09:05:47 GMT Message-Id: <202301130905.30D95lOg081020@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Sato Subject: git: ddfcd8839887 - main - shells/heirloom-sh: Change the installation directory 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: hrs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddfcd8839887ffd4503495ffa8ca38a71cdbd064 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hrs: URL: https://cgit.FreeBSD.org/ports/commit/?id=ddfcd8839887ffd4503495ffa8ca38a71cdbd064 commit ddfcd8839887ffd4503495ffa8ca38a71cdbd064 Author: Hiroki Sato AuthorDate: 2023-01-13 09:03:20 +0000 Commit: Hiroki Sato CommitDate: 2023-01-13 09:03:55 +0000 shells/heirloom-sh: Change the installation directory - Use ${PREFIX}/heirloom as the installation directory - Add LICENSE - Use the standard do-install target - Take maintainership --- shells/heirloom-sh/Makefile | 35 +++++++++++++++------- shells/heirloom-sh/files/heirloom-sh.conf.in | 1 + shells/heirloom-sh/files/patch-acct | 12 -------- shells/heirloom-sh/files/patch-defs.h | 11 +++++++ shells/heirloom-sh/files/patch-makefile | 44 ++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 23 deletions(-) diff --git a/shells/heirloom-sh/Makefile b/shells/heirloom-sh/Makefile index 388ccf920532..3073c049d198 100644 --- a/shells/heirloom-sh/Makefile +++ b/shells/heirloom-sh/Makefile @@ -1,31 +1,44 @@ PORTNAME= heirloom-sh PORTVERSION= 050706 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells MASTER_SITES= SF/heirloom/${PORTNAME}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Portable version of OpenSolaris' Bourne Shell WWW= http://heirloom.sourceforge.net/sh.html -BROKEN_aarch64= Fails to link: missing sbrk -BROKEN_riscv64= Fails to link: missing sbrk +LICENSE= CDDL -USES= tar:bzip2 +BROKEN_aarch64= fails to link: missing sbrk +BROKEN_riscv64= fails to link: missing sbrk -CONFLICTS_INSTALL= clusterit schilyutils # bin/jsh +USES= tar:bzip2 MAKEFILE= makefile -PLIST_FILES= "@shell bin/jsh" \ - man/man1/jsh.1.gz +MANPREFIX= ${PREFIX}/heirloom/share +MAKE_ARGS= ROOT=${STAGEDIR} \ + SV3BIN=${PREFIX}/heirloom/bin \ + MANDIR=${MANPREFIX}/man \ + UCBINST=${INSTALL} +SUB_FILES= ${PORTNAME}.conf +PLIST_FILES= "@shell heirloom/bin/sh" \ + "@shell heirloom/bin/jsh" \ + etc/man.d/${PORTNAME}.conf \ + heirloom/share/man/man1/sh.1.gz \ + heirloom/share/man/man1/jsh.1.gz PORTDOCS= CALDERA.LICENSE OPENSOLARIS.LICENSE CHANGES README OPTIONS_DEFINE= DOCS -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/jsh ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sh.1.out ${STAGEDIR}${MANPREFIX}/man/man1/jsh.1 +pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} + +post-install: + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/man.d + +post-install-DOCS-on: cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/shells/heirloom-sh/files/heirloom-sh.conf.in b/shells/heirloom-sh/files/heirloom-sh.conf.in new file mode 100644 index 000000000000..620e3e11dfb5 --- /dev/null +++ b/shells/heirloom-sh/files/heirloom-sh.conf.in @@ -0,0 +1 @@ +MANPATH %%PREFIX%%/heirloom/share/man diff --git a/shells/heirloom-sh/files/patch-acct b/shells/heirloom-sh/files/patch-acct deleted file mode 100644 index 68caa7ebd7c7..000000000000 --- a/shells/heirloom-sh/files/patch-acct +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru heirloom-sh-050706/defs.h heirloom-sh-050706.new/defs.h ---- defs.h 2005-07-03 21:25:46.000000000 +0200 -+++ defs.h 2008-03-27 22:30:33.000000000 +0100 -@@ -148,7 +148,7 @@ - #define ENDARGS 0 - - /* enable shell accounting */ --#define ACCT -+/* #define ACCT */ - - #include - #include "mac.h" diff --git a/shells/heirloom-sh/files/patch-defs.h b/shells/heirloom-sh/files/patch-defs.h new file mode 100644 index 000000000000..4069e548da27 --- /dev/null +++ b/shells/heirloom-sh/files/patch-defs.h @@ -0,0 +1,11 @@ +--- defs.h.orig 2005-07-03 19:25:46 UTC ++++ defs.h +@@ -148,7 +148,7 @@ extern "C" { + #define ENDARGS 0 + + /* enable shell accounting */ +-#define ACCT ++/* #define ACCT */ + + #include + #include "mac.h" diff --git a/shells/heirloom-sh/files/patch-makefile b/shells/heirloom-sh/files/patch-makefile new file mode 100644 index 000000000000..4518baf8175b --- /dev/null +++ b/shells/heirloom-sh/files/patch-makefile @@ -0,0 +1,44 @@ +--- makefile.orig 2005-07-06 10:59:57 UTC ++++ makefile +@@ -44,12 +44,12 @@ LNS=ln -s + # + # Compiler flags. + # +-CFLAGS=-O ++#CFLAGS=-O + + # + # Flags for the C preprocessor. + # +-CFLAGS=-D_GNU_SOURCE ++CFLAGS+=-D_GNU_SOURCE + + # + # A define for large file support, if necessary. +@@ -59,12 +59,12 @@ LARGEF=-D_FILE_OFFSET_BITS=64L + # + # The compiler warning options. + # +-WERROR=-Werror ++#WERROR=-Werror + WARN = -Wchar-subscripts -Wformat -Wno-format-y2k -Wimplicit \ + -Wmissing-braces -Wsequence-point -Wreturn-type -Wtrigraphs \ + -Wunused-function -Wunused-label -Wunused-variable -Wunused-value \ + -Wuninitialized -Wmultichar -Wpointer-arith $(WERROR) +-WARN= ++#WARN= + + # + # End of adjustable settings. +@@ -99,8 +99,9 @@ install: all + cd $(ROOT)$(SV3BIN) && $(LNS) sh jsh + test -d $(ROOT)$(MANDIR)/man1 || mkdir -p $(ROOT)$(MANDIR)/man1 + $(UCBINST) -c -m 644 sh.1.out $(ROOT)$(MANDIR)/man1/sh.1 +- rm -f $(ROOT)$(MANDIR)/man1/jsh.1 +- cd $(ROOT)$(MANDIR)/man1 && $(LNS) sh.1 jsh.1 ++ gzip $(ROOT)$(MANDIR)/man1/sh.1 ++ rm -f $(ROOT)$(MANDIR)/man1/jsh.1.gz ++ cd $(ROOT)$(MANDIR)/man1 && $(LNS) sh.1.gz jsh.1.gz + + maninstall: sh.1.out + $(UCBINST) -c -m 644 sh.1.out $(ROOT)$(MANDIR)/man1/sh.1