diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile index 52027faa5c83..b9e69c542c3d 100644 --- a/www/forgejo/Makefile +++ b/www/forgejo/Makefile @@ -1,83 +1,83 @@ PORTNAME= forgejo DISTVERSIONPREFIX= v -DISTVERSION= 1.21.10-0 -PORTREVISION= 2 +DISTVERSION= 7.0.2 CATEGORIES= www MASTER_SITES= https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= forgejo-src-${DISTVERSION} MAINTAINER= stb@lassitu.de COMMENT= Compact self-hosted Git service WWW= https://forgejo.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git -USES= cpe gmake go:1.21,no_targets +USES= cpe gmake go:1.22,no_targets USE_RC_SUBR= forgejo EXTRACT_AFTER_ARGS= --strip-components 1 -SUB_FILES+= app.ini.sample -SUB_LIST+= GITUSER=${USERS} +SUB_FILES= app.ini.sample pkg-message +SUB_LIST= GITUSER=${USERS} NO_WRKSUBDIR= yes USERS= git GROUPS= git PORTDATA= * OPTIONS_DEFINE= BINDATA GIT_LFS PAM SQLITE OPTIONS_DEFAULT= BINDATA GIT_LFS PAM SQLITE OPTIONS_SUB= yes BINDATA_DESC= Build a single monolithic binary, with all assets included GIT_LFS_DESC= Support for Git Large File Storage (LFS) PAM_DESC= Enable support for PAM BINDATA_VARS= GO_TAGS+=bindata GIT_LFS_RUN_DEPENDS= git-lfs:devel/git-lfs PAM_VARS= GO_TAGS+=pam SQLITE_VARS= GO_TAGS+="sqlite sqlite_unlock_notify" .include .if ${OPSYS} == FreeBSD DAEMONARGS= -S -l \$${forgejo_facility} -s \$${forgejo_priority} -T \ \$${name} .else DAEMONARGS= -f .endif SUB_LIST+= DAEMONARGS="${DAEMONARGS}" SSP_UNSAFE= true -# Default LDFLAGS are incompatible with build -MAKE_ENV= LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" +LDFLAGS+= "'-X "code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'" +LDFLAGS+= "'-X "code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'" MAKE_ARGS= GOPATH=${WRKDIR} \ - TAGS="${GO_TAGS}" + TAGS="${GO_TAGS}" \ + GOFLAGS="-buildvcs=false" ALL_TARGET= backend MAKE_JOBS_UNSAFE= yes post-patch: ${ECHO_CMD} ${DISTVERSION} >${WRKSRC}/VERSION # Too lazy to figure out why go install won't work. do-install: # Go binary is statically linked and cannot be stripped, so use # INSTALL_SCRIPT. ${INSTALL_SCRIPT} ${WRKSRC}/gitea \ ${STAGEDIR}${PREFIX}/sbin/forgejo @${MKDIR} ${STAGEDIR}${ETCDIR}/conf ${INSTALL_DATA} ${WRKDIR}/app.ini.sample \ ${STAGEDIR}${ETCDIR}/conf/app.ini.sample ${INSTALL_DATA} ${WRKSRC}/custom/conf/app.example.ini \ ${STAGEDIR}${ETCDIR}/conf/app.ini.defaults do-install-BINDATA-off: cd ${WRKSRC} && \ ${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR} .include diff --git a/www/forgejo/distinfo b/www/forgejo/distinfo index 35e0c2d393a7..74fb0a430f7e 100644 --- a/www/forgejo/distinfo +++ b/www/forgejo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712360403 -SHA256 (forgejo-src-1.21.10-0.tar.gz) = 0cc21835404e40355cf7125b479efebb1fecf2cc17d018d4d54521d75943caf5 -SIZE (forgejo-src-1.21.10-0.tar.gz) = 58820868 +TIMESTAMP = 1715265831 +SHA256 (forgejo-src-7.0.2.tar.gz) = 39b2079be7671f2248dcc36377ae20be65f20695d7f968ae227c0fc55dacca06 +SIZE (forgejo-src-7.0.2.tar.gz) = 54862292 diff --git a/www/forgejo/files/forgejo.in b/www/forgejo/files/forgejo.in index ad5aee48f95d..c635f3a9a9b1 100644 --- a/www/forgejo/files/forgejo.in +++ b/www/forgejo/files/forgejo.in @@ -1,51 +1,65 @@ #!/bin/sh # PROVIDE: forgejo # REQUIRE: NETWORKING SYSLOG # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable forgejo: # #forgejo_enable="YES" . /etc/rc.subr name="forgejo" rcvar="forgejo_enable" load_rc_config $name : ${forgejo_user:="%%GITUSER%%"} : ${forgejo_enable:="NO"} +: ${forgejo_configcheck_enable:="YES"} : ${forgejo_facility:="daemon"} -: ${forgejo_priority:="debug"} +: ${forgejo_priority:="info"} : ${forgejo_shared:="%%PREFIX%%/share/${name}"} : ${forgejo_custom:="%%PREFIX%%/etc/${name}"} command="%%PREFIX%%/sbin/${name} web" procname="%%PREFIX%%/sbin/${name}" githome="$(eval echo ~${forgejo_user})" pidfile="/var/run/${name}.pid" start_cmd="${name}_start" +start_precmd="${name}_prestart" forgejo_start() { for d in /var/db/forgejo /var/log/forgejo; do if [ ! -e "$d" ]; then mkdir "$d" chown ${forgejo_user} "$d" fi done /usr/sbin/daemon %%DAEMONARGS%% \ -u ${forgejo_user} -p ${pidfile} \ /usr/bin/env -i \ "GITEA_WORK_DIR=${forgejo_shared}" \ "GITEA_CUSTOM=${forgejo_custom}" \ "HOME=${githome}" \ "PATH=%%PREFIX%%/bin:${PATH}" \ "USER=${forgejo_user}" \ $command } +forgejo_prestart() { + if checkyesno forgejo_configcheck_enable; then + if su -m ${forgejo_user} -c "%%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 + fi + fi +} + run_rc_command "$1" diff --git a/www/forgejo/files/pkg-message.in b/www/forgejo/files/pkg-message.in new file mode 100644 index 000000000000..03164efe7264 --- /dev/null +++ b/www/forgejo/files/pkg-message.in @@ -0,0 +1,27 @@ +[ +{ type: install + message: <