diff --git a/devel/sjasmplus/Makefile b/devel/sjasmplus/Makefile index b9e0ccdaf5cd..c8bcbcdcc4eb 100644 --- a/devel/sjasmplus/Makefile +++ b/devel/sjasmplus/Makefile @@ -1,69 +1,69 @@ PORTNAME= sjasmplus -DISTVERSION= 1.20.2 +DISTVERSION= 1.20.3 CATEGORIES= devel MASTER_SITES= https://github.com/z00m128/sjasmplus/releases/download/v${DISTVERSION}/ EXTRACT_SUFX= .tar.xz DISTFILES= ${PORTNAME}-${DISTVERSION}-src${EXTRACT_SUFX} MAINTAINER= otis@FreeBSD.org COMMENT= Command-line cross-compiler of assembly language for Z80 CPU WWW= https://github.com/z00m128/sjasmplus LICENSE= BSD3CLAUSE USES= compiler:c++14-lang gmake tar:xz WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_DEFAULT= BUNDLED_LUA OPTIONS_SINGLE= SJLUA OPTIONS_SINGLE_SJLUA= BUNDLED_LUA LUA NOLUA OPTIONS_SUB= yes BUNDLED_LUA_DESC= Use bundled LUA 5.4 NOLUA_DESC= Do not use LUA SJLUA_DESC= Which LUA version to use BUNDLED_LUA_MAKE_ARGS= USE_BUNDLED_LUA=1 \ USE_LUA=1 DOCS_BUILD_DEPENDS= docbook-xsl-ns>0:textproc/docbook-xsl-ns \ xsltproc:textproc/libxslt LUA_USES= lua:54 LUA_MAKE_ARGS= INCDIR_LUA=${LUA_INCDIR} \ LUA_VER=${LUA_VER} \ USE_BUNDLED_LUA=0 \ USE_LUA=1 LUA_LDFLAGS= -L${LUA_LIBDIR} NOLUA_MAKE_ARGS= USE_BUNDLED_LUA=0 \ USE_LUA=0 .include .if !${PORT_OPTIONS:MNOLUA} USE_GITHUB= nodefault GH_TUPLE= vinniefalco:LuaBridge:6580b187:sjasmplus/LuaBridge .endif post-patch-DOCS-on: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/docs/docbook-xsl-ns-html-customization-freebsd.xsl post-build-DOCS-on: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} docs) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sjasmplus ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/documentation.html ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sjasmplus .include diff --git a/devel/sjasmplus/distinfo b/devel/sjasmplus/distinfo index 7c353931e229..50213b706dee 100644 --- a/devel/sjasmplus/distinfo +++ b/devel/sjasmplus/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1676719682 -SHA256 (sjasmplus-1.20.2-src.tar.xz) = 34421abd754639a5add999ef194dbd215aed92ac445eea7981ee46438021870f -SIZE (sjasmplus-1.20.2-src.tar.xz) = 2272400 +TIMESTAMP = 1687947879 +SHA256 (sjasmplus-1.20.3-src.tar.xz) = 343839b79bc8bc79f97ac0b3ac05ea9c17799aa561af46f3ac7a1da863b1b286 +SIZE (sjasmplus-1.20.3-src.tar.xz) = 1210584 SHA256 (vinniefalco-LuaBridge-6580b187_GH0.tar.gz) = e48ab46ff42c53e60ff0baddb995b5f8f0cdb8f295eca6999960d68eec107cff SIZE (vinniefalco-LuaBridge-6580b187_GH0.tar.gz) = 1197086 diff --git a/devel/sjasmplus/files/patch-Makefile b/devel/sjasmplus/files/patch-Makefile index 977e9d3a83c8..f8a073464b5c 100644 --- a/devel/sjasmplus/files/patch-Makefile +++ b/devel/sjasmplus/files/patch-Makefile @@ -1,53 +1,20 @@ ---- Makefile.orig 2023-02-16 20:39:21 UTC +--- Makefile.orig 2023-06-27 23:25:44 UTC +++ Makefile -@@ -54,7 +54,8 @@ MEMCHECK?=valgrind --leak-check=yes - EXE_BASE_NAME=sjasmplus +@@ -67,7 +67,7 @@ LUA_VER?=5.4 BUILD_DIR=build --LUA_VER=5.4 -+LUA_VER?=5.4 -+LUA_LIBNAME=lua-$(LUA_VER) + LUA_VER?=5.4 +-LUA_LIBNAME?=lua$(LUA_VER) ++LUA_LIBNAME?=lua-$(LUA_VER) SUBDIR_BASE=sjasm SUBDIR_LUA=lua$(LUA_VER) -@@ -63,15 +64,16 @@ SUBDIR_CRC32C=crc32c - SUBDIR_DOCS=docs - SUBDIR_COV=coverage - --INCDIR_LUA=/usr/include/lua$(LUA_VER) -+INCDIR_LUA?=/usr/include/lua$(LUA_VER) - - ifeq ($(USE_LUA), 1) --_LUA_CPPFLAGS=-I$(SUBDIR_LUA) --endif -- - ifeq ($(USE_BUNDLED_LUA), 0) - _LUA_CPPFLAGS=-I$(INCDIR_LUA) -+LDFLAGS+=-l$(LUA_LIBNAME) -+else -+_LUA_CPPFLAGS=-I$(SUBDIR_LUA) - endif -+endif - - # TODO too many lua5.4 warnings: -pedantic removed - CPPFLAGS+=-Wall -DMAX_PATH=PATH_MAX -I$(SUBDIR_CRC32C) -@@ -85,10 +87,6 @@ ifeq ($(USE_LUA), 1) - LDFLAGS+=-ldl - endif - --ifeq ($(USE_BUNDLED_LUA), 0) --LDFLAGS+=-llua$(LUA_VER) --endif -- - ifdef DEBUG - BUILD_DIR:=$(BUILD_DIR)/debug - CFLAGS+=-g -O0 -@@ -258,7 +256,7 @@ $(SUBDIR_DOCS)/documentation.html: Makefile $(wildcard +@@ -259,7 +259,7 @@ $(SUBDIR_DOCS)/documentation.html: Makefile $(wildcard --stringparam html.stylesheet docbook.css \ --stringparam generate.toc "book toc" \ -o $(SUBDIR_DOCS)/documentation.html \ - $(SUBDIR_DOCS)/docbook-xsl-ns-html-customization-linux.xsl \ + $(SUBDIR_DOCS)/docbook-xsl-ns-html-customization-freebsd.xsl \ $(SUBDIR_DOCS)/documentation.xml clean: