Date: Wed, 24 Aug 2016 14:50:17 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420796 - in head: devel/android-tools-fastboot devel/android-tools-simpleperf devel/cargo devel/libbrotli finance/moneymanagerex graphics/aseprite net/pimd sysutils/hfm sysutils/ipfs-g... Message-ID: <201608241450.u7OEoHIE072425@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 24 14:50:17 2016 New Revision: 420796 URL: https://svnweb.freebsd.org/changeset/ports/420796 Log: Convert some port to the new GH_SUBDIR feature. Sponsored by: Absolight Modified: head/devel/android-tools-fastboot/Makefile (contents, props changed) head/devel/android-tools-simpleperf/Makefile (contents, props changed) head/devel/cargo/Makefile (contents, props changed) head/devel/libbrotli/Makefile (contents, props changed) head/finance/moneymanagerex/Makefile (contents, props changed) head/graphics/aseprite/Makefile (contents, props changed) head/net/pimd/Makefile (contents, props changed) head/sysutils/hfm/Makefile (contents, props changed) head/sysutils/ipfs-go/Makefile (contents, props changed) head/sysutils/osquery/Makefile (contents, props changed) head/sysutils/packer/Makefile (contents, props changed) Modified: head/devel/android-tools-fastboot/Makefile ============================================================================== --- head/devel/android-tools-fastboot/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/devel/android-tools-fastboot/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -22,6 +22,7 @@ USE_GITHUB= yes GH_ACCOUNT= android jbeich:extras,libselinux GH_PROJECT= platform_system_core platform_system_extras:extras \ platform_external_libselinux:libselinux +GH_SUBDIR= libselinux:libselinux # Emulate GH_COMMIT without causing desync .ifdef DISTVERSIONSUFFIX @@ -65,7 +66,6 @@ post-extract: ${BUILD_WRKSRC}/${DISTFILES:M*\:manpage:C/\?.*//} # Adjust paths relative to core @(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC}) - @${MV} ${WRKSRC_libselinux} ${WRKSRC}/libselinux post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} Modified: head/devel/android-tools-simpleperf/Makefile ============================================================================== --- head/devel/android-tools-simpleperf/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/devel/android-tools-simpleperf/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -23,6 +23,7 @@ GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERS GH_TAGNAME= ${GH_MYTAG}-249-g5f1de52:bionic \ ${GH_MYTAG}-554-g371e7ea170d7:core \ ${GH_MYTAG}-6-ge43f249:lzma +GH_SUBDIR= bionic:bionic lzma:lzma USES= compiler:c++11-lib uidfix BUILD_WRKSRC= ${WRKSRC}/simpleperf @@ -45,8 +46,6 @@ TEST_ALL_TARGET= simpleperf_test post-extract: # Adjust paths relative to extras @(cd ${WRKSRC_core} && ${COPYTREE_SHARE} . ${WRKSRC}) - @${MV} ${WRKSRC_bionic} ${WRKSRC}/bionic - @${MV} ${WRKSRC_lzma} ${WRKSRC}/lzma post-patch: # XXX C++ exception with description "regex_error" thrown in the test body. Modified: head/devel/cargo/Makefile ============================================================================== --- head/devel/cargo/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/devel/cargo/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -43,6 +43,7 @@ USE_GITHUB= yes GH_ACCOUNT= rust-lang GH_PROJECT= rust-installer:rust_installer GH_TAGNAME= 4915c75:rust_installer +GH_SUBDIR= src/rust-installer:rust_installer ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap cargo @@ -83,10 +84,6 @@ BOOTSTRAP_MAKE_ENV= LD_LIBRARY_PATH="${W BOOTSTRAP_VARS+= WITH_OPENSSL_PORT=yes .endif -post-extract: - @${RMDIR} ${WRKSRC}/src/rust-installer - @${MV} ${WRKSRC_rust_installer} ${WRKSRC}/src/rust-installer - post-extract-BOOTSTRAP-on: @${MKDIR} ${WRKSRC}/target/dl ${LN} -sf ${DISTDIR}/${CARGO_BOOT} ${WRKSRC}/target/dl/ Modified: head/devel/libbrotli/Makefile ============================================================================== --- head/devel/libbrotli/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/devel/libbrotli/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -19,15 +19,13 @@ USE_GITHUB= nodefault GH_ACCOUNT= google:brotli GH_PROJECT= brotli:brotli GH_TAGNAME= ${BROTLI_VERSION}:brotli +GH_SUBDIR= brotli:brotli USES= pkgconfig autoreconf libtool compiler:c++0x GNU_CONFIGURE= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION} -post-extract: - ${RMDIR} ${WRKSRC}/brotli && ${MV} ${WRKSRC_brotli} ${WRKSRC}/brotli - pre-configure: cd ${WRKSRC} && ./autogen.sh Modified: head/finance/moneymanagerex/Makefile ============================================================================== --- head/finance/moneymanagerex/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/finance/moneymanagerex/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -16,17 +16,17 @@ LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= moneymanagerex GH_PROJECT= moneymanagerex -GH_TUPLE= Regaddi:Chart.js:f13f99b:chart_js \ - FVANCOP:ChartNew.js:77e7f87:chartnew_js \ - diepes:sorttable.js:3c63cb0:sorttable_js \ - utelle:wxsqlite3:v3.3.1:wxsqlite3 \ - moneymanagerex:database:5d7129f:database \ - moneymanagerex:LuaGlue:c51d11a:luaglue \ - moneymanagerex:cajun:3684900:cajun \ - moneymanagerex:html-template:cd434ee:html_template \ - moneymanagerex:csv-parser:ca3f0d7:csv_parser \ - moneymanagerex:ctpp:20158e0:ctpp \ - moneymanagerex:mongoose:97583a6:mongoose +GH_TUPLE= Regaddi:Chart.js:f13f99b:chart_js/3rd/Chart.js \ + FVANCOP:ChartNew.js:77e7f87:chartnew_js/3rd/ChartNew.js \ + diepes:sorttable.js:3c63cb0:sorttable_js/3rd/sorttable.js \ + utelle:wxsqlite3:v3.3.1:wxsqlite3/lib/wxsqlite3 \ + moneymanagerex:database:5d7129f:database/database \ + moneymanagerex:LuaGlue:c51d11a:luaglue/3rd/LuaGlue \ + moneymanagerex:cajun:3684900:cajun/3rd/cajun \ + moneymanagerex:html-template:cd434ee:html_template/3rd/cgitemplate \ + moneymanagerex:csv-parser:ca3f0d7:csv_parser/3rd/csv-parser \ + moneymanagerex:ctpp:20158e0:ctpp/3rd/ctpp \ + moneymanagerex:mongoose:97583a6:mongoose/3rd/mongoose USES= autoreconf compiler:c++11-lib gettext gmake lua pkgconfig GNU_CONFIGURE= yes @@ -53,17 +53,6 @@ CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif post-extract: - @${MV} ${WRKSRC_database}/* ${WRKSRC}/database - @${MV} ${WRKSRC_chart_js}/* ${WRKSRC}/3rd/Chart.js - @${MV} ${WRKSRC_chartnew_js}/* ${WRKSRC}/3rd/ChartNew.js - @${MV} ${WRKSRC_luaglue}/* ${WRKSRC}/3rd/LuaGlue - @${MV} ${WRKSRC_cajun}/* ${WRKSRC}/3rd/cajun - @${MV} ${WRKSRC_csv_parser}/* ${WRKSRC}/3rd/csv-parser - @${MV} ${WRKSRC_ctpp}/* ${WRKSRC}/3rd/ctpp - @${MV} ${WRKSRC_html_template}/* ${WRKSRC}/3rd/cgitemplate - @${MV} ${WRKSRC_mongoose}/* ${WRKSRC}/3rd/mongoose - @${MV} ${WRKSRC_sorttable_js}/* ${WRKSRC}/3rd/sorttable.js - @${MV} ${WRKSRC_wxsqlite3}/* ${WRKSRC}/lib/wxsqlite3 @${MV} ${WRKDIR}/bakefile-0.2.9/autoconf/*.m4 ${WRKSRC}/m4 post-patch: Modified: head/graphics/aseprite/Makefile ============================================================================== --- head/graphics/aseprite/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/graphics/aseprite/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -28,13 +28,12 @@ OPTIONS_DEFAULT= WEBP WEBP_LIB_DEPENDS= libwebp.so:graphics/webp USE_GITHUB= yes -GH_TUPLE= aseprite:aseprite:${DISTVERSIONFULL} -GH_TUPLE+= aseprite:clip:96ed960:clip -GH_TUPLE+= aseprite:flic:65a6072:flic -GH_TUPLE+= aseprite:gtest:d63c625:gtest -GH_TUPLE+= aseprite:simpleini:0687587:simpleini -GH_TUPLE+= aseprite:duktape:0de771c:duk -GH_TUPLE+= dacap:observable:89c9740:observable +GH_TUPLE= aseprite:clip:96ed960:clip/src/clip +GH_TUPLE+= aseprite:flic:65a6072:flic/src/flic +GH_TUPLE+= aseprite:gtest:d63c625:gtest/third_party/gtest +GH_TUPLE+= aseprite:simpleini:0687587:simpleini/third_party/simpleini +GH_TUPLE+= aseprite:duktape:0de771c:duk/third_party/duktape +GH_TUPLE+= dacap:observable:89c9740:observable/src/observable USES= cmake:outsource compiler:c++11-lib jpeg pkgconfig USE_XORG= x11 xcursor xext xpm ice pixman sm xxf86dga xxf86vm @@ -56,14 +55,6 @@ CXXFLAGS+= -I${LOCALBASE}/include/freet CXXFLAGS+= -I${LOCALBASE}/include/freetype2/freetype post-extract: - @${RMDIR} ${WRKSRC}/third_party/gtest ${WRKSRC}/third_party/simpleini ${WRKSRC}/third_party/duktape \ - ${WRKSRC}/src/clip ${WRKSRC}/src/flic ${WRKSRC}/src/observable - @${MV} ${WRKDIR}/gtest-* ${WRKSRC}/third_party/gtest - @${MV} ${WRKDIR}/simpleini-* ${WRKSRC}/third_party/simpleini - @${MV} ${WRKDIR}/duktape-* ${WRKSRC}/third_party/duktape - @${MV} ${WRKDIR}/clip-* ${WRKSRC}/src/clip - @${MV} ${WRKDIR}/flic-* ${WRKSRC}/src/flic - @${MV} ${WRKDIR}/observable-* ${WRKSRC}/src/observable @${MKDIR} ${WRKSRC}/third_party/pixman/pixman @${CP} `${MAKE} -C ${PORTSDIR}/x11/pixman -V WRKSRC`/pixman/pixman-combine32.h \ ${WRKSRC}/third_party/pixman/pixman/ Modified: head/net/pimd/Makefile ============================================================================== --- head/net/pimd/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/net/pimd/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -14,6 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= troglobit GH_PROJECT= libite:libite GH_TAGNAME= v1.4.4:libite +GH_SUBDIR= libite:libite USES= tar:bzip2 USE_RC_SUBR= ${PORTNAME} @@ -21,10 +22,6 @@ USE_RC_SUBR= ${PORTNAME} HAS_CONFIGURE= yes MAKE_ARGS+= prefix="${PREFIX}" sysconfdir="${PREFIX}/etc/" -post-extract: - cd ${WRKSRC} && ${RMDIR} libite && \ - ${MV} ${WRKSRC_libite} ${WRKSRC}/libite - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pimd ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_DATA} ${WRKSRC}/pimd.conf \ Modified: head/sysutils/hfm/Makefile ============================================================================== --- head/sysutils/hfm/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/sysutils/hfm/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -19,9 +19,9 @@ BUILD_DEPENDS= go>=1.5:lang/go \ USES= compiler:c++11-lang USE_GITHUB= yes -GH_ACCOUNT= derekmarcotte mitchellh:gu op:gl -GH_PROJECT= ${PORTNAME} go-libucl:gu go-logging:gl -GH_TAGNAME= ${DISTVERSIONFULL} f9d0e55:gu dfaf3df:gl +GH_ACCOUNT= derekmarcotte +GH_TUPLE= mitchellh:go-libucl:f9d0e55:gu/vendor/src/github.com/mitchellh/go-libucl \ + op:go-logging:dfaf3df:gl/vendor/src/github.com/op/go-logging USERS= _hfm GROUPS= _hfm @@ -33,12 +33,6 @@ MAKE_ARGS+= ETCDIR=${ETCDIR} TAG=${DISTV NO_INSTALL= yes ALL_TARGET= test build -post-extract: - ${MKDIR} ${WRKSRC}/vendor/src/github.com/mitchellh/go-libucl - ${MV} ${WRKDIR}/go-libucl-f9d0e55/* ${WRKSRC}/vendor/src/github.com/mitchellh/go-libucl/ - ${MKDIR} ${WRKSRC}/vendor/src/github.com/op/go-logging - ${MV} ${WRKDIR}/go-logging-dfaf3df/* ${WRKSRC}/vendor/src/github.com/op/go-logging/ - do-patch: (cd ${WRKSRC}; ${PATCH} vendor/src/github.com/mitchellh/go-libucl/libucl.go < vendor/patches/github.com/mitchellh/go-libucl/libucl.go.patch ) Modified: head/sysutils/ipfs-go/Makefile ============================================================================== --- head/sysutils/ipfs-go/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/sysutils/ipfs-go/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -17,6 +17,7 @@ USES= gmake USE_GITHUB= yes GH_ACCOUNT= ipfs GH_PROJECT= go-ipfs +GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${GH_PROJECT} MAKE_ENV+= GOPATH=${WRKSRC} @@ -32,17 +33,8 @@ STRIP= # stripping can break go binarie EXTRA_PATCHES+= ${FILESDIR}/extra-patch-32bit .endif -# Prepare for possible extra modules in future -post-extract: - @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} -.for src in CHANGELOG.md Dockerfile Godeps LICENSE Makefile README.md assets bin blocks blockservice circle.yml cmd commands contribute.md core dev.md diagnostics doc.go docs exchange fuse importer ipnsfs merkledag metrics misc namesys notifications p2p package.json path pin repo routing tar test thirdparty tour unixfs updates util vendor - ${MV} ${WRKSRC}/${src} \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} -.endfor - post-patch: - ${GREP} -R github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log ${WRKSRC} 2>/dev/null | \ - cut -d':' -f1 | \ + ${GREP} -lR github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log ${WRKSRC} 2>/dev/null | \ while read gosrc; do sed -i.bak 's#github.com/ipfs/go-ipfs/vendor/##g' $$gosrc; done do-build: Modified: head/sysutils/osquery/Makefile ============================================================================== --- head/sysutils/osquery/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/sysutils/osquery/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -38,6 +38,7 @@ USE_RC_SUBR= ${PORTNAME}d USE_GITHUB= yes GH_ACCOUNT= facebook ${PORTNAME}:tp GH_PROJECT= third-party:tp +GH_SUBDIR= third-party:tp MAKE_JOBS_UNSAFE= yes .include <bsd.port.pre.mk> @@ -46,10 +47,6 @@ MAKE_JOBS_UNSAFE= yes CFLAGS+= -D_GLIBCXX_USE_C99 .endif -post-extract: - ${RMDIR} ${WRKSRC}/third-party - ${LN} -sf ${WRKSRC_tp} ${WRKSRC}/third-party - post-patch: ${REINPLACE_CMD} -e 's|/var/osquery|/var/db/osquery|g' \ ${WRKSRC}/osquery/core/init.cpp Modified: head/sysutils/packer/Makefile ============================================================================== --- head/sysutils/packer/Makefile Wed Aug 24 14:50:04 2016 (r420795) +++ head/sysutils/packer/Makefile Wed Aug 24 14:50:17 2016 (r420796) @@ -12,21 +12,15 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/ USE_GITHUB= yes GH_ACCOUNT= mitchellh +GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} STRIP= # stripping can break go binaries +# Make it so that post-extract runs before the GH_SUBDIR targets. +TARGET_ORDER_OVERRIDE= 680:post-extract + post-extract: - @${MV} ${WRKSRC}/vendor ${WRKSRC}/src - @${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} -.for src in .github .gitignore .travis.yml CHANGELOG.md CONTRIBUTING.md Godeps \ - LICENSE Makefile README.md Vagrantfile appveyor.yml azure-merge.sh \ - builder checkpoint.go command commands.go common communicator config.go \ - contrib examples fix helper log.go main.go main_test.go packer panic.go \ - plugin post-processor provisioner scripts signal.go stdin.go template \ - test version website - @${MV} ${WRKSRC}/${src} \ - ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} -.endfor + @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608241450.u7OEoHIE072425>