Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Aug 2011 15:52:12 +0800 (CST)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/160202: [PATCH] shells/bash-completion: use @dirrmtry for PREFIX/etc/bash_completion.d
Message-ID:  <20110826075212.5C421E90@sunpoet.net>
Resent-Message-ID: <201108260800.p7Q80O8P047741@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         160202
>Category:       ports
>Synopsis:       [PATCH] shells/bash-completion: use @dirrmtry for PREFIX/etc/bash_completion.d
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 26 08:00:23 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Jul  9 23:23:51 CST
>Description:
- Use @dirrmtry for PREFIX/etc/bash_completion.d
  Other ports (e.g. devel/glib20) install files to this directory.
- Costmetic change: put build-related knobs together
- Space/tab twiddle

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- bash-completion-1.3_2,1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/shells/bash-completion/Makefile,v
retrieving revision 1.25
diff -u -u -r1.25 Makefile
--- Makefile	1 Aug 2011 22:03:35 -0000	1.25
+++ Makefile	26 Aug 2011 07:52:04 -0000
@@ -5,25 +5,24 @@
 # $FreeBSD: ports/shells/bash-completion/Makefile,v 1.25 2011/08/01 22:03:35 adamw Exp $
 #
 
-PORTNAME=		bash-completion
+PORTNAME=	bash-completion
 PORTVERSION=	1.3
-PORTREVISION=	1
-PORTEPOCH=		1
-CATEGORIES=		shells
+PORTREVISION=	2
+PORTEPOCH=	1
+CATEGORIES=	shells
 MASTER_SITES=	http://bash-completion.alioth.debian.org/files/
 
-MAINTAINER=		adamw@FreeBSD.org
-COMMENT=		Programmable completion library for Bash
+MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	Programmable completion library for Bash
 
-USE_BZIP2=		yes
-SUB_FILES=		pkg-message
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
-CONFLICTS+=		bash-completion-classic-[0-9]*
+CONFLICTS=	bash-completion-classic-[0-9]*
 
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 
-.include <bsd.port.pre.mk>
+SUB_FILES=	pkg-message
 
 post-patch:
 	@${ECHO_CMD} You can safely ignore this next error...
@@ -36,11 +35,11 @@
 		s|/usr/lib\(/aspell\)|${PREFIX}/share\1|g; \
 		s|/usr/share/info|&:${PREFIX}/info|g; \
 		s|\$$(sysconfdir)/profile.d|${PREFIX}/bin|g; \
-		s|\(FLAC\)|\1\|flv\|FLV|' \
+		s|FLAC|&\|flv\|FLV|' \
 		${WRKSRC}/bash_completion ${WRKSRC}/Makefile.in \
 		${WRKSRC}/completions/* ${WRKSRC}/completions/helpers/*
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/shells/bash-completion/pkg-plist,v
retrieving revision 1.6
diff -u -u -r1.6 pkg-plist
--- pkg-plist	12 Feb 2011 21:34:23 -0000	1.6
+++ pkg-plist	26 Aug 2011 07:52:04 -0000
@@ -107,8 +107,8 @@
 etc/bash_completion.d/net-tools
 etc/bash_completion.d/nmap
 etc/bash_completion.d/ntpdate
-etc/bash_completion.d/openldap
 etc/bash_completion.d/open-iscsi
+etc/bash_completion.d/openldap
 etc/bash_completion.d/openssl
 etc/bash_completion.d/p4
 etc/bash_completion.d/perl
@@ -181,4 +181,4 @@
 etc/bash_completion.d/yp-tools
 etc/bash_completion.d/yum-arch
 @dirrm etc/bash_completion.d/helpers
-@dirrm etc/bash_completion.d
+@dirrmtry etc/bash_completion.d
--- bash-completion-1.3_2,1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110826075212.5C421E90>