pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/cgit
Module Name: pkgsrc
Committed By: wiz
Date: Tue Feb 24 21:06:53 UTC 2026
Modified Files:
pkgsrc/www/cgit: Makefile PLIST distinfo
pkgsrc/www/cgit/patches: patch-git-Makefile
Added Files:
pkgsrc/www/cgit/patches: patch-git_ci_run-test-slice.sh
Log Message:
cgit: update to 1.3.
As the first release in 6 years, there's a lot in here: bug fixes of
every which variety, git modernizations (v2.53), css updates, and even
javascript for the first time, for the new dynamic aging feature.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/cgit/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/cgit/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/cgit/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/cgit/patches/patch-git-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/cgit/patches/patch-git_ci_run-test-slice.sh
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.13 pkgsrc/www/cgit/Makefile:1.14
--- pkgsrc/www/cgit/Makefile:1.13 Sat Apr 20 13:45:27 2024
+++ pkgsrc/www/cgit/Makefile Tue Feb 24 21:06:53 2026
@@ -1,31 +1,31 @@
-# $NetBSD: Makefile,v 1.13 2024/04/20 13:45:27 nia Exp $
+# $NetBSD: Makefile,v 1.14 2026/02/24 21:06:53 wiz Exp $
-DISTNAME= cgit-1.2.3
-PKGREVISION= 1
+DISTNAME= cgit-1.3
CATEGORIES= www
MASTER_SITES= https://git.zx2c4.com/cgit/snapshot/
EXTRACT_SUFX= .tar.xz
-# cgit builds its own libgit using a known-good version
-# check release notes or README when updating the package
-GIT_VER= 2.25.1
+# cgit builds its own libgit using a known-good version; check
+# release notes or Makefile (GIT_VER) when updating the package
+GIT_VER= 2.53.0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} git-${GIT_VER}${EXTRACT_SUFX}
-SITES.git-${GIT_VER}${EXTRACT_SUFX}= http://hjemli.net/git/git/snapshot/
+#SITES.git-${GIT_VER}${EXTRACT_SUFX}= https://www.kernel.org/pub/software/scm/git/
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://git.zx2c4.com/cgit/
COMMENT= Fast web interface for git
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
LICENSE= gnu-gpl-v2
-MAKE_JOBS_SAFE= no
-
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:test
USE_FEATURES+= memrchr
MAKE_FLAGS+= GIT_VER=${GIT_VER}
+MAKE_FLAGS+= PERL_PATH=${PERL5}
BUILD_MAKE_FLAGS+= CGIT_CONFIG=${PKG_SYSCONFDIR}/cgitrc
MAKE_ENV+= CGIT_LIBS=${LIBNBCOMPAT_LIBNAME}
MAKE_ENV.SunOS+= NEEDS_LIBICONV=YesPlease
+TEST_TARGET= test
+
CGIT_CONFIG= ${PKG_SYSCONFDIR}/cgitrc
CGIT_CGIBIN= ${PREFIX}/libexec/cgi-bin
CGIT_FILTERS= ${PREFIX}/libexec/cgit/filters
@@ -42,13 +42,14 @@ post-extract:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/cgit ${DESTDIR}${CGIT_CGIBIN}/cgit.cgi
- ${INSTALL_DATA} ${WRKSRC}/cgit.png ${DESTDIR}${CGIT_HTDOCS}/cgit.png
- ${INSTALL_DATA} ${WRKSRC}/cgit.css ${DESTDIR}${CGIT_HTDOCS}/cgit.css
- ${INSTALL_DATA} ${WRKSRC}/cgitrc ${DESTDIR}${CGIT_EGDIR}/cgitrc
+ ${INSTALL_DATA} ${WRKSRC}/cgit.png ${DESTDIR}${CGIT_HTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/cgit.js ${DESTDIR}${CGIT_HTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/cgit.css ${DESTDIR}${CGIT_HTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/cgitrc ${DESTDIR}${CGIT_EGDIR}
${INSTALL_SCRIPT} ${WRKSRC}/filters/commit-links.sh \
- ${DESTDIR}${CGIT_FILTERS}/commit-links.sh
+ ${DESTDIR}${CGIT_FILTERS}
${INSTALL_SCRIPT} ${WRKSRC}/filters/syntax-highlighting.sh \
- ${DESTDIR}${CGIT_FILTERS}/syntax-highlighting.sh
+ ${DESTDIR}${CGIT_FILTERS}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
Index: pkgsrc/www/cgit/PLIST
diff -u pkgsrc/www/cgit/PLIST:1.1 pkgsrc/www/cgit/PLIST:1.2
--- pkgsrc/www/cgit/PLIST:1.1 Mon Dec 1 12:32:26 2014
+++ pkgsrc/www/cgit/PLIST Tue Feb 24 21:06:53 2026
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2014/12/01 12:32:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/02/24 21:06:53 wiz Exp $
libexec/cgi-bin/cgit.cgi
libexec/cgit/filters/commit-links.sh
libexec/cgit/filters/syntax-highlighting.sh
share/examples/cgitrc
share/httpd/htdocs/cgit/cgit.css
+share/httpd/htdocs/cgit/cgit.js
share/httpd/htdocs/cgit/cgit.png
Index: pkgsrc/www/cgit/distinfo
diff -u pkgsrc/www/cgit/distinfo:1.8 pkgsrc/www/cgit/distinfo:1.9
--- pkgsrc/www/cgit/distinfo:1.8 Tue Oct 26 11:29:23 2021
+++ pkgsrc/www/cgit/distinfo Tue Feb 24 21:06:53 2026
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:29:23 nia Exp $
+$NetBSD: distinfo,v 1.9 2026/02/24 21:06:53 wiz Exp $
-BLAKE2s (cgit-1.2.3.tar.xz) = 5bc0975ec4bbd3ada24bc9f74a73a698710bd7533803de1c5349a62ab153dc82
-SHA512 (cgit-1.2.3.tar.xz) = 58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
-Size (cgit-1.2.3.tar.xz) = 90632 bytes
-BLAKE2s (git-2.25.1.tar.xz) = 07256d016b328cdbf17fa533d165306c80f551207b0cde399a7cf36eb20b5048
-SHA512 (git-2.25.1.tar.xz) = 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
-Size (git-2.25.1.tar.xz) = 5875548 bytes
+BLAKE2s (cgit-1.3.tar.xz) = 5135eca7d59787ac49423089b323b5d1ab17d5cd34ce0fc66f5877a8f2efeedf
+SHA512 (cgit-1.3.tar.xz) = 28b7e1867809cafed6190e1984b059a7aaac3a92d8eb38bc925a58fd344347b86662309be44b6ce6625312cb127540aadd7a22b7561e96c8440144ea5eade02e
+Size (cgit-1.3.tar.xz) = 92248 bytes
+BLAKE2s (git-2.53.0.tar.xz) = 2d85a0c30ebaf0b0f613b30e3dd206e27ea22f6ae4908e22a7afe7d268b49261
+SHA512 (git-2.53.0.tar.xz) = f9c0c0f527e10fe3eb524e368b1a24088bfd41097d8cac7854dae7ff21ab8ab2a1716384be53ea6174023ca5a2af3eeddca1d9feb57e447713f82e061df55c8d
+Size (git-2.53.0.tar.xz) = 7993096 bytes
SHA1 (patch-cgitrc) = a363a2b22f237c507cab7d164e91389d02734372
-SHA1 (patch-git-Makefile) = bcac9c1a08d542a37557ff4bcc6dab7c19ea13c3
+SHA1 (patch-git-Makefile) = d70e1778a0f3d6b72268e300357190b25fe5a023
+SHA1 (patch-git_ci_run-test-slice.sh) = 760e6ed63ff3a52e98a721ddf605da87de598cfc
Index: pkgsrc/www/cgit/patches/patch-git-Makefile
diff -u pkgsrc/www/cgit/patches/patch-git-Makefile:1.3 pkgsrc/www/cgit/patches/patch-git-Makefile:1.4
--- pkgsrc/www/cgit/patches/patch-git-Makefile:1.3 Tue Mar 31 13:59:33 2020
+++ pkgsrc/www/cgit/patches/patch-git-Makefile Tue Feb 24 21:06:53 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-git-Makefile,v 1.3 2020/03/31 13:59:33 roy Exp $
+$NetBSD: patch-git-Makefile,v 1.4 2026/02/24 21:06:53 wiz Exp $
Don't put HOME into binaries.
---- git/Makefile.orig 2020-02-17 04:47:35.000000000 +0000
-+++ git/Makefile 2020-03-31 13:41:57.076648624 +0000
-@@ -522,7 +522,7 @@
+--- git/Makefile.orig 2026-02-02 02:26:11.000000000 +0000
++++ git/Makefile
+@@ -627,7 +627,7 @@ include shared.mak
# perllibdir
# This can help installing the suite in a relocatable way.
@@ -13,10 +13,10 @@ Don't put HOME into binaries.
bindir = $(prefix)/bin
mandir = $(prefix)/share/man
infodir = $(prefix)/share/info
-@@ -1174,8 +1174,8 @@
- # Set CFLAGS, LDFLAGS and other *FLAGS variables. These might be
+@@ -963,8 +963,8 @@ endif
# tweaked by config.* below as well as the command-line, both of
# which'll override these defaults.
+ # Older versions of GCC may require adding "-std=gnu99" at the end.
-CFLAGS = -g -O2 -Wall
-LDFLAGS =
+# CFLAGS = -g -O2 -Wall
Added files:
Index: pkgsrc/www/cgit/patches/patch-git_ci_run-test-slice.sh
diff -u /dev/null pkgsrc/www/cgit/patches/patch-git_ci_run-test-slice.sh:1.1
--- /dev/null Tue Feb 24 21:06:53 2026
+++ pkgsrc/www/cgit/patches/patch-git_ci_run-test-slice.sh Tue Feb 24 21:06:53 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-git_ci_run-test-slice.sh,v 1.1 2026/02/24 21:06:53 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- git/ci/run-test-slice.sh.orig 2026-02-24 20:57:43.652492603 +0000
++++ git/ci/run-test-slice.sh
+@@ -11,7 +11,7 @@ handle_failed_tests
+ handle_failed_tests
+
+ # We only have one unit test at the moment, so run it in the first slice
+-if [ "$1" == "0" ] ; then
++if [ "$1" = "0" ] ; then
+ group "Run unit tests" make --quiet -C t unit-tests-test-tool
+ fi
+
Home |
Main Index |
Thread Index |
Old Index