From f51091ad5956e3a411b095aef4fd3b11d62dc2c2 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Fri, 21 Apr 2017 10:02:27 +0000 Subject: [PATCH] - Fix shebangs - Fix bin/rc in lang/go since we dont have it in base or a port to support it - While in lang/go remove WRKSRC for SHEBANG_FILES - Bump PORTREVISION for package change --- lang/go/Makefile | 25 +++++++++++-------------- lang/go14/Makefile | 17 +++++++++++------ lang/mono/Makefile | 6 ++++-- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/lang/go/Makefile b/lang/go/Makefile index cf65221bb60c..2d5cf62ad7da 100644 --- a/lang/go/Makefile +++ b/lang/go/Makefile @@ -3,6 +3,7 @@ PORTNAME= go PORTVERSION= 1.8.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= http://golang.org/dl/ @@ -16,24 +17,20 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= go14>=1.4:lang/go14 USES= shebangfix -SHEBANG_LANG= sh perl rc -SHEBANG_FILES= ${WRKSRC}/src/*.bash \ - ${WRKSRC}/doc/articles/wiki/*.bash \ - ${WRKSRC}/lib/time/*.bash \ - ${WRKSRC}/misc/benchcmp \ - ${WRKSRC}/misc/nacl/go_nacl_*_exec \ - ${WRKSRC}/src/*.rc \ - ${WRKSRC}/src/cmd/dist/*.bash \ - ${WRKSRC}/src/cmd/go/*.sh \ - ${WRKSRC}/src/net/http/cgi/testdata/*.cgi \ - ${WRKSRC}/src/regexp/syntax/*.pl +SHEBANG_LANG= sh perl +SHEBANG_FILES= src/*.bash \ + doc/articles/wiki/*.bash \ + lib/time/*.bash \ + misc/benchcmp \ + misc/nacl/go_nacl_*_exec \ + src/cmd/dist/*.bash \ + src/cmd/go/*.sh \ + src/net/http/cgi/testdata/*.cgi \ + src/regexp/syntax/*.pl sh_OLD_CMD= "/usr/bin/env bash" sh_CMD= ${SH} -rc_OLD_CMD= /bin/rc -rc_CMD= ${LOCALBASE}/bin/rc - WRKSRC= ${WRKDIR}/go ONLY_FOR_ARCHS= i386 amd64 armv6 diff --git a/lang/go14/Makefile b/lang/go14/Makefile index ae4c13689917..b153a52d7821 100644 --- a/lang/go14/Makefile +++ b/lang/go14/Makefile @@ -2,7 +2,7 @@ PORTNAME= go14 PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://golang.org/dl/ DISTNAME= go${PORTVERSION}.src @@ -13,11 +13,16 @@ COMMENT= Go programming language LICENSE= BSD3CLAUSE USES= compiler shebangfix -SHEBANG_LANG= sh -SHEBANG_FILES= ${WRKSRC}/src/*.bash \ - ${WRKSRC}/doc/progs/run \ - ${WRKSRC}/doc/articles/wiki/*.bash \ - ${WRKSRC}/test/bench/shootout/timing.sh +SHEBANG_LANG= sh perl +SHEBANG_FILES= src/*.bash \ + src/cmd/go/*.bash \ + doc/progs/run \ + doc/articles/wiki/*.bash \ + test/bench/shootout/timing.sh \ + misc/nacl/*_exec misc/benchcmp \ + src/net/http/cgi/testdata/*.cgi \ + src/regexp/syntax/*.pl \ + lib/codereview/*.sh sh_OLD_CMD= "/usr/bin/env bash" sh_CMD= ${SH} diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 1cf92e35d525..6cb5e52a6e32 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -3,7 +3,7 @@ PORTNAME= mono PORTVERSION= 4.6.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/ @@ -17,12 +17,14 @@ BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ bash:shells/bash LIB_DEPENDS= libinotify.so:devel/libinotify -USES= bison compiler:c11 cpe gettext gmake iconv libtool pathfix perl5 tar:bzip2 +USES= bison compiler:c11 cpe gettext gmake iconv libtool pathfix \ + perl5 python:run shebangfix tar:bzip2 USE_GNOME= glib20 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/mono-${PORTVERSION:R} +SHEBANG_FILES= scripts/mono-heapviz CONFIGURE_ARGS= --disable-dtrace CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no