svn commit: r448847 - in head/databases/luadbi: . files

[Vanilla I. Shu]

Author: vanilla
Date: Mon Aug 28 02:56:49 2017
New Revision: 448847
URL: https://svnweb.freebsd.org/changeset/ports/448847

Log:
  1: Update to 0.6
  2: switch to github.
  
  PR:		221856
  Submitted by:	maintainer

Deleted:
  head/databases/luadbi/files/
Modified:
  head/databases/luadbi/Makefile
  head/databases/luadbi/distinfo
  head/databases/luadbi/pkg-descr

Modified: head/databases/luadbi/Makefile
==============================================================================
--- head/databases/luadbi/Makefile	Sun Aug 27 21:53:01 2017	(r448846)
+++ head/databases/luadbi/Makefile	Mon Aug 28 02:56:49 2017	(r448847)
@@ -2,32 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	luadbi
-PORTVERSION=	0.5
-PORTREVISION=	3
+PORTVERSION=	0.6
+DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
-MASTER_SITES=	http://ic.km.ua/~old/luadbi/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}.f562ccd
 
 MAINTAINER=	olexander.v.melnyk at gmail.com
 COMMENT=	LuaDBI driver
 
 LICENSE=	MIT
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-master
-
-USES=		gmake shebangfix zip
+USES=		gmake shebangfix
 SHEBANG_FILES=	DBI.lua
 
-CFLAGS+=	-fpic -I${LOCALBASE}/include -I${LUA_INCDIR} -I. \
-		-I${LOCALBASE}/include/postgresql/server
-LDFLAGS+=	-shared -L${LOCALBASE}/lib -L${LUA_LIBDIR}
-MAKE_ENV+=	COMMON_LDFLAGS="${LDFLAGS}"
+USE_GITHUB=	yes
+GH_ACCOUNT=	mwild1
+CFLAGS+=	-g -pedantic -Wall -Qunused-arguments -O2 -shared -fPIC -DPIC -std=c99 -I${LOCALBASE}/include
+LDFLAGS+=	-shared
+MAKE_ENV+=	COMMON_CFLAGS=""
+MAKE_ENV+=	COMMON_LDFLAGS=""
+MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+=	LUA_V="${LUA_VER}"
+MAKE_ENV+=	LUA_LDIR="${LUA_MODSHAREDIR}"
+MAKE_ENV+=	LUA_CDIR="${LUA_MODLIBDIR}"
+MAKE_ENV+=	LUA_INC="-I${LUA_INCDIR}"
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_SINGLE=	LUA_VERSION
-OPTIONS_SINGLE_LUA_VERSION=	LUA51 LUA52
+OPTIONS_SINGLE_LUA_VERSION=	LUA51 LUA52 LUA53
 OPTIONS_MULTI=	DATABASE
 OPTIONS_MULTI_DATABASE=	MYSQL SQLITE3 PGSQL
 OPTIONS_DEFAULT=	MYSQL LUA52
@@ -35,35 +39,38 @@ OPTIONS_DEFAULT=	MYSQL LUA52
 PLIST_FILES=	%%LUA_MODSHAREDIR%%/DBI.lua
 
 LUA51_USES=	lua:51
-
 LUA52_USES=	lua:52
+LUA53_USES=	lua:53
 
 MYSQL_USES=		mysql
-MYSQL_LDFLAGS=		-L ${LOCALBASE}/lib/mysql
-MYSQL_CFLAGS=		-I ${LOCALBASE}/include/mysql
 MYSQL_ALL_TARGET=	mysql
-MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbdmysql.so
+MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/mysql.so
+MYSQL_MAKE_ENV+=	MYSQL_LDFLAGS="-L${LOCALBASE}/lib/mysql -lmysqlclient"
+MYSQL_MAKE_ENV+=	MYSQL_INC="-I${LOCALBASE}/include/mysql"
 
 SQLITE3_USES=		sqlite:3
 SQLITE3_ALL_TARGET=	sqlite3
-SQLITE3_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbdsqlite3.so
+SQLITE3_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/sqlite3.so
+SQLITE3_MAKE_ENV+=	SQLITE3_INC=""
 
 PGSQL_USES=		pgsql
 PGSQL_ALL_TARGET=	psql
-PGSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbdpostgresql.so
+PGSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/postgresql.so
+PGSQL_MAKE_ENV+=	PSQL_INC="-I${LOCALBASE}/include/postgresql/server"
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
+	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}/dbd
 	@${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}
 	${CP} ${WRKSRC}/DBI.lua ${STAGEDIR}${LUA_MODSHAREDIR}
 
 do-install-MYSQL-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/dbdmysql.so ${STAGEDIR}${LUA_MODLIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/dbd/mysql.so ${STAGEDIR}${LUA_MODLIBDIR}/dbd
 
 do-install-SQLITE3-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/dbdsqlite3.so ${STAGEDIR}${LUA_MODLIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/dbd/sqlite3.so ${STAGEDIR}${LUA_MODLIBDIR}/dbd
 
 do-install-PGSQL-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/dbdpostgresql.so ${STAGEDIR}${LUA_MODLIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/dbd/postgresql.so ${STAGEDIR}${LUA_MODLIBDIR}/dbd
 
 .include <bsd.port.mk>

Modified: head/databases/luadbi/distinfo
==============================================================================
--- head/databases/luadbi/distinfo	Sun Aug 27 21:53:01 2017	(r448846)
+++ head/databases/luadbi/distinfo	Mon Aug 28 02:56:49 2017	(r448847)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475418951
-SHA256 (luadbi-0.5.f562ccd.zip) = 28b5146bb89956f1a26af5fb9074c8e3cf449917bda9c8863d345edb88685dc8
-SIZE (luadbi-0.5.f562ccd.zip) = 51252
+TIMESTAMP = 1503887847
+SHA256 (mwild1-luadbi-v0.6_GH0.tar.gz) = 43289a55d945e00cd190df515f609482af46ed5928a24cce66ea6925f4b7d255
+SIZE (mwild1-luadbi-v0.6_GH0.tar.gz) = 28621

Modified: head/databases/luadbi/pkg-descr
==============================================================================
--- head/databases/luadbi/pkg-descr	Sun Aug 27 21:53:01 2017	(r448846)
+++ head/databases/luadbi/pkg-descr	Mon Aug 28 02:56:49 2017	(r448847)
@@ -1,4 +1,4 @@
 LuaDBI is a database interface library for Lua.
 It is designed to provide a RDBMS agnostic API for handling database operations.
 
-WWW: http://code.google.com/p/luadbi/
+WWW: https://github.com/mwild1/luadbi