Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2013 23:46:19 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330563 - head/lang/tolua++
Message-ID:  <201310162346.r9GNkJfj061668@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
 BROKEN=		Does not install on sparc64-9
 .endif
 
-.include <bsd.port.post.mk>
+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 <bsd.port.mk>



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