From owner-svn-ports-head@freebsd.org Sun Aug 30 07:14:19 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 87A6F3CE9FF; Sun, 30 Aug 2020 07:14:19 +0000 (UTC) (envelope-from sunpoet@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 4BfPhp64sfz4jyq; Sun, 30 Aug 2020 07:14:18 +0000 (UTC) (envelope-from sunpoet@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 2B36312E4A; Sun, 30 Aug 2020 07:14:18 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07U7EHXR007115; Sun, 30 Aug 2020 07:14:17 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07U7EHeA007113; Sun, 30 Aug 2020 07:14:17 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202008300714.07U7EHeA007113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 30 Aug 2020 07:14:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546991 - head/shells/bash-completion X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/shells/bash-completion X-SVN-Commit-Revision: 546991 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: Sun, 30 Aug 2020 07:14:19 -0000 Author: sunpoet Date: Sun Aug 30 07:14:17 2020 New Revision: 546991 URL: https://svnweb.freebsd.org/changeset/ports/546991 Log: Remove FREEBSD option As a FreeBSD port, I see no need not to install the FreeBSD-specific bash completions. Modified: head/shells/bash-completion/Makefile head/shells/bash-completion/pkg-plist Modified: head/shells/bash-completion/Makefile ============================================================================== --- head/shells/bash-completion/Makefile Sun Aug 30 07:14:12 2020 (r546990) +++ head/shells/bash-completion/Makefile Sun Aug 30 07:14:17 2020 (r546991) @@ -9,7 +9,12 @@ CATEGORIES= shells MAINTAINER= sunpoet@FreeBSD.org COMMENT= Programmable completion library for Bash -LICENSE= GPLv2+ +# bash-completion is licensed under GPLv2+ +# bash-completion-freebsd is licensed under BSD2CLAUSE +LICENSE= BSD2CLAUSE GPLv2+ +LICENSE_COMB= multi +LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/freebsd/LICENSE +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING TEST_DEPENDS= runtest:misc/dejagnu \ ${LOCALBASE}/lib/tcllib/cmdline/cmdline.tcl:devel/tcllib @@ -24,27 +29,21 @@ SUB_LIST= RUNFILE=${DATADIR}/bash_completion.sh GH_ACCOUNT= scop USE_GITHUB= yes +GH_TUPLE= 0mp:bash-completion-freebsd:1.1.1:freebsd/freebsd PORTSCOUT= limit:^[0-9\.]*$$ -OPTIONS_DEFINE= CMAKE_MODULES DOCS FREEBSD +OPTIONS_DEFINE= CMAKE_MODULES DOCS OPTIONS_SINGLE= BASH OPTIONS_SINGLE_BASH= BASH_SHARED BASH_STATIC -OPTIONS_DEFAULT=BASH_SHARED CMAKE_MODULES FREEBSD +OPTIONS_DEFAULT=BASH_SHARED CMAKE_MODULES OPTIONS_SUB= yes BASH_SHARED_DESC= Use shells/bash as backend BASH_STATIC_DESC= Use shells/bash-static as backend CMAKE_MODULES_DESC= Install bash-completion modules for cmake -FREEBSD_DESC= Install completion functions for FreeBSD programs BASH_SHARED_RUN_DEPENDS=bash:shells/bash BASH_STATIC_RUN_DEPENDS=bash:shells/bash-static -FREEBSD_GH_TUPLE= 0mp:bash-completion-freebsd:1.1.1:freebsd/freebsd -FREEBSD_VARS= LICENSE="BSD2CLAUSE GPLv2+" \ - LICENSE_COMB=multi \ - LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/freebsd/LICENSE \ - LICENSE_FILE_GPLv2+=${WRKSRC}/COPYING -FREEBSD_VARS_OFF= LICENSE_FILE=${WRKSRC}/COPYING post-patch: @${REINPLACE_CMD} \ @@ -63,12 +62,12 @@ post-configure: -e 's|/var\(/lib/rpm/macros\)|${PREFIX}\1|g' \ ${WRKSRC}/completions/* +post-install: + cd ${WRKSRC}/freebsd/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README.md doc/bash_completion.txt doc/bashrc doc/inputrc ${STAGEDIR}${DOCSDIR}/ - -post-install-FREEBSD-on: - cd ${WRKSRC}/freebsd/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} do-test: .for test in runCompletion runInstall runUnit Modified: head/shells/bash-completion/pkg-plist ============================================================================== --- head/shells/bash-completion/pkg-plist Sun Aug 30 07:14:12 2020 (r546990) +++ head/shells/bash-completion/pkg-plist Sun Aug 30 07:14:17 2020 (r546991) @@ -1,7 +1,7 @@ -%%FREEBSD%%etc/bash_completion.d/make -%%FREEBSD%%etc/bash_completion.d/mandoc -%%FREEBSD%%etc/bash_completion.d/pkg -%%FREEBSD%%etc/bash_completion.d/service +etc/bash_completion.d/make +etc/bash_completion.d/mandoc +etc/bash_completion.d/pkg +etc/bash_completion.d/service libdata/pkgconfig/bash-completion.pc %%DATADIR%%/bash_completion %%DATADIR%%/bash_completion.sh