From a649f0aae00f624c3c0d8f018e86acc33688d1fb Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Thu, 7 Jul 2022 19:13:30 +0000 Subject: databases/lua-lsqlite3: unbreak the build against non-amalgamated SQLite - Change the :target in SQLite dependency to `build' so that files which are copied during `pre-configure' stage would be generated; - Don't explicitly list supported Lua versions in the COMMENT and define options after other declarative knobs and before targets; - Switch to the new upstream distfile (version remained the same) as the previous one is no longer fetchable. Looking at the changes, they span the period from 2018-07-01 to 2021-09-07 and look legit. Also, the test suite had been amended; it would be hooked in another commit. PR: 259991 --- databases/lua-lsqlite3/Makefile | 12 +++++------- databases/lua-lsqlite3/distinfo | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/databases/lua-lsqlite3/Makefile b/databases/lua-lsqlite3/Makefile index 76e38b1558eb..74562a65a1a2 100644 --- a/databases/lua-lsqlite3/Makefile +++ b/databases/lua-lsqlite3/Makefile @@ -6,21 +6,17 @@ PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://Lua.SQLite.org/index.cgi/zip/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME}_fsl_9y +DISTNAME= ${PORTNAME}_fsl09y MAINTAINER= yds@Necessitu.de -COMMENT= Lua 5.1 to 5.3 wrapper for SQLite3 library +COMMENT= Lua wrapper for SQLite3 library LICENSE= MIT -BROKEN= does not build: cp: /wrkdirs/usr/ports/databases/sqlite3/work/sqlite-src-3350500/sqlite3.[ch]: No such file or directory - -BUILD_DEPENDS= ${NONEXISTENT}:databases/sqlite3:patch +BUILD_DEPENDS= ${NONEXISTENT}:databases/sqlite3:build USES= localbase:ldflags sqlite:3 zip lua:module -OPTIONS_DEFINE= DOCS EXAMPLES - CFLAGS+= -pedantic -Wall -Qunused-arguments -fPIC -DPIC\ -std=c99 -fno-strict-aliasing -I${LUA_INCDIR}\ -DLSQLITE_VERSION=\"${PORTVERSION}\" @@ -29,6 +25,8 @@ LDFLAGS+= -shared -pthread -lm -L${LOCALBASE}/lib DOCSDIR= ${LUA_DOCSDIR} EXAMPLESDIR= ${LUA_EXAMPLESDIR} +OPTIONS_DEFINE= DOCS EXAMPLES + pre-configure: @${CP} -p `${SETENV} -u FLAVOR ${MAKE} -V WRKSRC -C ${PORTSDIR}/databases/sqlite3`/sqlite3.[ch] ${WRKSRC} diff --git a/databases/lua-lsqlite3/distinfo b/databases/lua-lsqlite3/distinfo index 67976470547a..694d839ffc22 100644 --- a/databases/lua-lsqlite3/distinfo +++ b/databases/lua-lsqlite3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553623319 -SHA256 (lsqlite3_fsl_9y.zip) = ad81bf0d081b8200932c851e19b2a0a6319bc7b6e3401deeb9c29e5d041e6540 -SIZE (lsqlite3_fsl_9y.zip) = 2123295 +TIMESTAMP = 1631022697 +SHA256 (lsqlite3_fsl09y.zip) = 4c1415c6169ceedfef55888db5bd081dadc154a868c07ad2a06e75825be21d94 +SIZE (lsqlite3_fsl09y.zip) = 2124170 -- cgit v1.2.3