From d654368c52e006c45b0249618d09f309ca4320f6 Mon Sep 17 00:00:00 2001 From: op Date: Mon, 7 Nov 2022 15:37:20 +0000 Subject: [PATCH] update plan9/sam to the latest commit in the deadpixi fork This brings in ssam(1) (streaming sam; unfortunately without a manpage), fixes the dot after the `<' command (finally!) and some small tweaks to the manpage. While here also add "editors" to CATEGORY and tweak a bit the post-install hook. ok abieber@ --- plan9/sam/Makefile | 23 +++++++++-------------- plan9/sam/distinfo | 4 ++-- plan9/sam/pkg/PLIST | 1 + 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile index 5b5f36b5d53..cdc255c71d4 100644 --- a/plan9/sam/Makefile +++ b/plan9/sam/Makefile @@ -1,12 +1,11 @@ COMMENT= X11 version of Rob Pike's editor, sam -DISTNAME= sam-4.3.20190427 +DISTNAME= sam-4.3.20200714 GH_ACCOUNT= deadpixi GH_PROJECT= sam -GH_COMMIT= 5893679bbbab2f50ceb6ef0805e4bb63f5f51df8 -REVISION= 0 +GH_COMMIT= 5d8acb35d78c327d76f00a54857cbd566ed9bc11 -CATEGORIES= plan9 +CATEGORIES= plan9 editors PERMIT_PACKAGE= Yes WANTLIB= X11 Xft Xi Xt c @@ -15,16 +14,12 @@ RUN_DEPENDS+= devel/desktop-file-utils NO_TEST= Yes -SAMDOCDIR= ${PREFIX}/share/doc/sam -SAMDOCFILES= README.rst doc/sam.ps doc/sam.tut.ms doc/se.ps -EXAMPLEDIR= ${PREFIX}/share/examples/sam - post-install: - ${INSTALL_DATA_DIR} ${SAMDOCDIR} - ${INSTALL_DATA_DIR} ${EXAMPLEDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/samrc ${EXAMPLEDIR} - @set -e; for f in ${SAMDOCFILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${f} ${SAMDOCDIR}; \ - done + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sam + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sam + ${INSTALL_DATA} ${WRKSRC}/doc/samrc ${PREFIX}/share/examples/sam +.for f in README.rst doc/sam.ps doc/sam.tut.ms doc/se.ps + ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/sam +.endfor .include diff --git a/plan9/sam/distinfo b/plan9/sam/distinfo index 2cf79b36cfe..138edf15264 100644 --- a/plan9/sam/distinfo +++ b/plan9/sam/distinfo @@ -1,2 +1,2 @@ -SHA256 (sam-4.3.20190427-5893679b.tar.gz) = 17k1wL+Rv5Z43t79sLyj0Vn9UYzSVfpVxOYZNiAfB0E= -SIZE (sam-4.3.20190427-5893679b.tar.gz) = 311827 +SHA256 (sam-4.3.20200714-5d8acb35.tar.gz) = hlWbfWSzWijxfBUOvrhO4HZp3mtO1ct4Bfj6zVRyRlo= +SIZE (sam-4.3.20200714-5d8acb35.tar.gz) = 312453 diff --git a/plan9/sam/pkg/PLIST b/plan9/sam/pkg/PLIST index eb56d09396c..1001757d521 100644 --- a/plan9/sam/pkg/PLIST +++ b/plan9/sam/pkg/PLIST @@ -1,6 +1,7 @@ @bin bin/B @bin bin/sam @bin bin/samterm +bin/ssam @man man/man1/sam.1 @man man/man5/samrc.5 share/applications/deadpixi-sam.desktop