Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Mar 2015 04:45:48 +0000 (UTC)
From:      Mikhail Teterin <mi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r380890 - head/devel/lua-gettext
Message-ID:  <201503100445.t2A4jmOt073658@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mi
Date: Tue Mar 10 04:45:48 2015
New Revision: 380890
URL: https://svnweb.freebsd.org/changeset/ports/380890
QAT: https://qat.redports.org/buildarchive/r380890/

Log:
  When downloading (from GitHub), use the commit-ID instead of "master" --
  in case these files are ever updated.
  
  Instead of versioning the two distfiles themselves, use a versioned
  DIST_SUBDIR.
  
  Compile the code straight from ${_DISTDIR} without copying any files
  around after download.

Modified:
  head/devel/lua-gettext/Makefile
  head/devel/lua-gettext/distinfo

Modified: head/devel/lua-gettext/Makefile
==============================================================================
--- head/devel/lua-gettext/Makefile	Tue Mar 10 03:50:03 2015	(r380889)
+++ head/devel/lua-gettext/Makefile	Tue Mar 10 04:45:48 2015	(r380890)
@@ -5,9 +5,10 @@ PORTNAME=	gettext
 PORTVERSION=	1.5
 PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	https://raw.githubusercontent.com/nuclewall/bsdinstaller/master/src/lib/lua/gettext/
+MASTER_SITES=	https://raw.githubusercontent.com/nuclewall/bsdinstaller/${GH_COMMIT}/src/lib/lua/gettext/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
-DISTFILES=	lua_gettext.c?rev=${CVER} gettext.lua?rev=${LVER}
+DISTFILES=	lua_gettext.c gettext.lua
+DIST_SUBDIR=	lua-${PORTNAME}-${GH_COMMIT}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gettext binding for Lua 5
@@ -16,20 +17,20 @@ USES=		gettext lua:51
 
 CVER=		1.15
 LVER=		${PORTVERSION}
+GH_COMMIT=	8323bb9
 
 PLIST_FILES=	%%LUA_MODSHAREDIR%%/gettext.lua \
 		%%LUA_MODLIBDIR%%/lgettext.so
+MAKEFILE=	${FILESDIR}/Makefile
+MAKE_ENV+=	VPATH=${_DISTDIR}
+NO_WRKSUBDIR=	yes
 
 do-extract:
-	${MKDIR} ${WRKSRC}
-.for file in ${DISTFILES}
-	${CP} ${DISTDIR}/${file} ${WRKSRC}/${file:C/\?.*$//}
-.endfor
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	# Bulding straight from ${_DISTDIR}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/gettext.lua ${STAGEDIR}${LUA_MODSHAREDIR}
+	${INSTALL_DATA} ${_DISTDIR}/gettext.lua ${STAGEDIR}${LUA_MODSHAREDIR}
 	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lgettext.so ${STAGEDIR}${LUA_MODLIBDIR}
 

Modified: head/devel/lua-gettext/distinfo
==============================================================================
--- head/devel/lua-gettext/distinfo	Tue Mar 10 03:50:03 2015	(r380889)
+++ head/devel/lua-gettext/distinfo	Tue Mar 10 04:45:48 2015	(r380890)
@@ -1,4 +1,4 @@
-SHA256 (lua_gettext.c?rev=1.15) = c3ba6db0e0220f2789d06099ce28372b5a30234ffee78caf5fa47efdf274baaf
-SIZE (lua_gettext.c?rev=1.15) = 1429
-SHA256 (gettext.lua?rev=1.5) = a861d10a6aba7d0949c0851fff4d42a494bfaffbcc93a163ec85cecb38309fe3
-SIZE (gettext.lua?rev=1.5) = 315
+SHA256 (lua-gettext-8323bb9/lua_gettext.c) = c3ba6db0e0220f2789d06099ce28372b5a30234ffee78caf5fa47efdf274baaf
+SIZE (lua-gettext-8323bb9/lua_gettext.c) = 1429
+SHA256 (lua-gettext-8323bb9/gettext.lua) = a861d10a6aba7d0949c0851fff4d42a494bfaffbcc93a163ec85cecb38309fe3
+SIZE (lua-gettext-8323bb9/gettext.lua) = 315



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