svn commit: r346905 - in head: shells/bash-completion sysutils/byobu sysutils/duply sysutils/vimpager
Adam Weinberger
adamw at FreeBSD.org
Mon Mar 3 14:35:24 UTC 2014
Author: adamw
Date: Mon Mar 3 14:35:22 2014
New Revision: 346905
URL: http://svnweb.freebsd.org/changeset/ports/346905
QAT: https://qat.redports.org/buildarchive/r346905/
Log:
Remove bash-devel support now that it has been folded into
shells/bash proper. Bump PORTREVISION on affected ports.
Modified:
head/shells/bash-completion/Makefile
head/sysutils/byobu/Makefile
head/sysutils/duply/Makefile
head/sysutils/vimpager/Makefile
Modified: head/shells/bash-completion/Makefile
==============================================================================
--- head/shells/bash-completion/Makefile Mon Mar 3 14:31:29 2014 (r346904)
+++ head/shells/bash-completion/Makefile Mon Mar 3 14:35:22 2014 (r346905)
@@ -3,7 +3,7 @@
PORTNAME= bash-completion
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -12,11 +12,10 @@ MASTER_SITE_SUBDIR= adamw
MAINTAINER= adamw at FreeBSD.org
COMMENT= Programmable completion library for Bash
-OPTIONS_DEFINE= BASH_DEVEL
-BASH_DEVEL_DESC= Use shells/bash-devel instead of shells/bash
-
CONFLICTS= bash-completion-classic-[0-9]*
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
+
USE_BZIP2= yes
USE_AUTOTOOLS= aclocal automake
GNU_CONFIGURE= yes
@@ -25,9 +24,6 @@ USES= gmake
SUB_FILES= pkg-message
SUB_LIST+= RUNFILE=${DATADIR}/bash_completion.sh
-BASH_DEVEL_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash-devel
-BASH_DEVEL_RUN_DEPENDS_OFF= bash:${PORTSDIR}/shells/bash
-
post-patch:
@${REINPLACE_CMD} -e 's|FLAC|&\|flv\|FLV|;' ${WRKSRC}/bash_completion
Modified: head/sysutils/byobu/Makefile
==============================================================================
--- head/sysutils/byobu/Makefile Mon Mar 3 14:31:29 2014 (r346904)
+++ head/sysutils/byobu/Makefile Mon Mar 3 14:35:22 2014 (r346905)
@@ -3,6 +3,7 @@
PORTNAME= byobu
PORTVERSION= 5.73
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
@@ -10,17 +11,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.ori
MAINTAINER= gslin at gslin.org
COMMENT= Profile and configuration utilities for GNU Screen
-RUN_DEPENDS= screen:${PORTSDIR}/sysutils/screen
+RUN_DEPENDS= screen:${PORTSDIR}/sysutils/screen \
+ bash:${PORTSDIR}/shells/bash
GNU_CONFIGURE= yes
USE_PYTHON= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-OPTIONS_DEFINE= BASH_DEVEL
-BASH_DEVEL_DESC=Use bash-devel instead of bash
-BASH_DEVEL_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash-devel
-BASH_DEVEL_RUN_DEPENDS_OFF= bash:${PORTSDIR}/shells/bash
-
post-patch:
${FIND} ${WRKSRC} -type f | ${XARGS} \
${REINPLACE_CMD} \
Modified: head/sysutils/duply/Makefile
==============================================================================
--- head/sysutils/duply/Makefile Mon Mar 3 14:31:29 2014 (r346904)
+++ head/sysutils/duply/Makefile Mon Mar 3 14:35:22 2014 (r346905)
@@ -3,6 +3,7 @@
PORTNAME= duply
PORTVERSION= 1.6.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/ftplicity/${PORTNAME}%20%28simple%20duplicity%29/1.6.x/
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -14,12 +15,8 @@ COMMENT= Shell front end for the duplici
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/gpl-2.0.txt
-RUN_DEPENDS= duplicity:${PORTSDIR}/sysutils/duplicity
-
-OPTIONS_DEFINE= BASH_DEVEL
-BASH_DEVEL_DESC= Use shells/bash-devel instead of shells/bash
-BASH_DEVEL_RUN_DEPENDS_OFF= bash:${PORTSDIR}/shells/bash
-BASH_DEVEL_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash-devel
+RUN_DEPENDS= duplicity:${PORTSDIR}/sysutils/duplicity \
+ bash:${PORTSDIR}/shells/bash
NO_BUILD= yes
Modified: head/sysutils/vimpager/Makefile
==============================================================================
--- head/sysutils/vimpager/Makefile Mon Mar 3 14:31:29 2014 (r346904)
+++ head/sysutils/vimpager/Makefile Mon Mar 3 14:35:22 2014 (r346905)
@@ -1,9 +1,10 @@
# Created by: Adam Weinberger <adamw at FreeBSD.org>
# $FreeBSD$
-PORTNAME= vimpager
+PORTNAME= vimpager
PORTVERSION= 1.8.6
-CATEGORIES= sysutils
+PORTREVISION= 1
+CATEGORIES= sysutils
MASTER_SITES= https://github.com/rkitover/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
MAINTAINER= adamw at FreeBSD.org
@@ -11,24 +12,14 @@ COMMENT= Use ViM as a pager
RUN_DEPENDS= vim:${PORTSDIR}/editors/vim
-OPTIONS_DEFINE= VIMCAT BASH_DEVEL
-OPTIONS_DEFAULT=VIMCAT
-VIMCAT_DESC= Install vimcat(1) (requires shells/bash)
-BASH_DEVEL_DESC=Use shells/bash-devel instead of shells/bash
-
-PLIST_FILES= bin/${PORTNAME} etc/${PORTNAME}rc man/man1/${PORTNAME}.1.gz
-
+OPTIONS_DEFINE= VIMCAT
+OPTIONS_DEFAULT= VIMCAT
+VIMCAT_DESC= Install vimcat(1) (requires shells/bash)
+VIMCAT_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
VIMCAT_PLIST_FILES= bin/vimcat man/man1/vimcat.1.gz
-.include <bsd.port.options.mk>
+PLIST_FILES= bin/${PORTNAME} etc/${PORTNAME}rc man/man1/${PORTNAME}.1.gz
-.if ${PORT_OPTIONS:MVIMCAT}
-. if ${PORT_OPTIONS:MBASH_DEVEL}
-RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash-devel
-. else
-RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
-. endif
-.endif
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
More information about the svn-ports-head
mailing list