From owner-svn-ports-all@freebsd.org Tue Jan 3 12:49:41 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C598C9DF25; Tue, 3 Jan 2017 12:49:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 471F11143; Tue, 3 Jan 2017 12:49:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v03Cne6U084056; Tue, 3 Jan 2017 12:49:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03CndWt084048; Tue, 3 Jan 2017 12:49:39 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701031249.v03CndWt084048@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 3 Jan 2017 12:49:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430462 - in head: devel/android-tools-adb devel/android-tools-simpleperf devel/fb-adb devel/fb-adb/files emulators/citra/files emulators/ppsspp graphics/colmap multimedia/libmtp sysuti... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2017 12:49:41 -0000 Author: jbeich Date: Tue Jan 3 12:49:39 2017 New Revision: 430462 URL: https://svnweb.freebsd.org/changeset/ports/430462 Log: Drop pre-10.3 support in my ports Figuring out which GCC hacks are safe to drop is tricky but at least devel/fb-adb is limited to x86 due to ADA bootstrap. Deleted: head/devel/fb-adb/files/ head/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h head/sysutils/android-file-transfer/files/ Modified: head/devel/android-tools-adb/Makefile (contents, props changed) head/devel/android-tools-simpleperf/Makefile (contents, props changed) head/devel/fb-adb/Makefile (contents, props changed) head/emulators/ppsspp/Makefile (contents, props changed) head/graphics/colmap/Makefile (contents, props changed) head/multimedia/libmtp/Makefile (contents, props changed) head/sysutils/android-file-transfer/Makefile (contents, props changed) head/sysutils/fusefs-simple-mtpfs/Makefile (contents, props changed) Modified: head/devel/android-tools-adb/Makefile ============================================================================== --- head/devel/android-tools-adb/Makefile Tue Jan 3 12:27:55 2017 (r430461) +++ head/devel/android-tools-adb/Makefile Tue Jan 3 12:49:39 2017 (r430462) @@ -69,12 +69,6 @@ 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_&/' \ Modified: head/devel/android-tools-simpleperf/Makefile ============================================================================== --- head/devel/android-tools-simpleperf/Makefile Tue Jan 3 12:27:55 2017 (r430461) +++ head/devel/android-tools-simpleperf/Makefile Tue Jan 3 12:49:39 2017 (r430462) @@ -40,14 +40,6 @@ 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 Modified: head/devel/fb-adb/Makefile ============================================================================== --- head/devel/fb-adb/Makefile Tue Jan 3 12:27:55 2017 (r430461) +++ head/devel/fb-adb/Makefile Tue Jan 3 12:49:39 2017 (r430462) @@ -68,11 +68,7 @@ NDK_CONFIGURE_ENV= ANDROID_NDK="${WRKSRC 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: Modified: head/emulators/ppsspp/Makefile ============================================================================== --- head/emulators/ppsspp/Makefile Tue Jan 3 12:27:55 2017 (r430461) +++ head/emulators/ppsspp/Makefile Tue Jan 3 12:49:39 2017 (r430462) @@ -76,9 +76,8 @@ post-patch: 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} Modified: head/graphics/colmap/Makefile ============================================================================== --- head/graphics/colmap/Makefile Tue Jan 3 12:27:55 2017 (r430461) +++ head/graphics/colmap/Makefile Tue Jan 3 12:49:39 2017 (r430462) @@ -41,9 +41,6 @@ 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 Modified: head/multimedia/libmtp/Makefile ============================================================================== --- head/multimedia/libmtp/Makefile Tue Jan 3 12:27:55 2017 (r430461) +++ head/multimedia/libmtp/Makefile Tue Jan 3 12:49:39 2017 (r430462) @@ -26,16 +26,4 @@ MTPZ_DESC= Enable functionality to conne 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 Modified: head/sysutils/android-file-transfer/Makefile ============================================================================== --- head/sysutils/android-file-transfer/Makefile Tue Jan 3 12:27:55 2017 (r430461) +++ head/sysutils/android-file-transfer/Makefile Tue Jan 3 12:49:39 2017 (r430462) @@ -48,10 +48,6 @@ QT5_PLIST_FILES=bin/android-file-transfe 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 Modified: head/sysutils/fusefs-simple-mtpfs/Makefile ============================================================================== --- head/sysutils/fusefs-simple-mtpfs/Makefile Tue Jan 3 12:27:55 2017 (r430461) +++ head/sysutils/fusefs-simple-mtpfs/Makefile Tue Jan 3 12:49:39 2017 (r430462) @@ -26,10 +26,6 @@ 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}