Date: Sun, 7 Jul 2024 06:17:50 GMT From: Zsolt Udvari <uzsolt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e005593992bb - main - lang/nll: update to 20240703a Message-ID: <202407070617.4676HoEt097426@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e005593992bbe078777522f0e053b5dbc651aa6a commit e005593992bbe078777522f0e053b5dbc651aa6a Author: SAKAI Hiroaki <kozos@kozos.jp> AuthorDate: 2024-07-07 06:15:48 +0000 Commit: Zsolt Udvari <uzsolt@FreeBSD.org> CommitDate: 2024-07-07 06:15:48 +0000 lang/nll: update to 20240703a Convert flavor-specific options to flavor: in the default flavor should choose SDL version (1 or 2). Now SDL versions are flavors. Pet portlint, portclippy, portfmt. PR: 280123 Approved by: submitter is maintainer --- lang/nll/Makefile | 106 +++++++++++++++++++++++++++--------------------------- lang/nll/distinfo | 6 ++-- 2 files changed, 55 insertions(+), 57 deletions(-) diff --git a/lang/nll/Makefile b/lang/nll/Makefile index 08c7eea64cae..9396929c8a34 100644 --- a/lang/nll/Makefile +++ b/lang/nll/Makefile @@ -1,9 +1,8 @@ PORTNAME= nll -PORTVERSION= 20231210a -PORTREVISION= 1 +PORTVERSION= 20240703a CATEGORIES= lang MASTER_SITES= https://kozos.jp/nlux/archive/ -DISTNAME= nlux-alpha-20231210 +DISTNAME= nlux-alpha-20240703 MAINTAINER= kozos@kozos.jp COMMENT= Simple language for programming learning @@ -12,80 +11,79 @@ WWW= https://kozos.jp/nll/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE -FLAVORS= default nosdl -FLAVOR?= ${FLAVORS:[1]} +FLAVORS= default nosdl sdl1 +FLAVOR?= ${FLAVORS:[1]} nosdl_PKGNAMESUFFIX= -nosdl +sdl1_PKGNAMESUFFIX= -sdl1 USES= zip +MAKE_ARGS= ARCH= \ + BUILD= \ + CCOMPILER=${CC} WRKSRC= ${WRKDIR}/nlux/${PORTNAME} -MAKE_ARGS= BUILD= ARCH= CCOMPILER=${CC} -PORTDOCS= README.txt AUDIO.txt -PORTEXAMPLES= *.nll +PLIST_FILES= bin/${PORTNAME} \ + share/man/man1/${PORTNAME}.1.gz -PLIST_FILES= bin/${PORTNAME} share/man/man1/${PORTNAME}.1.gz +PORTDOCS= AUDIO.txt README.txt +PORTEXAMPLES= *.nll -OPTIONS_DEFINE= DOCS EXAMPLES NCURSES SYSTEM SYSCALL NETWORK -OPTIONS_DEFAULT?= NCURSES SYSTEM LIBEDIT SDL2 +OPTIONS_DEFINE= DOCS EXAMPLES NCURSES NETWORK SYSCALL SYSTEM +OPTIONS_DEFAULT?= LIBEDIT NCURSES SYSTEM -OPTIONS_RADIO= LINEEDIT -OPTIONS_RADIO_LINEEDIT= LIBEDIT READLINE NLLINE GETLINE FGETS +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 -GETLINE_DESC= Use getline -FGETS_DESC= Use fgets() - -NCURSES_USES= ncurses - -SYSTEM_DESC= System function support SYSCALL_DESC= System call function support -NETWORK_DESC= Network support - -LIBEDIT_USES= libedit -READLINE_USES= readline +SYSTEM_DESC= System function support -NCURSES_MAKE_ARGS= +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= - -SYSTEM_MAKE_ARGS= USE_SYSTEM_FUNCTION=yes -SYSTEM_MAKE_ARGS_OFF= USE_SYSTEM_FUNCTION= -SYSCALL_MAKE_ARGS= USE_SYSCALL_FUNCTION=yes -SYSCALL_MAKE_ARGS_OFF= USE_SYSCALL_FUNCTION= NETWORK_MAKE_ARGS= USE_NETWORK_FUNCTION=yes NETWORK_MAKE_ARGS_OFF= USE_NETWORK_FUNCTION= - -LIBEDIT_MAKE_ARGS= READLINE=libedit READLINEDIR=${LOCALBASE} -READLINE_MAKE_ARGS= READLINE=readline READLINEDIR=${LOCALBASE} NLLINE_MAKE_ARGS= READLINE=nlline -GETLINE_MAKE_ARGS= READLINE=getline -FGETS_MAKE_ARGS= READLINE=fgets +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 -OPTIONS_RADIO+= SDLVER -OPTIONS_RADIO_SDLVER= NOSDL SDL1 SDL2 - -SDLVER_DESC= SDL version -NOSDL_DESC= Disable SDL (limited graphic and audio function) -SDL1_DESC= Use SDL 1.2 -SDL2_DESC= Use SDL 2.0 - -SDL1_USES= sdl xorg -SDL1_USE= XORG=x11 SDL=sdl -SDL2_USES= sdl xorg -SDL2_USE= XORG=x11 SDL=sdl2 - -NOSDL_MAKE_ARGS= USE_SDL1= USE_SDL2= -NOSDL_MAKE_ARGS_OFF= -SDL1_MAKE_ARGS= USE_SDL1=yes SDLDIR=${LOCALBASE} -SDL1_MAKE_ARGS_OFF= USE_SDL1= -SDL2_MAKE_ARGS= USE_SDL2=yes SDLDIR=${LOCALBASE} -SDL2_MAKE_ARGS_OFF= USE_SDL2= +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= +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: diff --git a/lang/nll/distinfo b/lang/nll/distinfo index 408952cbdb18..9a328403613c 100644 --- a/lang/nll/distinfo +++ b/lang/nll/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702249293 -SHA256 (nlux-alpha-20231210.zip) = 703b8a35e76e8cf63258dc7885b96fa843bf966848072525fb8bac4eddd636a8 -SIZE (nlux-alpha-20231210.zip) = 1068343 +TIMESTAMP = 1720006264 +SHA256 (nlux-alpha-20240703.zip) = d882751ce7906a38bba9b9c9d6c405b11e9d70e8ddab6eacb4d66939d15bb383 +SIZE (nlux-alpha-20240703.zip) = 1138581
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407070617.4676HoEt097426>