From owner-svn-ports-all@FreeBSD.ORG Fri Jan 10 13:19:01 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2556638; Fri, 10 Jan 2014 13:19:01 +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 A4C101ABC; Fri, 10 Jan 2014 13:19:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0ADJ1Kk009473; Fri, 10 Jan 2014 13:19:01 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0ADJ14J009472; Fri, 10 Jan 2014 13:19:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401101319.s0ADJ14J009472@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 10 Jan 2014 13:19:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339350 - head/devel/lutok 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2014 13:19:01 -0000 Author: bapt Date: Fri Jan 10 13:19:01 2014 New Revision: 339350 URL: http://svnweb.freebsd.org/changeset/ports/339350 Log: Port to lua 5.2 Support stage which eliminate lots of hacks Modified: head/devel/lutok/Makefile Modified: head/devel/lutok/Makefile ============================================================================== --- head/devel/lutok/Makefile Fri Jan 10 13:10:34 2014 (r339349) +++ head/devel/lutok/Makefile Fri Jan 10 13:19:01 2014 (r339350) @@ -3,24 +3,21 @@ PORTNAME= lutok PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= asomers@FreeBSD.org COMMENT= Lightweight C++ API for Lua -LICENSE= BSD +LICENSE= BSD3CLAUSE GNU_CONFIGURE= yes -USE_LUA= 5.1 USE_LDCONFIG= yes -USES= pkgconfig +USES= pkgconfig lua OPTIONS_DEFINE= DOCS EXAMPLES -NO_STAGE= yes -.include - CONFIGURE_ARGS+= --docdir=${DOCSDIR} CONFIGURE_ARGS+= --htmldir=${DOCSDIR}/html # The distfile contains prebuilt doxygen files. Specify --without_doxygen so @@ -33,15 +30,9 @@ CONFIGURE_ARGS+= --without-atf # lutok's configure script search for one using pkgconfig files, it might pick # a different version. CONFIGURE_ARGS+= LUA_CFLAGS="-I${LUA_INCDIR}" -CONFIGURE_ARGS+= LUA_LIBS="-L${LUA_LIBDIR} -llua -lm" +CONFIGURE_ARGS+= LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm" MAKE_FLAGS+= examplesdir=${EXAMPLESDIR} -.if ! ${PORT_OPTIONS:MDOCS} -MAKE_FLAGS+= doc_DATA= -.endif -.if ! ${PORT_OPTIONS:MEXAMPLES} -MAKE_FLAGS+= examples_DATA= -.endif PORTDOCS= AUTHORS COPYING NEWS README html PORTEXAMPLES= Makefile bindings.cpp hello.cpp interpreter.cpp raii.cpp @@ -52,20 +43,4 @@ post-patch: .SILENT @${REINPLACE_CMD} -e 's|@pkgconfigdir@|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in -# Eliminate empty directories -remove-docsdir: .SILENT - ${RMDIR} ${DOCSDIR} -remove-examplesdir: .SILENT - ${RMDIR} ${EXAMPLESDIR} - -.if ! ${PORT_OPTIONS:MDOCS} -pre-install: .SILENT - ${RM} -rf ${WRKSRC}/api-docs -post-install: remove-docsdir -.endif - -.if ! ${PORT_OPTIONS:MEXAMPLES} -post-install: remove-examplesdir -.endif - .include