diff --git a/lang/nll/Makefile b/lang/nll/Makefile
index 543580a850f9..53c78c46148e 100644
--- a/lang/nll/Makefile
+++ b/lang/nll/Makefile
@@ -1,106 +1,104 @@
 PORTNAME=	nll
-PORTVERSION=	20250413a
+PORTVERSION=	20250805a
 CATEGORIES=	lang
 MASTER_SITES=	https://kozos.jp/nlux/archive/
-DISTNAME=	nlux-alpha-20250413
+DISTNAME=	nlux-alpha-${PORTVERSION:C|[a-zA-Z]*$||}
 
 MAINTAINER=	kozos@kozos.jp
 COMMENT=	Simple language for programming learning
 WWW=		https://kozos.jp/nll/
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-FLAVORS=		default nosdl sdl1
+FLAVORS=		sdl2 nosdl sdl1
 FLAVOR?=		${FLAVORS:[1]}
 nosdl_PKGNAMESUFFIX=	-nosdl
 sdl1_PKGNAMESUFFIX=	-sdl1
 
 USES=		zip
 MAKE_ARGS=	ARCH= \
 		BUILD= \
 		CCOMPILER=${CC}
+
+.if ${FLAVOR} == sdl2
+COMMENT+=	(SDL 2)
+USES+=		sdl xorg
+USE_SDL=	sdl2
+USE_XORG=	x11
+MAKE_ARGS+=	SDLDIR=${LOCALBASE} \
+		USE_SDL1= \
+		USE_SDL2=yes
+.elif ${FLAVOR} == nosdl
+COMMENT+=	(limited graphic and audio function)
+MAKE_ARGS+=	USE_SDL1= \
+		USE_SDL2=
+.elif ${FLAVOR} == sdl1
+COMMENT+=	(SDL 1.2)
+USES+=		sdl xorg
+USE_SDL=	sdl
+USE_XORG=	x11
+MAKE_ARGS+=	SDLDIR=${LOCALBASE} \
+		USE_SDL1=yes \
+		USE_SDL2=
+.endif
+
 WRKSRC=		${WRKDIR}/nlux/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
 PORTDOCS=	AUDIO.txt README.txt
 PORTEXAMPLES=	*.nll
 
 OPTIONS_DEFINE=		DOCS EXAMPLES NCURSES NETWORK SYSCALL SYSTEM
 OPTIONS_DEFAULT?=	LIBEDIT NCURSES SYSTEM
 
 OPTIONS_RADIO=		LINEEDIT
 OPTIONS_RADIO_LINEEDIT=	FGETS GETLINE LIBEDIT NLLINE READLINE
 
 FGETS_DESC=	Use fgets()
 GETLINE_DESC=	Use getline
 LINEEDIT_DESC=	Line editor
 NETWORK_DESC=	Network support
 NLLINE_DESC=	Internal readline compatible library
 SYSCALL_DESC=	System call function support
 SYSTEM_DESC=	System function support
 
 FGETS_MAKE_ARGS=	READLINE=fgets
 GETLINE_MAKE_ARGS=	READLINE=getline
 LIBEDIT_USES=		libedit
 LIBEDIT_MAKE_ARGS=	READLINE=libedit \
 			READLINEDIR=${LOCALBASE}
 NCURSES_USES=		ncurses
 NCURSES_MAKE_ARGS=	USE_CURSES=yes
 NCURSES_MAKE_ARGS_OFF=	USE_CURSES=
 NETWORK_MAKE_ARGS=	USE_NETWORK_FUNCTION=yes
 NETWORK_MAKE_ARGS_OFF=	USE_NETWORK_FUNCTION=
 NLLINE_MAKE_ARGS=	READLINE=nlline
 READLINE_USES=		readline
 READLINE_MAKE_ARGS=	READLINE=readline \
 			READLINEDIR=${LOCALBASE}
 SYSCALL_MAKE_ARGS=	USE_SYSCALL_FUNCTION=yes
 SYSCALL_MAKE_ARGS_OFF=	USE_SYSCALL_FUNCTION=
 SYSTEM_MAKE_ARGS=	USE_SYSTEM_FUNCTION=yes
 SYSTEM_MAKE_ARGS_OFF=	USE_SYSTEM_FUNCTION=
 
-.if ${FLAVOR} == default
-USE_SDL=	sdl2
-USE_XORG=	x11
-USES+=		sdl xorg
-MAKE_ARGS+=	SDLDIR=${LOCALBASE} \
-		USE_SDL1= \
-		USE_SDL2=yes
-.endif
-
-.if ${FLAVOR} == nosdl
-COMMENT+=	(limited graphic and audio function)
-MAKE_ARGS+=	USE_SDL1= \
-		USE_SDL2=
-.endif
-
-.if ${FLAVOR} == sdl1
-COMMENT+=	(SDL 1.2)
-USE_SDL=	sdl
-USE_XORG=	x11
-USES+=		sdl xorg
-MAKE_ARGS+=	SDLDIR=${LOCALBASE} \
-		USE_SDL1=yes \
-		USE_SDL2=
-.endif
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/nlux/bin/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/nlux/man/man1/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S/^/${WRKSRC}\//} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S/^/${WRKSRC}\/samples\//} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S/^/${WRKSRC}\/samples\/graphic\//} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S/^/${WRKSRC}\/samples\/audio\//} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PORTEXAMPLES:S/^/${WRKSRC}\/samples\/network\//} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/nll/distinfo b/lang/nll/distinfo
index b2c5dbc55f8d..5065d58d5175 100644
--- a/lang/nll/distinfo
+++ b/lang/nll/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744518726
-SHA256 (nlux-alpha-20250413.zip) = 97d35a4f481b513c84042ab77d0b727be46f64f11cff59756551149942bb1906
-SIZE (nlux-alpha-20250413.zip) = 1239801
+TIMESTAMP = 1754387485
+SHA256 (nlux-alpha-20250805.zip) = 0eba132f6ce0106d8ddfb0da662aeb67f6d594e86fb66986a11e013c244f7d26
+SIZE (nlux-alpha-20250805.zip) = 1261758