CVS commit: pkgsrc/net/tut

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Tue Jan  3 00:11:35 UTC 2023

Modified Files:
        pkgsrc/net/tut: Makefile PLIST

Log Message:
net/toot: do not install unneeded template file.

In addition:
* Some cosmetic Makefile changes (NFC).
* Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/tut/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/tut/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/tut/Makefile
diff -u pkgsrc/net/tut/Makefile:1.8 pkgsrc/net/tut/Makefile:1.9
--- pkgsrc/net/tut/Makefile:1.8 Fri Dec 30 03:26:29 2022
+++ pkgsrc/net/tut/Makefile     Tue Jan  3 00:11:35 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2022/12/30 03:26:29 sjmulder Exp $
+# $NetBSD: Makefile,v 1.9 2023/01/03 00:11:35 vins Exp $
 
 DISTNAME=      tut-1.0.31
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=RasmusLindroth/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -10,8 +11,10 @@ HOMEPAGE=    https://tut.anv.nu/
 COMMENT=       TUI for Mastodon with shellout
 LICENSE=       mit
 
-EGDIR=         ${PREFIX}/share/examples/tut
-DOCDIR=                ${PREFIX}/share/doc/tut
+EGS=   config.example.ini config/toot.tmpl config/user.tmpl
+EGDIR= share/examples/${PKGBASE}
+DOCDIR=        share/doc/${PKGBASE}
+
 
 INSTALLATION_DIRS+=    ${EGDIR} ${EGDIR}/themes ${DOCDIR}
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
@@ -19,13 +22,13 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man5
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man7
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${DOCDIR}
-.for i in config.example.ini config/*.tmpl
-       ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${EGDIR}
-.endfor
-.for t in themes/*
-       ${INSTALL_DATA} ${WRKSRC}/config/${t}                   \
-               ${DESTDIR}${EGDIR}/themes
+       ${INSTALL_DATA} ${WRKSRC}/README.md                     \
+               ${DESTDIR}${PREFIX}/${DOCDIR}
+       ${INSTALL_DATA} ${EGS:S|^|${WRKSRC}/|}                  \
+               ${DESTDIR}${PREFIX}/${EGDIR}
+.for t in *.ini
+       ${INSTALL_DATA} ${WRKSRC}/config/themes/${t}            \
+               ${DESTDIR}${PREFIX}/${EGDIR}/themes
 .endfor
        ${INSTALL_DATA} ${WRKSRC}/docs/man/tut.1                \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/

Index: pkgsrc/net/tut/PLIST
diff -u pkgsrc/net/tut/PLIST:1.4 pkgsrc/net/tut/PLIST:1.5
--- pkgsrc/net/tut/PLIST:1.4    Fri Dec 30 03:26:29 2022
+++ pkgsrc/net/tut/PLIST        Tue Jan  3 00:11:35 2023
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2022/12/30 03:26:29 sjmulder Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/01/03 00:11:35 vins Exp $
 bin/tut
 man/man1/tut.1
 man/man5/tut.5
 man/man7/tut.7
 share/doc/tut/README.md
 share/examples/tut/config.example.ini
-share/examples/tut/help.tmpl
 share/examples/tut/themes/default.ini
 share/examples/tut/themes/nord.ini
 share/examples/tut/themes/papercolor-light.ini