Index: head/devel/android-tools-adb/Makefile =================================================================== --- head/devel/android-tools-adb/Makefile (revision 430461) +++ head/devel/android-tools-adb/Makefile (revision 430462) @@ -1,104 +1,98 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- DISTVERSION?= 7.1.1_r4 PORTREVISION?= 0 CATEGORIES= devel comms .ifndef EXTRA_PATCHES PATCH_SITES= https://github.com/android/platform_system_core/commit/ PATCHFILES= b4cff495a1f9.patch:-p1 .endif MAINTAINER= jbeich@FreeBSD.org COMMENT= Android debug bridge command line tool LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= android GH_PROJECT= platform_system_core # Emulate GH_COMMIT without causing desync .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else GH_REVISION= 5cf8bbd5b29d # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* .ifndef EXTRA_PATCHES EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-adb_sysdeps_mutex.h EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file.cpp .endif USES= compiler:c++11-lib pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" ALL_TARGET= all TEST_TARGET= test PLIST_FILES= bin/adb PORTDOCS= * OPTIONS_DEFINE+=BASH DOCS TEST 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/adb BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" TEST_BUILD_DEPENDS+= googlemock>=1.6.0:devel/googlemock \ googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test pre-install-TEST-on: do-test 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 # XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0 @if [ ! -e /dev/full ]; then \ ${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \ ${WRKSRC}/adb/adb_io_test.cpp; \ fi 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 430461) +++ head/devel/android-tools-simpleperf/Makefile (revision 430462) @@ -1,53 +1,45 @@ # $FreeBSD$ PORTNAME= android-tools-simpleperf DISTVERSIONPREFIX= android- DISTVERSION= 7.1.1_r4 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Android simpleperf tool LICENSE= APACHE20 BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} USE_GITHUB= yes GH_ACCOUNT= android:bionic,core jbeich GH_PROJECT= platform_bionic:bionic platform_system_core:core \ platform_system_extras GH_SUBDIR= bionic:bionic 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}) -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/fb-adb/files/patch-util.c =================================================================== --- head/devel/fb-adb/files/patch-util.c (revision 430461) +++ head/devel/fb-adb/files/patch-util.c (nonexistent) @@ -1,12 +0,0 @@ ---- util.c.orig 2015-10-09 22:02:18 UTC -+++ util.c -@@ -1563,3 +1563,9 @@ xregerror(int errcode, const regex_t* pr - reslist_xfer(rl->parent, rl); - return (char*) gb.buf; - } -+ -+#ifndef __linux__ -+// XXX For GCC 4.4 or older -+__weak_reference(my_unreachable, __builtin_unreachable); -+void my_unreachable() { abort(); } -+#endif Property changes on: head/devel/fb-adb/files/patch-util.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/fb-adb/Makefile =================================================================== --- head/devel/fb-adb/Makefile (revision 430461) +++ head/devel/fb-adb/Makefile (revision 430462) @@ -1,97 +1,93 @@ # $FreeBSD$ PORTNAME= fb-adb DISTVERSION= 1.4.4-126 DISTVERSIONSUFFIX= -g6fd78ae CATEGORIES= devel comms MAINTAINER= jbeich@FreeBSD.org COMMENT= Better shell for Android devices LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= xxd:editors/vim-lite \ ${BASH_CMD}:shells/${BASH_CMD:T} RUN_DEPENDS= adb:devel/android-tools-adb USE_GITHUB= yes GH_ACCOUNT= facebook USES= autoreconf gmake ncurses perl5 python:3,build USE_PERL5= build # pod2man BASH_CMD?= bash # can be zsh GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes CONFIGURE_ENV= PYTHON3="${PYTHON_CMD}" INSTALL_TARGET= install-strip PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz # Cross-build sanitization CONFIG_SITE= /dev/null # XXX Only for AC_CONFIG_SUBDIRS CONFIGURE_ENV+= HOST_CFLAGS="${CPPFLAGS} ${CFLAGS:N-[Og]*:N-pipe}" \ STUB_CFLAGS="${STUB_CFLAGS}" \ CPPFLAGS="" CFLAGS="${CFLAGS:M-[Og]*} ${CFLAGS:M-pipe}" \ HOST_LDFLAGS="${LDFLAGS} ${LIBS}" \ STUB_LDFLAGS="${STUB_LDFLAGS}" \ LDFLAGS="" LIBS="" OPTIONS_DEFINE= ASSERT BASH DEBUG NDK OPTIONS_DEFAULT=NDK OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/NDK/} OPTIONS_EXCLUDE_DragonFly=NDK ASSERT_CONFIGURE_ENABLE=checking BASH_DESC= Install JSON parser used by bash-completion BASH_RUN_DEPENDS= jq:textproc/jq DEBUG_CONFIGURE_ENABLE= debuggable-stubs # XXX Convert into USES=android once more things depend on it NDK_DESC= Build target stubs using Android NDK NDK_MASTER_SITES= https://dl.google.com/android/ndk/:7z \ https://dl.google.com/android/repository/:zip .if defined(ANDROID_NDK) # Prefer NDK from environment WRKSRC_ndk= ${ANDROID_NDK} .else NDK_DISTFILES= ${NDK_DISTFILES_${LINUX_ARCH}} NDK_DISTFILES_i386= android-ndk-r10e-linux-x86.bin:7z NDK_DISTFILES_x86_64= android-ndk-r12b-linux-x86_64.zip:zip WRKSRC_ndk= ${WRKDIR}/${NDK_DISTFILES:R:C/(-[^-]+){2}$//} .endif NDK_USES= 7z:partial linux NDK_USE= LINUX=base:build NDK_SHELL= ${LINUXBASE}/bin/sh NDK_CONFIGURE_ENV= ANDROID_NDK="${WRKSRC_ndk}" \ ANDROID_NDK_SHELL="${NDK_SHELL}" \ NDK_TMPDIR="${WRKDIR}" NDK_BUILD_DEPENDS_OFF= ${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-androideabi-gcc:lang/gnatdroid-armv7 \ ${LOCALBASE}/android-x86/x86_32/bin/i686-aux-linux-android-gcc:lang/gnatdroid-x86 -.if defined(.PARSEDIR) NDK_CONFIGURE_ENV_OFF= PATH="${NDK_BUILD_DEPENDS_OFF:C/:.*//:H:ts:}:$$PATH" -.else -NDK_CONFIGURE_ENV_OFF= PATH="${LOCALBASE}/android/ARMv7/bin:${LOCALBASE}/android-x86/x86_32/bin:$$PATH" -.endif NDK_CONFIGURE_OFF= --with-android-ndk=system post-extract: # XXX gold: fatal error: a.out: Invalid argument @for f in $$(${FIND} ${WRKSRC_ndk} -type l -name '*-ld'); do \ (cd $${f%/*} && ${LN} -sf $${f##*/}.bfd $${f##*/}); \ done post-patch: # XXX Decouple -Werror from --enable-checking (ASSERT=on) @${REINPLACE_CMD} -e '/CPPFLAGS.*-Werror/d' ${WRKSRC}/configure.ac post-patch-NDK-on: @${REINPLACE_CMD} 's,mkdir,/compat/linux/../../bin/mkdir,' \ ${WRKSRC_ndk}/build/tools/make-standalone-toolchain.sh \ ${WRKSRC_ndk}/build/tools/ndk-common.sh post-patch-NDK-off: @${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \ ${WRKSRC}/stub-*/configure .include Index: head/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h =================================================================== --- head/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h (revision 430461) +++ head/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h (nonexistent) @@ -1,34 +0,0 @@ -std::tuple_element_t appeared in FreeBSD 10.2 (libcxx r202673) but -USES=compiler cannot pull newer C++14-compatible libc++ version. - - In file included from externals/dynarmic/src/frontend/disassembler/disassembler_arm.cpp:15: - In file included from externals/dynarmic/src/./frontend/decoder/arm.h:18: - In file included from externals/dynarmic/src/./frontend/decoder/decoder_detail.h:14: - externals/dynarmic/src/./common/mp.h:34:27: fatal error: no template named 'tuple_element_t' in namespace 'std'; did you mean 'tuple_element'? - using type = std::tuple_element_t>; - ~~~~~^~~~~~~~~~~~~~~ - tuple_element - /usr/include/c++/v1/__tuple:44:62: note: 'tuple_element' declared here - template class _LIBCPP_TYPE_VIS_ONLY tuple_element; - ^ - ---- externals/dynarmic/src/common/mp.h.orig 2016-09-14 22:03:09 UTC -+++ externals/dynarmic/src/common/mp.h -@@ -9,6 +9,17 @@ - #include - #include - -+#ifdef __FreeBSD__ -+#include -+# if defined(_LIBCPP_VERSION) && __FreeBSD_version < 1001508 -+// Copied from -+namespace std { -+ template -+ using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type; -+} -+# endif -+#endif -+ - namespace Dynarmic { - namespace mp { - Property changes on: head/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/ppsspp/Makefile =================================================================== --- head/emulators/ppsspp/Makefile (revision 430461) +++ head/emulators/ppsspp/Makefile (revision 430462) @@ -1,100 +1,99 @@ # $FreeBSD$ PORTNAME= ppsspp DISTVERSIONPREFIX= v DISTVERSION?= 1.3 PORTREVISION?= 3 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage DISTFILES= ${PORTNAME}.1:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} MAINTAINER= jbeich@FreeBSD.org COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS LICENSE= GPLv2+ LIB_DEPENDS= libzip.so:archivers/libzip \ libsnappy.so:archivers/snappy \ libavcodec.so:multimedia/ffmpeg RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard GH_TUPLE?= hrydgard:${PORTNAME}-lang:cdf4a8d:lang/lang \ Kingcom:armips:1ffab37:armips/ext/armips CONFLICTS_INSTALL= ${PORTNAME}-* # [QT4] FakeJit.cpp:42:37: error: no matching constructor for initialization of 'JitBlockCache' # [QT5] c++: error: the clang compiler does not support '-march=armv7-a' # [SDL] SplineCommon.cpp:639:17: error: use of undeclared identifier 'AllocateAlignedMemory' BROKEN_aarch64= https://github.com/hrydgard/ppsspp/issues/9032 USES= compiler:c++11-lib localbase:ldflags pkgconfig EXCLUDE= glew snappy libzip zlib EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} USE_GL= glew glu USE_SDL= sdl2 # joystick CMAKE_ARGS= -DUSE_SYSTEM_FFMPEG=on QMAKE_SOURCE_PATH= ${WRKSRC}/Qt/PPSSPPQt.pro QMAKE_ARGS= CONFIG+="system_ffmpeg" LREL_TOOL="${LRELEASE}" NO_INSTALL= yes # ports/202949 DESKTOP_ENTRIES="PPSSPP" \ "" \ "${PORTNAME}" \ "${PORTNAME} %f" \ "Game;Emulator;" \ "" OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= QT4 QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_SINGLE_GUI} QT4_USES= qmake:outsource QT4_USE= QT4=qmake_build,moc_build,rcc_build,uic_build,linguisttools_build,gui,opengl QT5_USES= qmake:outsource QT5_USE= QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets SDL_USES= cmake:outsource SDL_BUILD_DEPENDS= png>=1.6:graphics/png SDL_LIB_DEPENDS= libpng.so:graphics/png SDL_VARS= PORTDATA+="assets ${PORTNAME}" post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/UI/NativeApp.cpp @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ ${WRKSRC}/Qt/*.pr* @${REINPLACE_CMD} \ -e 's/"unknown"/"${GH_TAGNAME}"/' \ -e 's/^\(VERSION =\).*/\1 ${GH_TAGNAME}/' \ ${WRKSRC}/git-version.cmake \ ${WRKSRC}/Qt/Settings.pri do-install-SDL-on: # cmake doesn't pack assets into the app unlike qmake -# XXX Convert to ${PORTDATA:N${PORTNAME}} once fmake is EOL (cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \ - "${PORTDATA:Nppsspp}" ${STAGEDIR}${DATADIR}) + "${PORTDATA:N${PORTNAME}}" ${STAGEDIR}${DATADIR}) # Install the app alongside assets to avoid warnings with GetExeDirectory() ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME:tu}* \ ${STAGEDIR}${DATADIR}/${PORTNAME} ${LN} -sf ${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin do-install-SDL-off: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin post-install: ${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 (cd ${WRKSRC}/assets/unix-icons && ${COPYTREE_SHARE} \ "hicolor" ${STAGEDIR}${PREFIX}/share/icons) ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} ${WRKSRC}/assets/unix-icons/icon-512.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg .include Index: head/graphics/colmap/Makefile =================================================================== --- head/graphics/colmap/Makefile (revision 430461) +++ head/graphics/colmap/Makefile (revision 430462) @@ -1,95 +1,92 @@ # $FreeBSD$ PORTNAME= colmap DISTVERSION= 2.1 PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Structure from motion and multi-view stereo LICENSE= BSD2CLAUSE BSD3CLAUSE CC-BY-3.0 GPLv3+ MIT SIFTGPU LICENSE_COMB= multi LICENSE_NAME_SIFTGPU= SiftGPU non-commercial license LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/src/ext/VLFeat/LICENSE LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/src/ext/FLANN/LICENSE LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/src/ui/media/LICENSE LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING.txt LICENSE_FILE_MIT= ${WRKSRC}/src/ext/PoissonRecon/LICENSE LICENSE_FILE_SIFTGPU= ${WRKSRC}/src/ext/SiftGPU/LICENSE LICENSE_PERMS_SIFTGPU= dist-mirror pkg-mirror auto-accept BUILD_DEPENDS= eigen>=3:math/eigen3 LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libglog.so:devel/glog \ libfreeimage.so:graphics/freeimage \ libceres.so:math/ceres-solver USES= cmake compiler:${OPENMP}c++11-lib fortran localbase sqlite USE_GITHUB= yes USE_GL= gl glew glut USE_QT5= qmake_build buildtools_build core gui opengl_build widgets EXCLUDE= SQLite EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude src/ext/,} CMAKE_ARGS= -DBOOST_STATIC=off -DCUDA_ENABLED=off CFLAGS+= -DVL_OS_LINUX=1 CXXFLAGS+= -fpermissive # libc++ vs. g++49 CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 LDFLAGS+= -Wl,--as-needed # gflags, glu, xi, xmu TEST_TARGET= test ARGS="-V" OPTIONS_DEFINE= DOCS OPENMP SIMD OPTIONS_DEFAULT= OPENMP SIMD -# XXX ports/215138: exclude still broken -OPTIONS_EXCLUDE= ${OPTIONS_EXCLUDE_${OPSYS}_${OSREL}} # not OSREL:R -OPTIONS_EXCLUDE_FreeBSD_10.1= OPENMP DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_USES= gmake DOCS_PORTDOCS= * OPENMP_USES= compiler:openmp OPENMP_CMAKE_BOOL= OPENMP_ENABLED # XXX ports/199603 + ports/210337 OPENMP_VARS= OPENMP=gcc- SIMD_CMAKE_BOOL= SIMD_ENABLED post-patch: @${REINPLACE_CMD} -e 's/Qt5OpenGL/Qt5Widgets/' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/install.*test/d' \ ${WRKSRC}/cmake/CMakeHelper.cmake # XXX Unbundle FLANN as it has more consumers @${REINPLACE_CMD} -e '/SQLite/d' \ ${WRKSRC}/src/ext/CMakeLists.txt @${REINPLACE_CMD} -e 's,ext/SQLite/,,' \ ${WRKSRC}/src/base/database.h \ ${WRKSRC}/src/util/sqlite3_utils.h .if !defined(DISPLAY) # QApplication @${REINPLACE_CMD} -e '/feature_matching_test/d' \ -e '/feature_extraction_test/d' \ ${WRKSRC}/src/base/CMakeLists.txt @${REINPLACE_CMD} -e '/opengl_utils_test/d' \ ${WRKSRC}/src/util/CMakeLists.txt .endif post-build-DOCS-on: @${DO_MAKE_BUILD} html -C${WRKSRC}/doc pre-install: do-test post-install-DOCS-on: (cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include # FreeBSD 11.0 i386 has: # 7 - base/database_test (Failed) # 26 - estimators/epnp_test (Failed) # 34 - mvs/depth_map_test (Failed) # 39 - optim/loransac_test (Failed) # 42 - optim/ransac_test (Failed) do-test: .IGNORE Index: head/multimedia/libmtp/Makefile =================================================================== --- head/multimedia/libmtp/Makefile (revision 430461) +++ head/multimedia/libmtp/Makefile (revision 430462) @@ -1,41 +1,29 @@ # Created by: Petar Zhivkov Petrov # $FreeBSD$ PORTNAME= libmtp PORTVERSION= 1.1.12 CATEGORIES= multimedia audio MASTER_SITES= SF MAINTAINER= jbeich@FreeBSD.org COMMENT= Media Transfer Protocol (MTP) library LICENSE= LGPL21+ CONFLICTS_INSTALL=libosmo-sccp-[0-9]* # lib/libmtp.a USES= iconv libtool localbase pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= MTPZ OPTIONS_DEFAULT=MTPZ MTPZ_DESC= Enable functionality to connect to MTPZ devices MTPZ_CONFIGURE_ENABLE= mtpz MTPZ_LIB_DEPENDS= libgcrypt.so:security/libgcrypt -.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) -CONFIGURE_ENV+= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb" -.endif - -post-patch: -.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) - @${REINPLACE_CMD} -i .pkgconf.bak -e \ - '/LIBUSB_REQUIRES/s|libusb-1.0||' ${WRKSRC}/configure - @${REINPLACE_CMD} -i .pkgconf.bak -e \ - '/Libs.private/s|:|& @LIBUSB_LIBS@|' ${WRKSRC}/libmtp.pc.in -.endif - .include Index: head/sysutils/android-file-transfer/files/libusb-1.0.pc =================================================================== --- head/sysutils/android-file-transfer/files/libusb-1.0.pc (revision 430461) +++ head/sysutils/android-file-transfer/files/libusb-1.0.pc (nonexistent) @@ -1,11 +0,0 @@ -# $FreeBSD: head/lib/libusb/libusb-1.0.pc 267110 2014-06-05 14:19:32Z emaste $ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: libusb-1.0 -Description: Library that abstracts ways to access USB devices (v1.0) -Version: 1.0.13 -Libs: -L${libdir} -lusb -Cflags: -I${includedir} Property changes on: head/sysutils/android-file-transfer/files/libusb-1.0.pc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/android-file-transfer/Makefile =================================================================== --- head/sysutils/android-file-transfer/Makefile (revision 430461) +++ head/sysutils/android-file-transfer/Makefile (revision 430462) @@ -1,58 +1,54 @@ # $FreeBSD$ PORTNAME= android-file-transfer DISTVERSIONPREFIX= v DISTVERSION= 3.0-14 DISTVERSIONSUFFIX= -g5a818d8 PORTREVISION?= 0 CATEGORIES= sysutils MAINTAINER= jbeich@FreeBSD.org COMMENT= Android MTP client with minimalistic UI LICENSE= GPLv3+ USE_GITHUB= yes GH_ACCOUNT= whoozle GH_PROJECT= ${PORTNAME}-linux USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig CMAKE_ARGS= -DUSB_BACKEND_LIBUSB=on -DBUILD_QT_UI=off OPTIONS_DEFAULT=CLI FUSE OPTIONS_MULTI= COMP OPTIONS_MULTI_COMP= CLI FUSE OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= QT4 QT5 OPTIONS_EXCLUDE:= ${OPTIONS_EXCLUDE} ${OPTIONS_RADIO_GUI} # XXX http://lists.dragonflybsd.org/pipermail/users/2016-September/313064.html OPTIONS_EXCLUDE_DragonFly= FUSE COMP_DESC= Components CLI_DESC= CLI (Command-Line Interface) support CLI_USES= readline CLI_PLIST_FILES=bin/aft-mtp-cli FUSE_USES= fuse FUSE_CMAKE_BOOL=BUILD_FUSE FUSE_PLIST_FILES=bin/aft-mtp-mount QT4_USE= QT4=qmake_build,moc_build,rcc_build,uic_build,corelib,gui QT4_CMAKE_ON= -DBUILD_QT_UI=on -DDESIRED_QT_VERSION=4 QT4_PLIST_FILES=${QT5_PLIST_FILES} QT5_USE= QT5=qmake_build,buildtools_build,core,gui,widgets QT5_CMAKE_ON= -DBUILD_QT_UI=on -DDESIRED_QT_VERSION=5 QT5_PLIST_FILES=bin/android-file-transfer \ share/applications/android-file-transfer.desktop \ share/icons/hicolor/128x128/apps/android-file-transfer.png -.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) -CONFIGURE_ENV+= PKG_CONFIG_PATH="${FILESDIR}" -.endif - post-patch-CLI-off: @${REINPLACE_CMD} '/subdirectory(cli)/d' ${WRKSRC}/CMakeLists.txt .include Index: head/sysutils/fusefs-simple-mtpfs/Makefile =================================================================== --- head/sysutils/fusefs-simple-mtpfs/Makefile (revision 430461) +++ head/sysutils/fusefs-simple-mtpfs/Makefile (revision 430462) @@ -1,48 +1,44 @@ # $FreeBSD$ PORTNAME= simple-mtpfs DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 0.3.0 CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- MAINTAINER= jbeich@FreeBSD.org COMMENT= Simple MTP fuse filesystem driver LICENSE= GPLv2+ LIB_DEPENDS= libmtp.so:multimedia/libmtp USE_GITHUB= yes GH_ACCOUNT= phatina USES= autoreconf compiler:c++11-lib fuse localbase pkgconfig GNU_CONFIGURE= yes MAKEFILE= makefile INSTALL_TARGET= install-strip PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz PORTDOCS= AUTHORS NEWS README.md OPTIONS_DEFINE= DOCS -.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) -CONFIGURE_ENV+= LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb" -.endif - # XXX move to PREFIX when bug 193596 lands .if exists(/etc/autofs) PLIST_FILES+= /etc/autofs/special_${PORTNAME} SUB_FILES+= special_${PORTNAME} .endif post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .if exists(/etc/autofs) @${MKDIR} ${STAGEDIR}/etc/autofs ${INSTALL_SCRIPT} ${WRKDIR}/special_${PORTNAME} \ ${STAGEDIR}/etc/autofs .endif .include