diff --git a/devel/schilybase/Makefile b/devel/schilybase/Makefile
index ee663706bdc0..ac6139f5da4b 100644
--- a/devel/schilybase/Makefile
+++ b/devel/schilybase/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	schilybase
+PORTREVISION=	1
 CATEGORIES=	devel
 
 COMMENT=	Support files and libraries for the schilytools
 
 NLS_USES=	gettext-tools
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS MANPAGES NLS PROFILE
 OPTIONS_DEFAULT=DOCS NLS
 OPTIONS_SUB=	yes
 
 # do not reorder: order required for build to succeed
 BOOTSTRAP_SMAKE?=	yes
 COMPONENTS=	conf \
 		inc \
 		include \
 		include/schily \
 		libschily \
 		libdeflt \
 		libscg \
 		libscg/scg \
 		libxtermcap \
 		libcdrdeflt \
 		libdbgmalloc \
 		libedc \
 		libfile \
 		libfind \
 		libgetopt \
 		libhfs_iso \
 		libmdigest \
 		libparanoia \
 		librmt \
 		librscg \
 		libscgcmd \
 		libshedit \
 		libsiconv \
 		libsiconv/tables \
 		man \
 		man/man5
 
 post-patch-PROFILE-off:
 	@${ECHO_MSG} '=> Patching Makefiles to disable profiled libraries'
 	@${REINPLACE_CMD} -e '/^MK_FILES/s, [a-z]*_p.mk,,' ${WRKSRC}/*/Makefile
 
 post-build-NLS-on:
 	msgfmt --no-convert -o ${WRKDIR}/SCHILY_utils.mo ${WRKSRC}/SCHILY_utils.po
 
 # all languages supported by FreeBSD
 _LANGUAGES=	C af am ar be bg ca cs da de el en es et eu fi fr ga he hi hr \
 		hu hy is it ja kk ko lt lv mn nb nl nn pl pt ro ru se sk sl sr \
 		sv tr uk zh
 
 post-install:
 	# this is just a copy of the FreeBSD termcap file, no need to ship it again.
 	${RM} ${STAGEDIR}${PREFIX}/etc/termcap
 	# this one goes to archivers/star
 	${RM} ${STAGEDIR}${PREFIX}/include/schily/strar.h
 
 post-install-NLS-on:
 	@${ECHO_MSG} '=> installing dummy message catalogues'
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES
 	${INSTALL_DATA} ${WRKDIR}/SCHILY_utils.mo ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/SCHILY_utils.mo
 .for lang in ${_LANGUAGES:Nde}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
 	${LN} ${STAGEDIR}${PREFIX}/share/locale/de/LC_MESSAGES/SCHILY_utils.mo \
 	    ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/SCHILY_utils.mo
 .endfor
 
 .include "Makefile.master"
diff --git a/devel/schilybase/Makefile.master b/devel/schilybase/Makefile.master
index 10661785923f..1cd448983915 100644
--- a/devel/schilybase/Makefile.master
+++ b/devel/schilybase/Makefile.master
@@ -1,97 +1,97 @@
 DISTVERSION=	2024-03-21
 MASTER_SITES=	http://fuz.su/pub/schilytools/ \
 		https://schilytools.pkgsrc.pub/pub/schilytools/ \
 		https://mirrors.dotsrc.org/schilytools/ \
 		https://ftp.halifax.rwth-aachen.de/schilytools/ \
 		https://ftp.gwdg.de/pub/misc/schilytools/
 DISTNAME=	schily-${DISTVERSION}
 
 MAINTAINER=	fuz@FreeBSD.org
 WWW?=		https://codeberg.org/schilytools/schilytools
 
 LICENSE=	CDDL ${COMPONENTS:@c@${LICENSE.${c}}@:O:u}
 LICENSE.autoconf=	GPLv2
 LICENSE.libhfs_iso=	GPLv2
 LICENSE.man2html=	GPLv2
 LICENSE.mkisofs=	GPLv2
 LICENSE.libparanoia=	LGPL21
 LICENSE.cpp=		BSD3CLAUSE
 LICENSE.ctags=		BSD3CLAUSE
 LICENSE.libmdigest=	BSD2CLAUSE
 LICENSE.libfile=	BSD2CLAUSE
 LICENSE.patch=		BSD1CLAUSE
 LICENSE.lndir=		MIT
 LICENSE_COMB=		${${LICENSE:[#]}>1:?multi:single}
 LICENSE_FILE_CDDL=	${WRKSRC}/CDDL.Schily.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/GPL-2.0.txt
 LICENSE_FILE_LGPL21=	${WRKSRC}/LGPL-2.1.txt
 LICENSE_FILE_BSD1CLAUSE=	${WRKSRC}/patch/LICENSE
 LICENSE_NAME_BSD1CLAUSE=	BSD 1-clause LICENSE
 LICENSE_PERMS_BSD1CLAUSE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # schilybase has all the libraries
 .if ${PORTNAME} != "schilybase"
 LIB_DEPENDS+=	libschily.so:devel/schilybase
 .endif
 
 .if "${BOOTSTRAP_SMAKE}" != "yes"
 BUILD_DEPENDS+=	smake:devel/smake
 .endif
 
 USES+=		tar:bz2 compiler gettext-runtime iconv
 
 MAKE_ARGS=	INS_BASE=${PREFIX} \
 		INS_RBASE=${PREFIX} \
 		LINKMODE=dynamic \
 		DESTDIR=${STAGEDIR} \
 		STRIPFLAGS=${STRIP} \
 		CCOM=${COMPILER_TYPE} \
 		CC=${CC} \
 		CCC=${CXX} \
 		COPTX="${CFLAGS}" \
 		C++OPTX="${CXXFLAGS}" \
 		NOECHO=
 MAKE_CMD=	${"${BOOTSTRAP_SMAKE}" == "yes":?${WRKSRC}/psmake/smake:smake}
 
 PLIST_SUB+=	OPSYS=${OPSYS:tl} ARCH=${ARCH} COMPILER_TYPE=${COMPILER_TYPE}
 PLIST=		${.CURDIR}/pkg-plist
 PKGHELP?=	${.CURDIR}/pkg-help
 PKGMESSAGE?=	${.CURDIR}/pkg-message
 DESCR=		${.CURDIR}/pkg-descr
 
 TESTCOMPONENTS?=	${COMPONENTS}
 
 post-extract:
 	@cd ${WRKSRC}/rmt && ${MV} rmt.dfl srmt.dfl
 	@cd ${WRKSRC}/rmt && ${MV} default-rmt.sample default-srmt.sample
 
 do-configure:
 .if "${BOOTSTRAP_SMAKE}" == "yes"
 	@${ECHO_MSG} "=> building a bootstrap smake"
-	cd ${WRKSRC}/psmake && ${SETENV} ${MAKE_ENV} ${SH} ./MAKE-all
+	cd ${WRKSRC}/psmake && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${SH} ./MAKE-all
 .endif
 	@${ECHO_MSG} "=> configuring components"
 .for component in ${COMPONENTS}
-	cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config
+	cd ${WRKSRC}/${component} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config
 .endfor
 
 do-build:
 .for component in ${COMPONENTS}
-	cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
+	cd ${WRKSRC}/${component} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
 .endfor
 
 do-install:
 .for component in ${COMPONENTS}
-	cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
+	cd ${WRKSRC}/${component} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
 .endfor
 .if "${COMPONENTS:Mlib}" != ""
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.* 
 .endif
 
 # the test suite gets moody if we set INS_BASE/INS_RBASE/DESTDIR
 do-test:
 .for component in ${TESTCOMPONENTS}
-	cd ${WRKSRC}/${component} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS:NINS_*BASE=*:NDESTDIR=*} tests
+	cd ${WRKSRC}/${component} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS:NINS_*BASE=*:NDESTDIR=*} tests
 .endfor
 
 .include <bsd.port.mk>