Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Feb 2015 19:19:48 +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: r378368 - head/devel/easygit
Message-ID:  <201502031919.t13JJm0H022467@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Feb  3 19:19:47 2015
New Revision: 378368
URL: https://svnweb.freebsd.org/changeset/ports/378368
QAT: https://qat.redports.org/buildarchive/r378368/

Log:
  - Fix build by not modifying file under DISTDIR
  - Don't include PORTREVISION into DIST_SUBDIR

Modified:
  head/devel/easygit/Makefile

Modified: head/devel/easygit/Makefile
==============================================================================
--- head/devel/easygit/Makefile	Tue Feb  3 19:14:09 2015	(r378367)
+++ head/devel/easygit/Makefile	Tue Feb  3 19:19:47 2015	(r378368)
@@ -7,24 +7,28 @@ CATEGORIES=	devel
 MASTER_SITES=	http://www.gnome.org/~newren/eg/download/${PORTVERSION}/
 DISTNAME=	eg
 EXTRACT_SUFX=	# none
-EXTRACT_ONLY=	# none
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy wrapper for git
 
 RUN_DEPENDS=	git:${PORTSDIR}/devel/git
 
-DIST_SUBDIR=	eg/${PORTVERSION}_${PORTREVISION}
+DISTREVISION=	0 # bump this if distfile is changed inplace
+
+DIST_SUBDIR=	eg/${PORTVERSION}_${DISTREVISION}
 USES=		perl5 shebangfix
-SHEBANG_FILES=	${_DISTDIR}/eg
+SHEBANG_FILES=	${WRKDIR}/eg
 USE_PERL5=	run
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/eg bin/easygit
 
+do-extract:
+	@${CP} ${_DISTDIR}/${DISTNAME} ${WRKDIR}
+
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${_DISTDIR}/eg ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/eg ${STAGEDIR}${PREFIX}/bin/
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ./eg ${STAGEDIR}${PREFIX}/bin/easygit
 
 .include <bsd.port.mk>



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