Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Mar 2017 18:21:49 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r436168 - in head/databases/luadbi: . files
Message-ID:  <201703141821.v2EILnn6079985@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Tue Mar 14 18:21:49 2017
New Revision: 436168
URL: https://svnweb.freebsd.org/changeset/ports/436168

Log:
  databases/luadbi: unbreak with new distsite
  
  PR:		212884
  Submitted by:	Olexander Melnyk <olexander.v.melnyk@gmail.com> (maintainer)
  Reviewed by:	Michael Pfeiffer <michael.pfeiffer@eichenstein.de>

Modified:
  head/databases/luadbi/Makefile
  head/databases/luadbi/distinfo
  head/databases/luadbi/files/patch-Makefile

Modified: head/databases/luadbi/Makefile
==============================================================================
--- head/databases/luadbi/Makefile	Tue Mar 14 17:44:26 2017	(r436167)
+++ head/databases/luadbi/Makefile	Tue Mar 14 18:21:49 2017	(r436168)
@@ -3,39 +3,42 @@
 
 PORTNAME=	luadbi
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
-MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	${PORTNAME}.${PORTVERSION}
+MASTER_SITES=	http://ic.km.ua/~old/luadbi/
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}.f562ccd
 
 MAINTAINER=	olexander.v.melnyk@gmail.com
 COMMENT=	LuaDBI driver
 
 LICENSE=	MIT
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
+WRKSRC=		${WRKDIR}/${PORTNAME}-master
 
-NO_WRKSUBDIR=	yes
-
-USES=		gmake lua:51 shebangfix
+USES=		gmake shebangfix zip
 SHEBANG_FILES=	DBI.lua
 
-MAKE_JOBS_UNSAFE=	yes
-
 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}"
 
+MAKE_JOBS_UNSAFE=yes
+
+OPTIONS_SINGLE=	LUA_VERSION
+OPTIONS_SINGLE_LUA_VERSION=	LUA51 LUA52
 OPTIONS_MULTI=	DATABASE
 OPTIONS_MULTI_DATABASE=	MYSQL SQLITE3 PGSQL
-OPTIONS_DEFAULT=	MYSQL
+OPTIONS_DEFAULT=	MYSQL LUA52
 
 PLIST_FILES=	%%LUA_MODSHAREDIR%%/DBI.lua
 
-MYSQL_USE=		MYSQL=yes
+LUA51_USES=	lua:51
+
+LUA52_USES=	lua:52
+
+MYSQL_USES=		mysql
 MYSQL_LDFLAGS=		-L ${LOCALBASE}/lib/mysql
 MYSQL_CFLAGS=		-I ${LOCALBASE}/include/mysql
 MYSQL_ALL_TARGET=	mysql
@@ -48,6 +51,7 @@ SQLITE3_PLIST_FILES=	%%LUA_MODLIBDIR%%/d
 PGSQL_USES=		pgsql
 PGSQL_ALL_TARGET=	psql
 PGSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbdpostgresql.so
+PGSQL_BROKEN=		Not tested
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}

Modified: head/databases/luadbi/distinfo
==============================================================================
--- head/databases/luadbi/distinfo	Tue Mar 14 17:44:26 2017	(r436167)
+++ head/databases/luadbi/distinfo	Tue Mar 14 18:21:49 2017	(r436168)
@@ -1,2 +1,3 @@
-SHA256 (luadbi.0.5.tar.gz) = 49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e
-SIZE (luadbi.0.5.tar.gz) = 22454
+TIMESTAMP = 1475418951
+SHA256 (luadbi-0.5.f562ccd.zip) = 28b5146bb89956f1a26af5fb9074c8e3cf449917bda9c8863d345edb88685dc8
+SIZE (luadbi-0.5.f562ccd.zip) = 51252

Modified: head/databases/luadbi/files/patch-Makefile
==============================================================================
--- head/databases/luadbi/files/patch-Makefile	Tue Mar 14 17:44:26 2017	(r436167)
+++ head/databases/luadbi/files/patch-Makefile	Tue Mar 14 18:21:49 2017	(r436168)
@@ -1,8 +1,9 @@
---- Makefile.orig	2010-07-16 09:22:13.000000000 +0300
-+++ Makefile	2013-10-17 18:24:00.000000000 +0300
-@@ -1,11 +1,8 @@
+--- Makefile.orig	2017-03-14 18:06:02 UTC
++++ Makefile
+@@ -1,12 +1,8 @@
 -CC=gcc
--CFLAGS=-g -pedantic -Wall -O2 -shared -fpic -I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
+-LUAVER=5.1
+-CFLAGS=-g -pedantic -Wall -O2 -shared -fpic -I /usr/include/lua$(LUAVER) -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I .
  AR=ar rcu
  RANLIB=ranlib
  RM=rm -rf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703141821.v2EILnn6079985>