From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 29 15:00:29 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23DA416A420 for ; Fri, 29 Jul 2005 15:00:29 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA35843D53 for ; Fri, 29 Jul 2005 15:00:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6TF0RRf012029 for ; Fri, 29 Jul 2005 15:00:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6TF0RGK012028; Fri, 29 Jul 2005 15:00:27 GMT (envelope-from gnats) Resent-Date: Fri, 29 Jul 2005 15:00:27 GMT Resent-Message-Id: <200507291500.j6TF0RGK012028@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kirk Strauser Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEC7216A47B; Fri, 29 Jul 2005 14:56:18 +0000 (GMT) (envelope-from root@kanga.honeypot.net) Received: from kanga.honeypot.net (kanga.honeypot.net [208.162.254.122]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3107843D46; Fri, 29 Jul 2005 14:56:18 +0000 (GMT) (envelope-from root@kanga.honeypot.net) Received: from localhost (localhost [127.0.0.1]) by kanga.honeypot.net (Postfix) with ESMTP id 361EB220F6B; Fri, 29 Jul 2005 09:56:17 -0500 (CDT) Received: from kanga.honeypot.net ([127.0.0.1]) by localhost (kanga.honeypot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 03656-16; Fri, 29 Jul 2005 09:56:12 -0500 (CDT) Received: by kanga.honeypot.net (Postfix, from userid 0) id 1F63B220F1F; Fri, 29 Jul 2005 09:56:12 -0500 (CDT) Message-Id: <20050729145612.1F63B220F1F@kanga.honeypot.net> Date: Fri, 29 Jul 2005 09:56:12 -0500 (CDT) From: Kirk Strauser To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Volker Stolz Subject: ports/84305: [MAINTAINER UPDATE] Update port: shells/bash-completion to 20050721 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Kirk Strauser List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jul 2005 15:00:29 -0000 >Number: 84305 >Category: ports >Synopsis: [MAINTAINER UPDATE] Update port: shells/bash-completion to 20050721 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jul 29 15:00:27 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Kirk Strauser >Release: FreeBSD 5.4-STABLE i386 >Organization: The Strauser Group >Environment: System: FreeBSD kanga.honeypot.net 5.4-STABLE FreeBSD 5.4-STABLE #1: Wed Jul 20 17:58:03 CDT 2005 kirk@kanga.honeypot.net:/usr/obj/usr/src/sys/KANGA i386 >Description: This update adds support for a few more command and some minor bugfixes. The port now uses OPTION instead of WITH_ to specify build options. Note: portlint return two warnings: WARN: Makefile [23]: possible direct use of command "sed" found. use ${SED} instead. WARN: Makefile: "RUN_DEPENDS" has to appear earlier. The first is inconsequential; it's find text from the definition of the "GSED" OPTION description. I don't know about second, because I'm not sure how I'd define RUN_DEPENDS earlier since its value depends on the defined OPTIONs. Please advise if this is actually a problem. >How-To-Repeat: >Fix: --- bash-completion.patch begins here --- diff -urN bash-completion.old/Makefile bash-completion/Makefile --- bash-completion.old/Makefile Thu Jan 20 19:23:41 2005 +++ bash-completion/Makefile Fri Jul 29 09:41:18 2005 @@ -6,35 +6,21 @@ # PORTNAME= bash-completion -PORTVERSION= 20050112 +PORTVERSION= 20050721 CATEGORIES= shells MASTER_SITES= http://www.caliban.org/files/bash/ MAINTAINER= kirk@strauser.com COMMENT= Programmable completion library for Bash 2.04 and up -.if defined(WITH_BASH2) -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 -.else -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -.endif - -.if defined(WITH_GSED) -RUN_DEPENDS+= gsed:${PORTSDIR}/textproc/gsed -.endif - WRKSRC= ${WRKDIR}/bash_completion NO_BUILD= yes PKGMESSAGE= ${WRKDIR}/pkg-message PLIST_FILES= etc/bash_completion -pre-everything:: - @${ECHO} - @${ECHO} "You can build ${PKGNAME} with the following options:" - @${ECHO} "WITH_BASH2 use shells/bash2 instead of shells/bash" - @${ECHO} "WITH_GSED use GNU sed to enable additional completions" - @${ECHO} +OPTIONS= BASH2 "Use shells/bash2 instead of shells/bash" Off \ + GSED "Use GNU sed to enable additional completions" Off pre-patch: @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message >${PKGMESSAGE} @@ -45,4 +31,16 @@ post-install: @${CAT} ${PKGMESSAGE} -.include +.include + +.if defined(WITH_BASH2) +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 +.else +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash +.endif + +.if defined(WITH_GSED) +RUN_DEPENDS+= gsed:${PORTSDIR}/textproc/gsed +.endif + +.include diff -urN bash-completion.old/distinfo bash-completion/distinfo --- bash-completion.old/distinfo Thu Jan 20 19:23:41 2005 +++ bash-completion/distinfo Fri Jul 29 09:03:14 2005 @@ -1,2 +1,2 @@ -MD5 (bash-completion-20050112.tar.gz) = 474ce9d1e16be6229d730ed8385fc871 -SIZE (bash-completion-20050112.tar.gz) = 106710 +MD5 (bash-completion-20050721.tar.gz) = 08e5321ead7079c84822368d7a41deda +SIZE (bash-completion-20050721.tar.gz) = 111271 diff -urN bash-completion.old/files/patch-aa bash-completion/files/patch-aa --- bash-completion.old/files/patch-aa Wed Oct 27 20:14:07 2004 +++ bash-completion/files/patch-aa Fri Jul 29 09:26:48 2005 @@ -1,26 +1,17 @@ ---- bash_completion.orig Mon Oct 25 10:10:30 2004 -+++ bash_completion Mon Oct 25 10:12:35 2004 -@@ -31,14 +31,15 @@ - if [ -n "${FUNCNAME:-}" ]; then - # we're being sourced from within a function, so we can't use - # 'declare', as this will create local variables within a function -- BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" 2>/dev/null -- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}" \ -+ BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" \ -+ 2>/dev/null -+ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}" \ - 2>/dev/null - else -- declare -r BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" \ -+ declare -r BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" \ - 2>/dev/null - declare -r \ -- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}"\ -+ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}"\ - 2>/dev/null - fi +--- bash_completion.orig Thu Jul 21 14:21:22 2005 ++++ bash_completion Fri Jul 29 09:26:07 2005 +@@ -31,8 +31,8 @@ + { + # These declarations must go within braces in order to be able to silence + # readonly variable errors. +- BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" +- BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}" ++ BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" ++ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}" + } 2>/dev/null || : + readonly BASH_COMPLETION BASH_COMPLETION_DIR -@@ -1131,7 +1132,7 @@ +@@ -1310,7 +1310,7 @@ else len=${#cur} idx=0 @@ -29,7 +20,7 @@ if [[ "$cur" == "${pval:0:$len}" ]]; then COMPREPLY[$idx]="$pval:" idx=$(($idx+1)) -@@ -1207,7 +1208,7 @@ +@@ -1386,7 +1386,7 @@ fi len=${#cur} idx=0 --- bash-completion.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: