From nobody Sun Jul 07 06:17:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WGxrG2d5rz5QQSQ; Sun, 07 Jul 2024 06:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WGxrG24x0z42Yy; Sun, 7 Jul 2024 06:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720333070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6CbapP+y0DnO8HwpNt/z4ymt7kgJ1BOPiy6DhPE/nis=; b=CVSYwk7d/YxF6mwr/IpSAhEGFEHeIKPFmz9oE+QcIeV2Xn07iLW+H9QHG6SwYGdbSobPPM bFmtVY2BCmLt2rAwDTFnyGotDv/VR/1w8R2rU3zo93ajl1NeS2DQSpNk8HFKdFgmKIQ+Hq 0o6FvgR+0YvXjHTyxy6vodikGiDXmKBH8Zce2tuEx7KwBDLh3bG9RiFCi4CrRd/6CbgJEx 9A5o2iLhTAvpE/gZXfDkIxy8Yc3xTMi4tdp7oES8SP6NyoSPN4To1Qj8fjcK1m3dF2qwDH 9I7sVpM5y8M1uBlpn2Wh/wt5oym2YbU4l/9cfSRQ94ijyhdijCuT77tUyD3jPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720333070; a=rsa-sha256; cv=none; b=lVVBe4QUAsO2QXVbRrf0AG80ldvYCPjj0RQM/Usz043x6G6zAEGFbClN1IQN/DqSbCkuRg rbZ7K6Bwx1DITOeLYDBwcmBq4bmW3sVWdw1F3nf5D2pOOYIPgopGLLpWga0bjxjhNSC3gv 7P7/nx9+1CRxh6OMiPyW/++HHNrng/inePMCr56ijJD8mrRWhkEfLchIpm14ZPdr6z+0Bm qC6zIf0/tWOC7NfymcDkJEYdqrJvW8wj2p0hb/STtwOy+gW1wd6cEo4IsHAovLxkAv2qtC BC2mKGMftThSupkoeyzimNymdi8Kax9u7QY08i6SUlnRXag6M7UivzOL1utN/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720333070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6CbapP+y0DnO8HwpNt/z4ymt7kgJ1BOPiy6DhPE/nis=; b=SgEP1R5PgtxNvvq8xukU1IUgyFshmuf1Z9tQtMzcEsQgMSlrBaHPQC19deJSVjAS/6KBwf IRjty3F5nKTZfwJJWRUKQYmBd5zpo04SBHdw59Wh6UlbIgHIjq+5t3Bsg+v7/AmU3FZI/5 eRDj84a4QKAlVBaAk62oGiPwhVwb2OOUVEbEuXaWnzL/z/htsnxltvonFFNQW4FPh/s3nq S0g/2MMObn1uJ//mISD1aJdKkI9vVzMV+zoKemP4hUPevt+lSRFlLotbCNvNOtchrUJMlr s8q/WSmXiKQ7xi2dw2vM6PgsglcYuj3GuWbAqrW325nK5qtetfkeVtZcp+WYGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WGxrG1gH4z19xc; Sun, 7 Jul 2024 06:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4676Ho25097429; Sun, 7 Jul 2024 06:17:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4676HoEt097426; Sun, 7 Jul 2024 06:17:50 GMT (envelope-from git) Date: Sun, 7 Jul 2024 06:17:50 GMT Message-Id: <202407070617.4676HoEt097426@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: e005593992bb - main - lang/nll: update to 20240703a List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e005593992bbe078777522f0e053b5dbc651aa6a Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e005593992bbe078777522f0e053b5dbc651aa6a commit e005593992bbe078777522f0e053b5dbc651aa6a Author: SAKAI Hiroaki AuthorDate: 2024-07-07 06:15:48 +0000 Commit: Zsolt Udvari 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