Page MenuHomeFreeBSD
Files F134732968

D53394.diff
No OneTemporary
Actions

D53394.diff
View Options

diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile
--- a/www/forgejo/Makefile
+++ b/www/forgejo/Makefile
@@ -1,6 +1,6 @@
PORTNAME= forgejo
DISTVERSIONPREFIX= v
-DISTVERSION= 13.0.1
+DISTVERSION= 13.0.2
CATEGORIES= www
MASTER_SITES= https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONFULL}/
DISTNAME= forgejo-src-${DISTVERSION}
@@ -14,12 +14,12 @@
RUN_DEPENDS= git:devel/git
-USES= cpe gmake go:no_targets
+USES= cpe gmake go:1.25,no_targets
USE_RC_SUBR= forgejo
PIE_UNSAFE= yes
-CONFLICTS_INSTALL= forgejo[0-79]*
+CONFLICTS_INSTALL= forgejo-lts forgejo7
EXTRACT_AFTER_ARGS= --strip-components 1
DBDIR= /var/db/forgejo
diff --git a/www/forgejo/distinfo b/www/forgejo/distinfo
--- a/www/forgejo/distinfo
+++ b/www/forgejo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761217700
-SHA256 (forgejo-src-13.0.1.tar.gz) = 98cb495cd07881d90aa32cf143facef4abba2b732684ab1d938af9fa3ab12f26
-SIZE (forgejo-src-13.0.1.tar.gz) = 55449730
+TIMESTAMP = 1761594542
+SHA256 (forgejo-src-13.0.2.tar.gz) = 6731d5e73a025c1a04aba0f84caf80886d5be0031f4c154ac63026e7fe30918a
+SIZE (forgejo-src-13.0.2.tar.gz) = 55481937
diff --git a/www/forgejo/files/forgejo.in b/www/forgejo/files/forgejo.in
--- a/www/forgejo/files/forgejo.in
+++ b/www/forgejo/files/forgejo.in
@@ -20,7 +20,6 @@
: ${forgejo_configcheck_enable:="YES"}
: ${forgejo_facility:="daemon"}
: ${forgejo_priority:="info"}
-: ${forgejo_shared:="%%PREFIX%%/share/${name}"}
: ${forgejo_custom:="%%PREFIX%%/etc/${name}"}
command="%%PREFIX%%/sbin/${name} web"
@@ -42,7 +41,6 @@
/usr/sbin/daemon %%DAEMONARGS%% \
-u ${forgejo_user} -p ${pidfile} \
/usr/bin/env -i \
- "FORGEJO_WORK_DIR=${forgejo_shared}" \
"FORGEJO_CUSTOM=${forgejo_custom}" \
"HOME=${githome}" \
"PATH=%%PREFIX%%/bin:${PATH}" \
@@ -52,13 +50,16 @@
forgejo_prestart() {
if checkyesno forgejo_configcheck_enable; then
- if su -m ${forgejo_user} -c "FORGEJO_CUSTOM=${forgejo_custom} \
- %%PREFIX%%/sbin/${name} doctor check >/dev/null"; then
- else
- echo "cannot start ${name} because of configuration errors. Run" >&2
- echo " su -m git -c '${name} doctor check'" >&2
- echo "for further details"
- return 1
+ if ! errstr=$(/usr/bin/env -i \
+ "FORGEJO_CUSTOM=${forgejo_custom}" \
+ "HOME=${githome}" \
+ "PATH=%%PREFIX%%/bin:${PATH}" \
+ "USER=${forgejo_user}" \
+ /usr/bin/su -m ${forgejo_user} -c \
+ "%%PREFIX%%/sbin/${name} doctor check" 2>&1); then
+ rc=$?
+ echo "$errstr" >&2
+ return $rc
fi
fi
}

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 5, 6:23 AM (3 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24820057
Default Alt Text
D53394.diff (2 KB)

Event Timeline