Stuart Henderson <s...@spacehopper.org> wrote:
> On 2021/06/08 13:52, Lucas wrote:
> > Bump.
> >
> > I also bumped REVISION for subpackages, thing I forgot originally. I
> > don't understand why I get package names like luadbi--lua52 instead
> > of the more common lua52dbi--, so cluebats are welcome.
>
> It's because of the MULTI_PACKAGES, you'll need to set the various
> FULLPKGNAME-subpkg to the correct names yourself.
Thanks for the tip. Updated patch below, with some extra tabs to align
stuff prettily. There is also a WANTLIB change for -mysql spotted by
`make port-lib-depends-check`.
-Lucas
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/databases/luadbi/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 12 Jul 2019 20:43:53 -0000 1.14
+++ Makefile 8 Jun 2021 23:44:37 -0000
@@ -4,14 +4,22 @@ COMMENT-main= database interface library
COMMENT-mysql= MySQL driver for luadbi
COMMENT-pgsql= PostgreSQL driver for luadbi
-GH_ACCOUNT= mwild1
-GH_PROJECT= luadbi
-V= 0.6
-GH_TAGNAME= v${V}
-PKGNAME-main= ${GH_PROJECT}-${V}
-PKGNAME-mysql= ${GH_PROJECT}-mysql-$V
-PKGNAME-pgsql= ${GH_PROJECT}-pgsql-$V
-REVISION-main = 0
+GH_ACCOUNT= mwild1
+GH_PROJECT= luadbi
+V= 0.6
+GH_TAGNAME= v${V}
+PKGNAME-main= ${GH_PROJECT}-${V}
+PKGNAME-mysql= ${GH_PROJECT}-mysql-$V
+PKGNAME-pgsql= ${GH_PROJECT}-pgsql-$V
+FULLPKGNAME-main= ${PKGNAME-main:S/^lua/${_MODLUA_PKG_PREFIX}/}
+FULLPKGPATH-main= databases/luadbi,${MODLUA_FLAVOR},-main
+FULLPKGNAME-mysql= ${PKGNAME-mysql:S/^lua/${_MODLUA_PKG_PREFIX}/}
+FULLPKGPATH-mysql= databases/luadbi,${MODLUA_FLAVOR},-mysql
+FULLPKGNAME-pgsql= ${PKGNAME-pgsql:S/^lua/${_MODLUA_PKG_PREFIX}/}
+FULLPKGPATH-pgsql= databases/luadbi,${MODLUA_FLAVOR},-pgsql
+REVISION-main= 1
+REVISION-mysql= 0
+REVISION-pgsql= 0
CATEGORIES= databases
@@ -24,7 +32,7 @@ WANTLIB-main= sqlite3
LIB_DEPENDS-main= databases/sqlite3
RUN_DEPENDS-main= #empty
-WANTLIB-mysql= mysqlclient
+WANTLIB-mysql= mariadb
LIB_DEPENDS-mysql= databases/mariadb
RUN_DEPENDS-mysql= ${BASE_PKGPATH},-main
@@ -34,6 +42,9 @@ LIB_DEPENDS-pgsql= databases/postgresql
RUN_DEPENDS-pgsql= ${BASE_PKGPATH},-main
MODULES= lang/lua
+
+FLAVORS= lua52 lua53
+FLAVOR?=
USE_GMAKE= Yes
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/databases/luadbi/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 15 May 2018 11:08:12 -0000 1.3
+++ pkg/PLIST-main 8 Jun 2021 23:42:22 -0000
@@ -2,7 +2,7 @@
lib/lua/
lib/lua/${MODLUA_VERSION}/
lib/lua/${MODLUA_VERSION}/dbd/
-lib/lua/${MODLUA_VERSION}/dbd/sqlite3.so
+@so lib/lua/${MODLUA_VERSION}/dbd/sqlite3.so
share/lua/
share/lua/${MODLUA_VERSION}/
share/lua/${MODLUA_VERSION}/DBI.lua
Index: pkg/PLIST-mysql
===================================================================
RCS file: /home/cvs/ports/databases/luadbi/pkg/PLIST-mysql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mysql
--- pkg/PLIST-mysql 14 Jan 2018 15:36:40 -0000 1.2
+++ pkg/PLIST-mysql 8 Jun 2021 23:42:22 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-mysql,v 1.2 2018/01/14 15:36:40 landry Exp $
-lib/lua/${MODLUA_VERSION}/dbd/mysql.so
+@so lib/lua/${MODLUA_VERSION}/dbd/mysql.so
Index: pkg/PLIST-pgsql
===================================================================
RCS file: /home/cvs/ports/databases/luadbi/pkg/PLIST-pgsql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pgsql
--- pkg/PLIST-pgsql 14 Jan 2018 15:36:40 -0000 1.2
+++ pkg/PLIST-pgsql 8 Jun 2021 23:42:22 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-pgsql,v 1.2 2018/01/14 15:36:40 landry Exp $
-lib/lua/${MODLUA_VERSION}/dbd/postgresql.so
+@so lib/lua/${MODLUA_VERSION}/dbd/postgresql.so
