From owner-svn-ports-head@FreeBSD.ORG Wed May 21 05:38:52 2014 Return-Path: Delivered-To: svn-ports-head@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 301CEC50; Wed, 21 May 2014 05:38:52 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D0062AD8; Wed, 21 May 2014 05:38:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4L5cp2b010118; Wed, 21 May 2014 05:38:51 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4L5cpTD010114; Wed, 21 May 2014 05:38:51 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201405210538.s4L5cpTD010114@svn.freebsd.org> From: Martin Wilke Date: Wed, 21 May 2014 05:38:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354708 - in head/devel/lua-alien: . 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-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 05:38:52 -0000 Author: miwi Date: Wed May 21 05:38:50 2014 New Revision: 354708 URL: http://svnweb.freebsd.org/changeset/ports/354708 QAT: https://qat.redports.org/buildarchive/r354708/ Log: - Update to 0.7.0 PR: 187972 Submitted by: Ports Fury Added: head/devel/lua-alien/files/patch-src__alien.c (contents, props changed) Deleted: head/devel/lua-alien/files/patch-Makefile head/devel/lua-alien/files/patch-src-alien-core.c Modified: head/devel/lua-alien/Makefile head/devel/lua-alien/distinfo head/devel/lua-alien/pkg-plist Modified: head/devel/lua-alien/Makefile ============================================================================== --- head/devel/lua-alien/Makefile Wed May 21 05:37:53 2014 (r354707) +++ head/devel/lua-alien/Makefile Wed May 21 05:38:50 2014 (r354708) @@ -2,13 +2,10 @@ # $FreeBSD$ PORTNAME= alien -PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTVERSION= 0.7.0 CATEGORIES= devel -MASTER_SITES= http://nodeload.github.com/mascarenhas/alien/tarball/ +MASTER_SITES= GHC PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} -DISTFILES= ${DISTVERSION} -DIST_SUBDIR= lua-${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Lua -> C FFI @@ -17,60 +14,46 @@ LICENSE= MIT LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi -USES= lua +WRKSRC= ${WRKDIR}/${DISTNAME} -WRKSRC= ${WRKDIR}/${GITHUB_USER}-${PORTNAME}-${GITHUB_SRC_SUFX} -CFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} \ - -DBSD -fPIC -LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} -llua-${LUA_VER} -shared -MAKE_ENV+= LIB_OPTION="${LDFLAGS}" LIB_EXT=".so" LUA="${LUA_CMD}" -TESTS_EXCLUDE= tests/alien tests/alien.lua - -GITHUB_USER= mascarenhas -GITHUB_SRC_SUFX=e667d5d - -.if ${CFLAGS:M-fstack-prot*} -MAKE_ENV+= __MAKE_CONF= # inherit CFLAGS only once -CFLAGS+= -fno-stack-protector -.endif - -# add lua prefix to directories -.for p in data: docs:doc/ examples:examples/ -${p:C/:.*//:tu}DIR_REL= share/${p:C/.*://}${LUA_PKGNAMEPREFIX}${PORTNAME} -${p:C/:.*//:tu}DIR= ${PREFIX}/${${p:C/:.*//:tu}DIR_REL} -.endfor +USE_GITHUB= yes +GH_ACCOUNT= mascarenhas + +USES= libtool lua shebangfix zip +SHEBANG_FILES= src/constants +SHEBANG_LANG= lua +lua_OLD_CMD= /usr/bin/env lua +lua_CMD= ${LOCALBASE}/bin/${LUA_CMD} +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-silent-rules \ + --libdir=${LUA_MODLIBDIR} \ + --datadir=${LUA_MODSHAREDIR} \ + --with-lua-suffix="${LUA_VER_STR}" +INSTALL_TARGET= install-strip + +CPPFLAGS+= -I${LUA_INCDIR} -I${LOCALBASE}/include -DBSD +LDFLAGS+= -L${LUA_LIBDIR} -L${LOCALBASE}/lib + +DOCSDIR= ${PREFIX}/share/doc/lua-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/lua-${PORTNAME} OPTIONS_DEFINE= DOCS EXAMPLES -post-extract: .SILENT - ${RM} -rf ${WRKSRC}/libffi - ${FIND} ${WRKSRC} -type f -name .git-darcs-dir -delete - -post-patch: .SILENT - ${REINPLACE_CMD} '1s|.*|#! ${LUA_CMD}|' ${WRKSRC}/src/constants - ${REINPLACE_CMD} -i '' \ - -e 's|/usr/lib|${PREFIX}/lib|' \ - -e '/luarocks/d' \ - ${WRKSRC}/samples/*.lua ${WRKSRC}/tests/*.lua - -do-install: - @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}/${PORTNAME} - (cd ${WRKSRC}/src/alien && ${INSTALL_LIB} core.so struct.so \ - ${STAGEDIR}${LUA_MODLIBDIR}/${PORTNAME}) - @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR} - ${INSTALL_DATA} ${WRKSRC}/src/alien.lua ${STAGEDIR}${LUA_MODSHAREDIR} - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/src/constants ${STAGEDIR}${DATADIR} - ${TAR} cf - -C${WRKSRC} ${TESTS_EXCLUDE:S,^,--exclude ,} tests \ - | ${TAR} xof - -C${STAGEDIR}${DATADIR} +post-patch: + @${REINPLACE_CMD} -e \ + '/^install-data-am:/s|install-dist_docDATA.*|| ; \ + /^[[:cntrl:]]/s|install-dist_samplesDATA$$||' \ + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|/usr/lib|${LOCALBASE}/lib| ; \ + /luarocks/d' ${WRKSRC}/samples/*.lua + +post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/doc && ${INSTALL_DATA} alien.* \ + ${STAGEDIR}${DOCSDIR}) @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) - -regression-test: build - ${LN} -fs ${TESTS_EXCLUDE:S,tests/,../src/,} ${WRKSRC}/tests - cd ${WRKSRC}/tests && ${LUA_CMD} test_alien.lua - ${RM} -f ${TESTS_EXCLUDE:S,^,${WRKSRC}/,} + (cd ${WRKSRC}/samples && ${INSTALL_DATA} *.lua \ + ${STAGEDIR}${EXAMPLESDIR}) .include Modified: head/devel/lua-alien/distinfo ============================================================================== --- head/devel/lua-alien/distinfo Wed May 21 05:37:53 2014 (r354707) +++ head/devel/lua-alien/distinfo Wed May 21 05:38:50 2014 (r354708) @@ -1,2 +1,2 @@ -SHA256 (lua-alien/0.5.1) = 5dadc6067f2495da2b78d0ba1fb27d8e33117c138dc76ae4cb500c9b9cd1a26b -SIZE (lua-alien/0.5.1) = 775968 +SHA256 (alien-0.7.0.zip) = ca77a40858a0fb9ac3998f28fda0825ac4af2f4eed0f5d34d74f943867d4adfe +SIZE (alien-0.7.0.zip) = 369994 Added: head/devel/lua-alien/files/patch-src__alien.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/lua-alien/files/patch-src__alien.c Wed May 21 05:38:50 2014 (r354708) @@ -0,0 +1,11 @@ +--- src/alien.c.orig ++++ src/alien.c +@@ -332,7 +332,7 @@ + #define FFI_STDCALL FFI_DEFAULT_ABI + #endif + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(BSD) + #define FFI_SYSV FFI_DEFAULT_ABI + #endif + Modified: head/devel/lua-alien/pkg-plist ============================================================================== --- head/devel/lua-alien/pkg-plist Wed May 21 05:37:53 2014 (r354707) +++ head/devel/lua-alien/pkg-plist Wed May 21 05:38:50 2014 (r354708) @@ -1,17 +1,10 @@ -%%LUA_MODLIBDIR%%/alien/core.so -%%LUA_MODLIBDIR%%/alien/struct.so -%%PORTDATA%%%%DATADIR%%/constants -%%PORTDATA%%%%DATADIR%%/tests/alientest.c -%%PORTDATA%%%%DATADIR%%/tests/libalientest.so -%%PORTDATA%%%%DATADIR%%/tests/test_alien.lua +bin/constants +%%LUA_MODLIBDIR%%/alien_c.so +%%PORTDOCS%%%%DOCSDIR%%/alien.html %%PORTDOCS%%%%DOCSDIR%%/alien.md -%%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtk.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libc.lua %%PORTEXAMPLES%%%%EXAMPLESDIR%%/string_array.lua %%LUA_MODSHAREDIR%%/alien.lua -@dirrm %%LUA_MODLIBDIR%%/alien -%%PORTDATA%%@dirrm %%DATADIR%%/tests -%%PORTDATA%%@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%