From 4a7a9e313ab8ffb91b8e29a7abbb8a742f9bfe14 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 6 Dec 2017 11:55:20 +0000 Subject: [PATCH] Do not set WRKSRC when using USE_GITHUB, it is always correct. If it is not correct, it is because you did not set GH_PROJECT correctly. Sponsored by: Absolight --- devel/RStudio/Makefile | 2 +- devel/RStudio/distinfo | 4 ++-- devel/pear-SebastianBergmann_PHPCPD/Makefile | 7 +++---- devel/pear-SebastianBergmann_PHPCPD/distinfo | 4 ++-- lang/chez-scheme/Makefile | 2 -- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index 04ec9d6f9407..da4f6600ac19 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -33,6 +33,7 @@ USE_QT5= core dbus gui location network opengl printsupport qml quick sensors \ USE_JAVA= yes JAVA_BUILD= yes USE_GITHUB= yes +GH_PROJECT= ${PORTNAME:tl} GH_TUPLE= rstudio:rmarkdown:aed26ac:rmarkdown/dependencies/common/rmarkdown \ rstudio:rsconnect:03c379b:rsconnect/dependencies/common/rsconnect @@ -41,7 +42,6 @@ CMAKE_ARGS= -DRSTUDIO_TARGET=Desktop \ -DFREEBSD_LIBDIR:STRING=${PREFIX}/lib MAKE_ENV= HOME=${WRKDIR} \ ANT_OPTS="-Duser.home=${WRKDIR}" -WRKSRC= ${WRKDIR}/${PORTNAME:tl}-${PORTVERSION} GWT_VERSION= 2.7.0 GIN_VERSION= 1.5 diff --git a/devel/RStudio/distinfo b/devel/RStudio/distinfo index d77b93e3027e..764cfdb9e91f 100644 --- a/devel/RStudio/distinfo +++ b/devel/RStudio/distinfo @@ -7,8 +7,8 @@ SHA256 (gwt-2.7.0.zip) = aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a SIZE (gwt-2.7.0.zip) = 108818328 SHA256 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71 SIZE (mathjax-26.zip) = 3061588 -SHA256 (RStudio-RStudio-v1.1.385_GH0.tar.gz) = d4e8dd4106c85ae6352e4399667de7eccde0e6aa018f08711a8c4aad404eff3c -SIZE (RStudio-RStudio-v1.1.385_GH0.tar.gz) = 20197003 +SHA256 (RStudio-rstudio-v1.1.385_GH0.tar.gz) = d4e8dd4106c85ae6352e4399667de7eccde0e6aa018f08711a8c4aad404eff3c +SIZE (RStudio-rstudio-v1.1.385_GH0.tar.gz) = 20197003 SHA256 (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = b6f6f48dd9930514204739d8957c2737f0b1d110aebf9f89fa31de10598cb29b SIZE (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = 2087615 SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6ee49f32f650f6d10bbfc7b2f61aee258f2fbf45a43c006f9e0a726bcea6 diff --git a/devel/pear-SebastianBergmann_PHPCPD/Makefile b/devel/pear-SebastianBergmann_PHPCPD/Makefile index 2dd7c2f2af50..798ffefa53af 100644 --- a/devel/pear-SebastianBergmann_PHPCPD/Makefile +++ b/devel/pear-SebastianBergmann_PHPCPD/Makefile @@ -12,8 +12,6 @@ COMMENT= Copy/Paste Detector (CPD) for PHP code LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -WRKSRC= ${WRKDIR}/${PORTNAME:tl}-${DISTVERSION} - BUILD_DEPENDS= pear-ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools \ pear-SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade \ pear-PHP_Timer>=1.0.9:devel/pear-PHP_Timer \ @@ -23,13 +21,14 @@ RUN_DEPENDS= pear-ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools \ pear-PHP_Timer>=1.0.9:devel/pear-PHP_Timer \ pear-channel-phpunit>=20110327:devel/pear-channel-phpunit +USES= php USE_GITHUB= yes GH_ACCOUNT= sebastianbergmann +GH_PROJECT= ${PORTNAME:tl} +USE_PHP= tokenizer NO_ARCH= yes -USES= php -USE_PHP= tokenizer NO_BUILD= yes diff --git a/devel/pear-SebastianBergmann_PHPCPD/distinfo b/devel/pear-SebastianBergmann_PHPCPD/distinfo index 517878f5437c..a65f4e1467e2 100644 --- a/devel/pear-SebastianBergmann_PHPCPD/distinfo +++ b/devel/pear-SebastianBergmann_PHPCPD/distinfo @@ -1,3 +1,3 @@ TIMESTAMP = 1512468963 -SHA256 (sebastianbergmann-PHPCPD-2.0.0_GH0.tar.gz) = 102f309ee517e1c021504d3f5823482a1869eee6b5d8b770e904bf4b179d2646 -SIZE (sebastianbergmann-PHPCPD-2.0.0_GH0.tar.gz) = 14885 +SHA256 (sebastianbergmann-phpcpd-2.0.0_GH0.tar.gz) = 102f309ee517e1c021504d3f5823482a1869eee6b5d8b770e904bf4b179d2646 +SIZE (sebastianbergmann-phpcpd-2.0.0_GH0.tar.gz) = 14885 diff --git a/lang/chez-scheme/Makefile b/lang/chez-scheme/Makefile index c4537f3ca026..86ac171b6913 100644 --- a/lang/chez-scheme/Makefile +++ b/lang/chez-scheme/Makefile @@ -25,8 +25,6 @@ GH_TUPLE= nanopass:nanopass-framework-scheme:v1.9:nanopass/nanopass \ madler:zlib:v1.2.11:zlib/zlib \ dybvig:stex:v1.2.1:stex/stex -WRKSRC= ${WRKDIR}/ChezScheme-${PORTVERSION} - USES= gmake iconv:lib ncurses USE_XORG= x11 HAS_CONFIGURE= yes