Re: update plan9/sam to latest commit
Omar Polo writes:
> woops, forgot to fill the subject. inlining the diff again.
>
> On 2022/11/06 23:11:36 +0100, Omar Polo wrote:
>> Hello,
>>
>> This updates sam to the latest commit. The changelog is just:
>>
>> - set dot correctly after applying the < command
>> - add ssam (streaming sam); no man page :(
>> - clean up the manpage
>>
>> Works fine here. I've only briefily played with ssam, but as it just
>> run sam on a temp file I assume it's fine.
>>
>> While here also adds it to the editors category and tweak a bit the
>> post-install target.
>>
>> ok?
OK abieber@
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/plan9/sam/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- Makefile 11 Mar 2022 19:49:08 - 1.34
> +++ Makefile 6 Nov 2022 22:01:47 -
> @@ -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
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/plan9/sam/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 12 Nov 2019 02:45:32 - 1.5
> +++ distinfo 6 Nov 2022 19:27:08 -
> @@ -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
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/plan9/sam/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 11 Mar 2022 19:49:08 - 1.7
> +++ pkg/PLIST 6 Nov 2022 19:40:00 -
> @@ -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
update plan9/sam to latest commit
woops, forgot to fill the subject. inlining the diff again.
On 2022/11/06 23:11:36 +0100, Omar Polo wrote:
> Hello,
>
> This updates sam to the latest commit. The changelog is just:
>
> - set dot correctly after applying the < command
> - add ssam (streaming sam); no man page :(
> - clean up the manpage
>
> Works fine here. I've only briefily played with ssam, but as it just
> run sam on a temp file I assume it's fine.
>
> While here also adds it to the editors category and tweak a bit the
> post-install target.
>
> ok?
Index: Makefile
===
RCS file: /home/cvs/ports/plan9/sam/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile11 Mar 2022 19:49:08 - 1.34
+++ Makefile6 Nov 2022 22:01:47 -
@@ -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
Index: distinfo
===
RCS file: /home/cvs/ports/plan9/sam/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo12 Nov 2019 02:45:32 - 1.5
+++ distinfo6 Nov 2022 19:27:08 -
@@ -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
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/plan9/sam/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 11 Mar 2022 19:49:08 - 1.7
+++ pkg/PLIST 6 Nov 2022 19:40:00 -
@@ -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
