From owner-svn-ports-all@FreeBSD.ORG Wed Oct 16 23:46:19 2013 Return-Path: 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 ESMTP id D8924BB7; Wed, 16 Oct 2013 23:46:19 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) 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 AE1402316; Wed, 16 Oct 2013 23:46:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GNkJqI061669; Wed, 16 Oct 2013 23:46:19 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GNkJfj061668; Wed, 16 Oct 2013 23:46:19 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201310162346.r9GNkJfj061668@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 16 Oct 2013 23:46:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330563 - head/lang/tolua++ 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.14 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: Wed, 16 Oct 2013 23:46:19 -0000 Author: amdmi3 Date: Wed Oct 16 23:46:19 2013 New Revision: 330563 URL: http://svnweb.freebsd.org/changeset/ports/330563 Log: - Support staging - Install into PREFIX instead of LOCALBASE Modified: head/lang/tolua++/Makefile Modified: head/lang/tolua++/Makefile ============================================================================== --- head/lang/tolua++/Makefile Wed Oct 16 23:45:18 2013 (r330562) +++ head/lang/tolua++/Makefile Wed Oct 16 23:46:19 2013 (r330563) @@ -18,22 +18,26 @@ SCONS_ARGS= prefix=${PREFIX} SONAME="lib CFLAGS+= -I${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} -e "s|'lualib',||" ${WRKSRC}/config_posix.py +TGT_BINDIR= ${LUA_BINDIR:C/^${LOCALBASE}/${PREFIX}/} +TGT_INCDIR= ${LUA_INCDIR:C/^${LOCALBASE}/${PREFIX}/} +TGT_LIBDIR= ${LUA_LIBDIR:C/^${LOCALBASE}/${PREFIX}/} -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/tolua++ ${LUA_BINDIR} - ${LN} -sf ${LUA_SUBDIR}/tolua++ ${PREFIX}/bin/tolua++-${LUA_VER} - ${INSTALL_DATA} ${WRKSRC}/include/tolua++.h ${LUA_INCDIR} - ${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.a ${LUA_LIBDIR} - ${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${LUA_LIBDIR} - ${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${PREFIX}/lib/libtolua++-${LUA_VER}.so - -.include +.include .if ${ARCH} == "sparc64" && ${OSVERSION} > 900000 BROKEN= Does not install on sparc64-9 .endif -.include +post-patch: + @${REINPLACE_CMD} -e "s|'lualib',||" ${WRKSRC}/config_posix.py + +do-install: + ${MKDIR} ${STAGEDIR}${TGT_BINDIR} ${STAGEDIR}${TGT_INCDIR} ${STAGEDIR}${TGT_LIBDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/tolua++ ${STAGEDIR}${TGT_BINDIR} + ${LN} -sf ${LUA_SUBDIR}/tolua++ ${STAGEDIR}${PREFIX}/bin/tolua++-${LUA_VER} + ${INSTALL_DATA} ${WRKSRC}/include/tolua++.h ${STAGEDIR}${TGT_INCDIR} + ${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.a ${STAGEDIR}${TGT_LIBDIR} + ${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${STAGEDIR}${TGT_LIBDIR} + ${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${STAGEDIR}${PREFIX}/lib/libtolua++-${LUA_VER}.so + +.include