CVS commit: pkgsrc/www/cgit

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue May 12 18:29:24 UTC 2026

Modified Files:
        pkgsrc/www/cgit: Makefile PLIST

Log Message:
cgit: install man page

While here, simplify package.

Bump PKGREVISION.

Fixes PR 60252.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/cgit/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/cgit/PLIST

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

Modified files:

Index: pkgsrc/www/cgit/Makefile
diff -u pkgsrc/www/cgit/Makefile:1.14 pkgsrc/www/cgit/Makefile:1.15
--- pkgsrc/www/cgit/Makefile:1.14       Tue Feb 24 21:06:53 2026
+++ pkgsrc/www/cgit/Makefile    Tue May 12 18:29:24 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2026/02/24 21:06:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2026/05/12 18:29:24 wiz Exp $
 
 DISTNAME=      cgit-1.3
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://git.zx2c4.com/cgit/snapshot/
 EXTRACT_SUFX=  .tar.xz
@@ -15,42 +16,48 @@ HOMEPAGE=   https://git.zx2c4.com/cgit/
 COMMENT=       Fast web interface for git
 LICENSE=       gnu-gpl-v2
 
-USE_TOOLS+=            gmake perl:test
+TOOL_DEPENDS+=         asciidoc-[0-9]*:../../textproc/asciidoc
+
+USE_TOOLS+=            bash:run gmake perl:test
 USE_FEATURES+=         memrchr
 MAKE_FLAGS+=           GIT_VER=${GIT_VER}
 MAKE_FLAGS+=           PERL_PATH=${PERL5}
+MAKE_FLAGS+=           CGIT_SCRIPT_PATH=${CGIT_CGIBIN}
+MAKE_FLAGS+=           CGIT_DATA_PATH=${CGIT_HTDOCS}
+MAKE_FLAGS+=           filterdir=${CGIT_FILTERS}
+MAKE_FLAGS+=           mandir=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=           PYTHON_PATH=${PYTHONBIN}
 BUILD_MAKE_FLAGS+=     CGIT_CONFIG=${PKG_SYSCONFDIR}/cgitrc
 
 MAKE_ENV+=             CGIT_LIBS=${LIBNBCOMPAT_LIBNAME}
 MAKE_ENV.SunOS+=       NEEDS_LIBICONV=YesPlease
 
+BUILD_TARGET=  all doc-man
+INSTALL_TARGET=        install install-man
 TEST_TARGET=   test
 
 CGIT_CONFIG=   ${PKG_SYSCONFDIR}/cgitrc
 CGIT_CGIBIN=   ${PREFIX}/libexec/cgi-bin
 CGIT_FILTERS=  ${PREFIX}/libexec/cgit/filters
 CGIT_HTDOCS=   ${PREFIX}/share/httpd/htdocs/cgit
-CGIT_EGDIR=    ${PREFIX}/share/examples
+CGIT_EGDIR=    ${PREFIX}/share/examples/cgit
 
 CONF_FILES=            ${CGIT_EGDIR}/cgitrc ${CGIT_CONFIG}
-INSTALLATION_DIRS=     libexec/cgi-bin \
-                       libexec/cgit/filters \
-                       share/httpd/htdocs/cgit \
-                       share/examples
+INSTALLATION_DIRS+=    share/examples/cgit
+
+REPLACE_BASH+=         filters/html-converters/rst2html
+REPLACE_PYTHON+=       filters/email-gravatar.py
+REPLACE_PYTHON+=       filters/syntax-highlighting.py
+REPLACE_PYTHON+=       filters/html-converters/md2html
+
 post-extract:
        rm -r ${WRKSRC}/git && mv ${WRKDIR}/git-${GIT_VER} ${WRKSRC}/git
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/cgit ${DESTDIR}${CGIT_CGIBIN}/cgit.cgi
-       ${INSTALL_DATA} ${WRKSRC}/cgit.png ${DESTDIR}${CGIT_HTDOCS}
-       ${INSTALL_DATA} ${WRKSRC}/cgit.js ${DESTDIR}${CGIT_HTDOCS}
-       ${INSTALL_DATA} ${WRKSRC}/cgit.css ${DESTDIR}${CGIT_HTDOCS}
+post-install:
        ${INSTALL_DATA} ${WRKSRC}/cgitrc ${DESTDIR}${CGIT_EGDIR}
-       ${INSTALL_SCRIPT} ${WRKSRC}/filters/commit-links.sh \
-               ${DESTDIR}${CGIT_FILTERS}
-       ${INSTALL_SCRIPT} ${WRKSRC}/filters/syntax-highlighting.sh \
-               ${DESTDIR}${CGIT_FILTERS}
 
+.include "../../lang/python/tool.mk"
+.include "../../lang/python/application.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/www/cgit/PLIST
diff -u pkgsrc/www/cgit/PLIST:1.2 pkgsrc/www/cgit/PLIST:1.3
--- pkgsrc/www/cgit/PLIST:1.2   Tue Feb 24 21:06:53 2026
+++ pkgsrc/www/cgit/PLIST       Tue May 12 18:29:24 2026
@@ -1,8 +1,24 @@
-@comment $NetBSD: PLIST,v 1.2 2026/02/24 21:06:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/05/12 18:29:24 wiz Exp $
 libexec/cgi-bin/cgit.cgi
+libexec/cgit/filters/about-formatting.sh
 libexec/cgit/filters/commit-links.sh
+libexec/cgit/filters/email-gravatar.lua
+libexec/cgit/filters/email-gravatar.py
+libexec/cgit/filters/email-libravatar.lua
+libexec/cgit/filters/file-authentication.lua
+libexec/cgit/filters/gentoo-ldap-authentication.lua
+libexec/cgit/filters/html-converters/man2html
+libexec/cgit/filters/html-converters/md2html
+libexec/cgit/filters/html-converters/rst2html
+libexec/cgit/filters/html-converters/txt2html
+libexec/cgit/filters/owner-example.lua
+libexec/cgit/filters/simple-authentication.lua
+libexec/cgit/filters/syntax-highlighting.py
 libexec/cgit/filters/syntax-highlighting.sh
-share/examples/cgitrc
+man/man5/cgitrc.5
+share/examples/cgit/cgitrc
 share/httpd/htdocs/cgit/cgit.css
 share/httpd/htdocs/cgit/cgit.js
 share/httpd/htdocs/cgit/cgit.png
+share/httpd/htdocs/cgit/favicon.ico
+share/httpd/htdocs/cgit/robots.txt