svn commit: r546991 - head/shells/bash-completion

[Sunpoet Po-Chuan Hsieh]

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 at 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