From owner-svn-ports-head@freebsd.org Thu Aug 20 11:15:08 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A67C3BAD83; Thu, 20 Aug 2020 11:15:08 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BXMWH6lT8z4JlP; Thu, 20 Aug 2020 11:15:07 +0000 (UTC) (envelope-from 0mp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBE4A137CB; Thu, 20 Aug 2020 11:15:07 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07KBF7V2086293; Thu, 20 Aug 2020 11:15:07 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07KBF765086292; Thu, 20 Aug 2020 11:15:07 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202008201115.07KBF765086292@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Thu, 20 Aug 2020 11:15:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545528 - head/devel/distcc X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/devel/distcc X-SVN-Commit-Revision: 545528 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2020 11:15:08 -0000 Author: 0mp Date: Thu Aug 20 11:15:07 2020 New Revision: 545528 URL: https://svnweb.freebsd.org/changeset/ports/545528 Log: devel/distcc: Clean up using portfmt Modified: head/devel/distcc/Makefile Modified: head/devel/distcc/Makefile ============================================================================== --- head/devel/distcc/Makefile Thu Aug 20 11:09:38 2020 (r545527) +++ head/devel/distcc/Makefile Thu Aug 20 11:15:07 2020 (r545528) @@ -17,13 +17,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty LIB_DEPENDS= libpopt.so:devel/popt -USES= autoreconf alias gmake libtool localbase pkgconfig +USES= alias autoreconf gmake libtool localbase pkgconfig USE_GITHUB= yes USE_RC_SUBR= distccd GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-Werror --sysconfdir=${ETCDIR} \ - CC="${CC}" PTHREAD_CC="${CC}" +CONFIGURE_ARGS= --disable-Werror \ + --sysconfdir=${ETCDIR} \ + CC="${CC}" \ + PTHREAD_CC="${CC}" TEST_TARGET= check @@ -35,15 +37,15 @@ SUB_LIST= DISTCCD_PIDFILE=/var/run/distccd.pid USERS= distcc GROUPS= distcc -PLIST_FILES= ${_BIN_FILES:S|^|bin/|} -PLIST_FILES+= ${_DISTCC_COMPILERS:S|^|${CCLINKDIR}/|} -PLIST_FILES+= ${_MAN_FILES:S|^|man/man1/|:S|$|.gz|} -PLIST_FILES+= ${_SBIN_FILES:S|^|sbin/|} -PLIST_FILES+= ${_CONFIG_FILES:S|^|${ETCDIR}/${PORTNAME}/|} -PLIST_FILES+= etc/default/distcc +PLIST_FILES= ${_BIN_FILES:S|^|bin/|} \ + ${_CONFIG_FILES:S|^|${ETCDIR}/${PORTNAME}/|} \ + ${_DISTCC_COMPILERS:S|^|${CCLINKDIR}/|} \ + ${_MAN_FILES:S|^|man/man1/|:S|$|.gz|} \ + ${_SBIN_FILES:S|^|sbin/|} \ + etc/default/distcc -OPTIONS_DEFINE= AVAHI CLANGLINK DOCS IPV6 LLVMLINK PUMP -OPTIONS_RADIO= GUI +OPTIONS_DEFINE= AVAHI CLANGLINK DOCS IPV6 LLVMLINK PUMP +OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= GNOME GTK CLANGLINK_DESC= Create clang compiler links if clang is installed @@ -55,56 +57,55 @@ PUMP_DESC= Distribute compilation as well as preproces AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_CONFIGURE_WITH= avahi -DOCS_PLIST_FILES= ${_README_FILES:S|^|${DOCSDIR_REL}/|} -DOCS_PLIST_FILES+= ${_DOC_FILES:S|^|${DOCSDIR_REL}/|} -GNOME_USES= gnome -GNOME_USE= GNOME=gtk20,libgnome,libgnomeui,pango +DOCS_PLIST_FILES+= ${_DOC_FILES:S|^|${DOCSDIR_REL}/|} \ + ${_README_FILES:S|^|${DOCSDIR_REL}/|} +GNOME_USES= gnome +GNOME_USE= GNOME=gtk20,libgnome,libgnomeui,pango GNOME_CONFIGURE_WITH= gnome -GTK_USES= gnome -GTK_USE= GNOME=gtk20 +GTK_USES= gnome +GTK_USE= GNOME=gtk20 GTK_CONFIGURE_WITH= gtk IPV6_CONFIGURE_ENABLE= rfc2553 PUMP_USES= python:3.1+ PUMP_CONFIGURE_ENABLE= pump-mode -PUMP_PLIST_FILES= \ - ${PYTHON_SITELIBDIR}/include_server-${PORTVERSION}-py${PYTHON_VER}.egg-info \ - ${PYTHON_SITELIBDIR}/include_server/distcc_pump_c_extensions.so \ - ${PYTHON_SITELIBDIR}/include_server/include_server.py \ - ${PYTHON_SITELIBDIR}/include_server/include_server_test.py \ - ${PYTHON_SITELIBDIR}/include_server/include_analyzer_test.py \ - ${PYTHON_SITELIBDIR}/include_server/include_analyzer_memoizing_node_test.py \ - ${PYTHON_SITELIBDIR}/include_server/include_analyzer_memoizing_node.py \ - ${PYTHON_SITELIBDIR}/include_server/include_analyzer.py \ - ${PYTHON_SITELIBDIR}/include_server/basics.py \ - ${PYTHON_SITELIBDIR}/include_server/basics_test.py \ - ${PYTHON_SITELIBDIR}/include_server/c_extensions_test.py \ - ${PYTHON_SITELIBDIR}/include_server/cache_basics.py \ - ${PYTHON_SITELIBDIR}/include_server/compiler_defaults.py \ - ${PYTHON_SITELIBDIR}/include_server/compress_files.py \ - ${PYTHON_SITELIBDIR}/include_server/macro_eval.py \ - ${PYTHON_SITELIBDIR}/include_server/macro_eval_test.py \ - ${PYTHON_SITELIBDIR}/include_server/mirror_path.py \ - ${PYTHON_SITELIBDIR}/include_server/mirror_path_test.py \ - ${PYTHON_SITELIBDIR}/include_server/parse_command.py \ - ${PYTHON_SITELIBDIR}/include_server/parse_command_test.py \ - ${PYTHON_SITELIBDIR}/include_server/parse_file.py \ - ${PYTHON_SITELIBDIR}/include_server/parse_file_test.py \ - ${PYTHON_SITELIBDIR}/include_server/run.py \ - ${PYTHON_SITELIBDIR}/include_server/setup.py \ - ${PYTHON_SITELIBDIR}/include_server/statistics.py +PUMP_PLIST_FILES= ${PYTHON_SITELIBDIR}/include_server-${PORTVERSION}-py${PYTHON_VER}.egg-info \ + ${PYTHON_SITELIBDIR}/include_server/basics.py \ + ${PYTHON_SITELIBDIR}/include_server/basics_test.py \ + ${PYTHON_SITELIBDIR}/include_server/c_extensions_test.py \ + ${PYTHON_SITELIBDIR}/include_server/cache_basics.py \ + ${PYTHON_SITELIBDIR}/include_server/compiler_defaults.py \ + ${PYTHON_SITELIBDIR}/include_server/compress_files.py \ + ${PYTHON_SITELIBDIR}/include_server/distcc_pump_c_extensions.so \ + ${PYTHON_SITELIBDIR}/include_server/include_analyzer.py \ + ${PYTHON_SITELIBDIR}/include_server/include_analyzer_memoizing_node.py \ + ${PYTHON_SITELIBDIR}/include_server/include_analyzer_memoizing_node_test.py \ + ${PYTHON_SITELIBDIR}/include_server/include_analyzer_test.py \ + ${PYTHON_SITELIBDIR}/include_server/include_server.py \ + ${PYTHON_SITELIBDIR}/include_server/include_server_test.py \ + ${PYTHON_SITELIBDIR}/include_server/macro_eval.py \ + ${PYTHON_SITELIBDIR}/include_server/macro_eval_test.py \ + ${PYTHON_SITELIBDIR}/include_server/mirror_path.py \ + ${PYTHON_SITELIBDIR}/include_server/mirror_path_test.py \ + ${PYTHON_SITELIBDIR}/include_server/parse_command.py \ + ${PYTHON_SITELIBDIR}/include_server/parse_command_test.py \ + ${PYTHON_SITELIBDIR}/include_server/parse_file.py \ + ${PYTHON_SITELIBDIR}/include_server/parse_file_test.py \ + ${PYTHON_SITELIBDIR}/include_server/run.py \ + ${PYTHON_SITELIBDIR}/include_server/setup.py \ + ${PYTHON_SITELIBDIR}/include_server/statistics.py # Leave CCLINKDIR without a leading underscore as it is a variable, which could # be set by the user. -CCLINKDIR?= libexec/distcc +CCLINKDIR?= libexec/distcc _DISTCC_COMPILERS= CC c++ cc _CONFIG_FILES= clients.allow commands.allow.sh hosts _BIN_FILES= distcc distccmon-text lsdistcc _DOC_FILES= protocol-1.txt protocol-2.txt protocol-3.txt \ - protocol-3-impl.txt protocol-gssapi.txt \ - reporting-bugs.txt status-1.txt survey.txt -_MAN_FILES= distcc.1 distccd.1 distccmon-text.1 include_server.1 \ - lsdistcc.1 pump.1 + protocol-3-impl.txt protocol-gssapi.txt reporting-bugs.txt \ + status-1.txt survey.txt +_MAN_FILES= distcc.1 distccd.1 distccmon-text.1 include_server.1 lsdistcc.1 \ + pump.1 _README_FILES= AUTHORS COPYING INSTALL NEWS README README.pump TODO _SBIN_FILES= distccd @@ -112,14 +113,12 @@ _SBIN_FILES= distccd .if ${PORT_OPTIONS:MCLANGLINK} CLANG_COMPILERS= -devel 31 32 33 34 35 36 37 38 39 -_DISTCC_COMPILERS+= clang++ clang -_DISTCC_COMPILERS+= ${CLANG_COMPILERS:S|^|clang++|} -_DISTCC_COMPILERS+= ${CLANG_COMPILERS:S|^|clang|} +_DISTCC_COMPILERS+= clang++ clang ${CLANG_COMPILERS:S|^|clang++|} \ + ${CLANG_COMPILERS:S|^|clang|} .endif GNU_COMPILERS= 34 42 43 44 45 46 47 48 49 5 -_DISTCC_COMPILERS+= gcc g++ -_DISTCC_COMPILERS+= ${GNU_COMPILERS:S|^|g++|} -_DISTCC_COMPILERS+= ${GNU_COMPILERS:S|^|gcc|} +_DISTCC_COMPILERS+= gcc g++ ${GNU_COMPILERS:S|^|g++|} \ + ${GNU_COMPILERS:S|^|gcc|} .if ${ARCH} == "i386" _DISTCC_COMPILERS+= icc icpc .endif @@ -135,8 +134,8 @@ PKGNAMESUFFIX= -gnome PKGNAMESUFFIX= -gtk .endif _BIN_FILES+= distccmon-gnome -PLIST_FILES+= ${DESKTOPDIR}/distccmon-gnome.desktop -PLIST_FILES+= share/pixmaps/distccmon-gnome-icon.png +PLIST_FILES+= ${DESKTOPDIR}/distccmon-gnome.desktop \ + share/pixmaps/distccmon-gnome-icon.png .endif .if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MGTK}