From owner-svn-ports-all@FreeBSD.ORG  Mon Jan 13 07:50:04 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6225A499;
 Mon, 13 Jan 2014 07:50:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 34CA61DCD;
 Mon, 13 Jan 2014 07:50:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0D7o4Vj059445;
 Mon, 13 Jan 2014 07:50:04 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0D7o3I5059441;
 Mon, 13 Jan 2014 07:50:03 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401130750.s0D7o3I5059441@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 13 Jan 2014 07:50:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339574 - in head/converters/lua-iconv: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 07:50:04 -0000

Author: bapt
Date: Mon Jan 13 07:50:03 2014
New Revision: 339574
URL: http://svnweb.freebsd.org/changeset/ports/339574

Log:
  Update to version 7 to allow using lua 5.2
  While here switch MASTER_SITES to github cloud
  Use MAKE_ARGS do avoid patching
  
  With hat:	lua@

Deleted:
  head/converters/lua-iconv/files/
Modified:
  head/converters/lua-iconv/Makefile
  head/converters/lua-iconv/distinfo

Modified: head/converters/lua-iconv/Makefile
==============================================================================
--- head/converters/lua-iconv/Makefile	Mon Jan 13 07:28:31 2014	(r339573)
+++ head/converters/lua-iconv/Makefile	Mon Jan 13 07:50:03 2014	(r339574)
@@ -2,27 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	iconv
-PORTVERSION=	6
+PORTVERSION=	7
 CATEGORIES=	converters
-MASTER_SITES=	http://luaforge.net/frs/download.php/4181/
+MASTER_SITES=	GHC
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
+DISTNAME=	lua-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Iconv binding for Lua 5
 
 WRKSRC=		${WRKDIR}/lua-${PORTNAME}-${PORTVERSION}
-USE_LUA?=	5.1
-USES=		pkgconfig iconv
+USES=		pkgconfig iconv lua
 
-PLIST_FILES=	%%LUA_MODLIBDIR%%/iconv.so
+USE_GITHUB=	yes
+GH_ACCOUNT=	ittner
+GH_PROJECT=	lua-${PORTNAME}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%INCDIR%%|-I${PREFIX}/include| ; \
-		s|%%LIBDIR%%|-L${PREFIX}/lib|; \
-		s|%%ICONV_LIB%%|${ICONV_LIB}|' ${WRKSRC}/Makefile
+PLIST_FILES=	%%LUA_MODLIBDIR%%/iconv.so
+CFLAGS+=	`pkgconf --cflags lua-${LUA_VER}` -I${LOCALBASE}/include
+MAKE_ARGS=	LUABIN=${LUA_CMD} CFLAGS="${CFLAGS}"
+LDFLAGS=	-shared ${ICONV_LIB} -L${LOCALBASE}/lib
+CFLAGS_amd64=	-fPIC
 
 do-install:
-	@if [ ! -d ${STAGEDIR}${LUA_MODLIBDIR} ]; then ${MKDIR} ${STAGEDIR}/${LUA_MODLIBDIR}; fi
-	@${INSTALL_PROGRAM} ${WRKSRC}/iconv.so ${STAGEDIR}/${LUA_MODLIBDIR}
+	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
+	${INSTALL_LIB} ${WRKSRC}/iconv.so ${STAGEDIR}${LUA_MODLIBDIR}
 
 .include <bsd.port.mk>

Modified: head/converters/lua-iconv/distinfo
==============================================================================
--- head/converters/lua-iconv/distinfo	Mon Jan 13 07:28:31 2014	(r339573)
+++ head/converters/lua-iconv/distinfo	Mon Jan 13 07:50:03 2014	(r339574)
@@ -1,2 +1,2 @@
-SHA256 (iconv-6.tar.gz) = e3ca46cc4975d9dc496b282db217723d1b0b5277e6938be8797ea6e0ac4f77f4
-SIZE (iconv-6.tar.gz) = 6101
+SHA256 (lua-iconv-7.tar.gz) = c1db1915c754b5cfe7e45af61467bc6dfa4f0037d281ccbce6b53c974e2faf09
+SIZE (lua-iconv-7.tar.gz) = 7693