Index: head/devel/android-tools-fastboot/Makefile =================================================================== --- head/devel/android-tools-fastboot/Makefile (revision 420795) +++ head/devel/android-tools-fastboot/Makefile (revision 420796) @@ -1,90 +1,90 @@ # $FreeBSD$ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- DISTVERSION?= 7.0.0_r1 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage DISTFILES= fastboot.1?id=706e754:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} MAINTAINER= jbeich@FreeBSD.org COMMENT= Android Fastboot protocol CLI tool LICENSE= APACHE20 BSD2CLAUSE PD LICENSE_COMB= multi LICENSE_FILE_PD= ${WRKSRC}/libselinux/NOTICE LIB_DEPENDS= libpcre.so:devel/pcre 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 GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else GH_REVISION= 88f64719d756 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES= compiler:c++11-lib pkgconfig uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKEFILE= ${.CURDIR}/files/Makefile # XXX ?= when bmake-only MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" \ MANDIR="${PREFIX}/man/man" \ LIBPCRE="${LOCALBASE}/lib/libpcre.a" PLIST_FILES= bin/fastboot \ man/man1/fastboot.1.gz PORTDOCS= * SUB_FILES= pkg-message OPTIONS_DEFINE= BASH DOCS OPTIONS_SUB= yes .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif BASH_GH_ACCOUNT= mbrubeck:bashcomp BASH_GH_PROJECT= android-completion:bashcomp BASH_GH_TAGNAME= c1b0656:bashcomp BASH_PLIST_FILES= etc/bash_completion.d/fastboot BASH_VARS= LICENSE+=MIT DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" post-extract: @${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \ ${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} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} update-revision: # https://developer.github.com/v3/repos/commits/#get-a-single-commit # Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1) @${REINPLACE_CMD} -i '' -e "/^GH_REVISION.*$@/s/=.*/= $$(\ ${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \ https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \ ${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \ ) # generated by: make $@/" \ ${.CURDIR}/Makefile .include # XXX Work around !target(makesum) .ifndef DISTVERSIONSUFFIX makesum: update-revision .endif Index: head/devel/android-tools-simpleperf/Makefile =================================================================== --- head/devel/android-tools-simpleperf/Makefile (revision 420795) +++ head/devel/android-tools-simpleperf/Makefile (revision 420796) @@ -1,61 +1,60 @@ # $FreeBSD$ PORTNAME= android-tools-simpleperf DISTVERSIONPREFIX= android- DISTVERSION= n-preview-1-116 DISTVERSIONSUFFIX= -gea4a5a4 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Android simpleperf tool LICENSE= APACHE20 PD LICENSE_COMB= multi LICENSE_FILE_PD= ${WRKSRC}/lzma/NOTICE BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} USE_GITHUB= yes GH_ACCOUNT= android:bionic,core jbeich:DEFAULT,lzma GH_PROJECT= platform_bionic:bionic platform_system_core:core \ platform_system_extras platform_external_lzma:lzma GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} 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 INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" LLVM_CONFIG="llvm-config${LLVM_VER}" ALL_TARGET= all TEST_TARGET= test LDFLAGS+= -Wl,--as-needed # avoid overlinking (llvm deps) PLIST_FILES= bin/simpleperf LLVM_VER?= 38 # XXX Move to DEFAULT_VERSIONS OPTIONS_DEFINE= TEST TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest 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. @if [ ${OPSYS} = FreeBSD -a ${OSREL:R} -lt 10 ]; then \ ${REINPLACE_CMD} -Ee '/^TEST/\ s/ (LOG|PLOG|UNIMPLEMENTED)/ DISABLED_\1/' \ ${WRKSRC}/base/logging_test.cpp; \ fi pre-install-TEST-on: do-test .include Index: head/devel/cargo/Makefile =================================================================== --- head/devel/cargo/Makefile (revision 420795) +++ head/devel/cargo/Makefile (revision 420796) @@ -1,144 +1,141 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTNAME= cargo PORTVERSION= 0.11.0 CATEGORIES= devel MAINTAINER= dumbbell@FreeBSD.org COMMENT= Rust's Package Manager # ' <-- Help Vim syntax hilighting... LICENSE= APACHE20 \ MIT LICENSE_COMB= dual # APACHE20 license is standard, see Templates/Licenses/APACHE20 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT # The following files are required: # # Main source archive from GitHub # This is the source of Cargo, taken from GitHub. # # :bootstrap # Like Rust, this is a prebuilt "cargo" used to bootstrap it, because # Cargo is a standard Rust package itself. # # :registry # Cargo clones several Git repositories for its dependencies and # caches them in its "registry". This is an archive of this registry # so nothing is downloaded during the build. # # :rust_installer # This is a collection of mainly shell scripts which are used to # install Cargo. MASTER_SITES= https://static.rust-lang.org/cargo-dist/2016-05-22/:bootstrap \ LOCAL/jbeich:registry .if !defined(SKIP_CARGO_REGISTRY) DISTFILES+= ${CARGO_REGISTRY}:registry .endif 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 CARGO_BOOT_SIG= ${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl} CARGO_BOOT= ${PORTNAME}-nightly-${CARGO_BOOT_SIG}${EXTRACT_SUFX} CARGO_REGISTRY= ${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz # We don't USES=cmake here, because cmake is not Cargo's build system. # It's used by a bundled dependency (libgit2). BUILD_DEPENDS= cmake:devel/cmake \ ${RUST_PORT:T}>=1.5.0:${RUST_PORT} LIB_DEPENDS= libssh2.so:security/libssh2 \ libcurl.so:ftp/curl RUN_DEPENDS= rustc:${RUST_PORT} RUST_PORT?= lang/rust USES= gmake python:-2.7,build pkgconfig USE_OPENSSL= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" --mandir="${MANPREFIX}/man" MAKE_ENV= ARGS="${CARGO_ARGS}" CARGO_ARGS= --jobs ${MAKE_JOBS_NUMBER} .if defined(BATCH) || defined(PACKAGE_BUILDING) MAKE_ARGS+= VERBOSE=1 .endif OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFAULT=BOOTSTRAP BOOTSTRAP_DESC= Bootstrap using pre-built vendor snapshot BOOTSTRAP_CONFIGURE_OFF=--local-cargo="$$(command -v cargo)" # respect PATH BOOTSTRAP_DISTFILES= ${CARGO_BOOT}:bootstrap BOOTSTRAP_EXTRACT_ONLY= ${DISTFILES:N*\:bootstrap:C/:.*//} BOOTSTRAP_MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/target/snapshot/cargo/lib" .if !exists(/usr/lib/libssl.so.8) # OPENSSL_SHLIBVER 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/ post-patch: # Fix mandir and don't install licenses outside of ${_LICENSE_DIR} @${REINPLACE_CMD} -e 's,share/man,man,' \ -e 's,$$(S)LICENSE-[^[:space:]]* ,,g' \ ${WRKSRC}/Makefile.in # In case the previous "make stage" failed, this ensures rust's # install.sh won't backup previously staged files before reinstalling # new ones. Otheriwe, the staging directory is polluted with unneeded # files. pre-install: @if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-cargo; then \ ${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \ < ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-cargo \ | ${XARGS} ${RM}; \ fi @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/components \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-cargo \ ${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh post-install: @${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log @${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-cargo @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cargo @${RM} \ ${STAGEDIR}${PREFIX}/lib/rustlib/components \ ${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh # "make gen-registry" is a special target to ease this port update. # # After changing the version number and the Git revision, you can run # "make gen-registry" to update the distinfo and create a new snapshot of # the registry. The new registry is written to ${DISTDIR} and can be # uploaded. gen-registry: ${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY makesum ${MAKE} -C${.CURDIR} -DSKIP_CARGO_REGISTRY ${TAR} cJvf ${_DISTDIR}/${CARGO_REGISTRY} -C${WRKDIR} \ --uid 0 --gid 0 \ --exclude libgit2/tests/ \ --exclude curl/tests/ \ --exclude 'index/github.com-*/.git/' \ .cargo ${MAKE} -C${.CURDIR} makesum .include Index: head/devel/libbrotli/Makefile =================================================================== --- head/devel/libbrotli/Makefile (revision 420795) +++ head/devel/libbrotli/Makefile (revision 420796) @@ -1,34 +1,32 @@ # Created by: Sergey A. Osokin # $FreeBSD$ PORTNAME= libbrotli PORTVERSION= 1.0 PORTREVISION= 4 MASTER_SITES= https://github.com/bagder/libbrotli/archive/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} CATEGORIES= devel archivers MAINTAINER= osa@FreeBSD.org COMMENT= Library for generic-purpose lossless compression algorithm LICENSE= MIT BROTLI_VERSION= v0.4.0 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 .include Index: head/finance/moneymanagerex/Makefile =================================================================== --- head/finance/moneymanagerex/Makefile (revision 420795) +++ head/finance/moneymanagerex/Makefile (revision 420796) @@ -1,83 +1,72 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= mmex PORTVERSION= 1.2.7 DISTVERSIONPREFIX= v CATEGORIES= finance MASTER_SITES= https://github.com/vslavik/bakefile/releases/download/v0.2.9/:bakefile DISTFILES= bakefile-0.2.9${EXTRACT_SUFX}:bakefile MAINTAINER= ports@FreeBSD.org COMMENT= Free, open-source, easy-to-use personal finance software 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 USE_WX= 3.0 WX_CONF_ARGS= absolute INSTALLS_ICONS= yes USE_CXXSTD= c++11 CPPFLAGS+= -I${LOCALBASE}/include \ -DHAVE_ACOSH \ -DHAVE_ASINH \ -DHAVE_ATANH \ -DHAVE_ISBLANK \ $$(pkg-config --cflags lua-${LUA_VER}) LDFLAGS+= -L${LOCALBASE}/lib $$(pkg-config --libs lua-${LUA_VER}) PORTDOCS= * OPTIONS_DEFINE= DOCS .include .if ${CHOSEN_COMPILER_TYPE} == "gcc" 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: @${REINPLACE_CMD} -e \ 's|\*.txt|contrib.txt version.txt| ; \ s|-I$$(srcdir)/lib/lua/src || ; \ s|$$(LIBPREFIX)lua$$(LIBEXT) || ; \ s|-llua || ; \ s|$$(datadir)/man|$$(prefix)/man| ; \ s|-ldl$$||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '/^AC_INIT/s|1.2.3|${PORTVERSION}| ; \ s|\[noext\]|[]|' ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e \ 's| -g0 -O2||' ${WRKSRC}/m4/wxpresets.m4 .include Index: head/graphics/aseprite/Makefile =================================================================== --- head/graphics/aseprite/Makefile (revision 420795) +++ head/graphics/aseprite/Makefile (revision 420796) @@ -1,74 +1,65 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= aseprite PORTVERSION= 1.1.7 DISTVERSIONPREFIX= v CATEGORIES= graphics MAINTAINER= yuri@rawbw.com COMMENT= Animated sprite editor & pixel art tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt EXTRACT_DEPENDS= ${NONEXISTENT}:x11/pixman:extract LIB_DEPENDS= libfreetype.so:print/freetype2 \ liballeg.so:devel/allegro \ libpng.so:graphics/png \ libgif.so:graphics/giflib \ libcurl.so:ftp/curl \ libtinyxml.so:textproc/tinyxml BROKEN_FreeBSD_9= Fails due to compiler issues OPTIONS_DEFINE= WEBP 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 CMAKE_ARGS+= -DUSE_SHARED_ALLEGRO4=1 CMAKE_ARGS+= -DUSE_SHARED_GIFLIB=1 CMAKE_ARGS+= -DUSE_SHARED_ZLIB=1 CMAKE_ARGS+= -DUSE_SHARED_JPEGLIB=1 CMAKE_ARGS+= -DUSE_SHARED_LIBPNG=1 WEBP_CMAKE_ON+= -DWITH_WEBP_SUPPORT=1 WEBP_CMAKE_ON+= -DUSE_SHARED_LIBWEBP=1 CMAKE_ARGS+= -DUSE_SHARED_FREETYPE=1 CMAKE_ARGS+= -DUSE_SHARED_PIXMAN=1 CMAKE_ARGS+= -DUSE_SHARED_CURL=1 CMAKE_ARGS+= -DUSE_SHARED_TINYXML=1 CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR=${LOCALBASE}/include/freetype2 CXXFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include/freetype2 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/ post-patch: @${REINPLACE_CMD} -e 's|1.1.6-dev|${PORTVERSION}|' ${WRKSRC}/src/config.h ${WRKSRC}/data/gui.xml .include Index: head/net/pimd/Makefile =================================================================== --- head/net/pimd/Makefile (revision 420795) +++ head/net/pimd/Makefile (revision 420796) @@ -1,36 +1,33 @@ # $FreeBSD$ PORTNAME= pimd PORTVERSION= 2.3.2 CATEGORIES= net MAINTAINER= olivier@FreeBSD.org COMMENT= Lightweight stand-alone PIM-SM v2 multicast routing daemon LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE 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} 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 \ ${STAGEDIR}${PREFIX}/etc/pimd.conf.sample ${INSTALL_SCRIPT} ${FILESDIR}/pimd.in \ ${STAGEDIR}${PREFIX}/etc/rc.d/pimd ${INSTALL_MAN} ${WRKSRC}/pimd.8 ${STAGEDIR}${PREFIX}/man/man8/ .include Index: head/sysutils/hfm/Makefile =================================================================== --- head/sysutils/hfm/Makefile (revision 420795) +++ head/sysutils/hfm/Makefile (revision 420796) @@ -1,56 +1,50 @@ # $FreeBSD$ PORTNAME= hfm PORTVERSION= 1.2.3 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= 554b8425@razorfever.net COMMENT= Run tests in parallel at high frequency LICENSE= BSD2CLAUSE # gb 0.4 includes FreeBSD-specific fixes that this port requires # https://github.com/constabulary/gb/issues/506 BUILD_DEPENDS= go>=1.5:lang/go \ gb>=0.4:devel/gb \ ${LOCALBASE}/lib/libucl.a:textproc/libucl 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 USE_RC_SUBR= hfm MAKE_ARGS+= ETCDIR=${ETCDIR} TAG=${DISTVERSIONPREFIX}${PORTVERSION} 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 ) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/hfm ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/examples/hfm.conf.sample ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} .include Index: head/sysutils/ipfs-go/Makefile =================================================================== --- head/sysutils/ipfs-go/Makefile (revision 420795) +++ head/sysutils/ipfs-go/Makefile (revision 420796) @@ -1,54 +1,46 @@ # $FreeBSD$ PORTNAME= ipfs-go PORTVERSION= 0.3.10 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= wg@FreeBSD.org COMMENT= IPFS implementation in Go BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go BROKEN_i386= does not build 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} PLIST_FILES= bin/${PORTNAME} USE_RC_SUBR= ${PORTNAME} STRIP= # stripping can break go binaries .include .if ${ARCH} == i386 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: cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/ipfs/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/sysutils/osquery/Makefile =================================================================== --- head/sysutils/osquery/Makefile (revision 420795) +++ head/sysutils/osquery/Makefile (revision 420796) @@ -1,79 +1,76 @@ # Created by: Ryan Steinmetz # $FreeBSD$ PORTNAME= osquery PORTVERSION= 1.4.7 PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= zi@FreeBSD.org COMMENT= SQL powered OS instrumentation, monitoring, and analytics LICENSE= BSD3CLAUSE BUILD_DEPENDS= snappy>0:archivers/snappy \ rocksdb>0:databases/rocksdb \ thrift>0:devel/thrift \ thrift-cpp>0:devel/thrift-cpp \ bash>0:shells/bash \ yara>0:security/yara \ doxygen:devel/doxygen \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil \ ${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libgflags.so:devel/gflags \ libicuuc.so:devel/icu USES= cmake:outsource gmake libtool python:build compiler:c++11-lib CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \ SKIP_TESTS="yes" CC="${CC}" CXX="${CXX}" CMAKE_ARGS+= -DFREEBSD=awesome -DCMAKE_SYSTEM_NAME="FreeBSD" BLDDIR= ${WRKDIR}/.build/${PORTNAME} 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 .if ${OSVERSION} <= 1000000 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 ${REINPLACE_CMD} -e 's|/var/osquery/osquery.em|/var/run/osquery.em|g' \ -e 's|/etc/osquery/extensions.load|${PREFIX}/etc/osquery.extensions|g' \ -e 's|/etc/osquery/modules.load|${PREFIX}/etc/osquery.modules|g' \ ${WRKSRC}/osquery/extensions/extensions.cpp ${REINPLACE_CMD} -e 's|/var/osquery/osquery.conf|${PREFIX}/etc/osquery.conf|g' \ ${WRKSRC}/osquery/config/plugins/filesystem.cpp ${REINPLACE_CMD} -e 's|/var/osquery/|/var/db/osquery/|g' \ ${WRKSRC}/tools/deployment/osquery.example.conf ${REINPLACE_CMD} -e 's|python |${PYTHON_CMD} |g' \ ${WRKSRC}/CMake/CMakeLibs.cmake \ ${WRKSRC}/CMakeLists.txt do-install: ${INSTALL_PROGRAM} ${BLDDIR}/osqueryi ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${BLDDIR}/osqueryd ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${BLDDIR}/libosquery.a ${STAGEDIR}${PREFIX}/lib (cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include) ${INSTALL_DATA} ${WRKSRC}/tools/deployment/osquery.example.conf \ ${STAGEDIR}${PREFIX}/etc/osquery.conf.sample post-stage: ${MKDIR} ${STAGEDIR}/var/db/osquery .include Index: head/sysutils/packer/Makefile =================================================================== --- head/sysutils/packer/Makefile (revision 420795) +++ head/sysutils/packer/Makefile (revision 420796) @@ -1,37 +1,31 @@ # $FreeBSD$ PORTNAME= packer PORTVERSION= 0.10.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= swills@FreeBSD.org COMMENT= Tool for creating machine images BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go 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} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include