[csw-devel] SF.net SVN: gar:[4196] csw/mgar/pkg/bash_completion/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Apr 5 15:48:44 CEST 2009
Revision: 4196
http://gar.svn.sourceforge.net/gar/?rev=4196&view=rev
Author: chninkel
Date: 2009-04-05 13:48:44 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
bash_completion: updated to 1.0
bash_completion: switched to gar v2
Modified Paths:
--------------
csw/mgar/pkg/bash_completion/trunk/Makefile
csw/mgar/pkg/bash_completion/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW
csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch
Removed Paths:
-------------
csw/mgar/pkg/bash_completion/trunk/files/CSWbash_completion.gspec
csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch
Property Changed:
----------------
csw/mgar/pkg/bash_completion/trunk/
Property changes on: csw/mgar/pkg/bash_completion/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/bash_completion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/Makefile 2009-04-05 09:29:04 UTC (rev 4195)
+++ csw/mgar/pkg/bash_completion/trunk/Makefile 2009-04-05 13:48:44 UTC (rev 4196)
@@ -1,5 +1,19 @@
+#####################################################################
+# OpenCSW build recipe for bash-completion
+#
+# Copyright 2009 Yann Rouillard <yann at pleiades.fr.eu.org>
+# All rights reserved. Use is subject to license terms.
+#
+# Redistribution and/or use, with or without modification, is
+# permitted. This software is without warranty of any kind. The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+#####################################################################
+
+###### Package information #######
+
GARNAME = bash_completion
-GARVERSION = 20060301
+GARVERSION = 1.0
CATEGORIES = xtra
DESCRIPTION = Programmable completion for bash
@@ -7,38 +21,59 @@
Since v2.04, bash has allowed you to intelligently program and extend its standard completion behavior to achieve complex command lines with just a few keystrokes. Imagine typing ssh [Tab] and being able to complete on hosts from your ~/.ssh/known_hosts files. Or typing man 3 str [Tab] and getting a list of all string handling functions in the UNIX manual. mount system: [Tab] would complete on all exported file-systems from the host called system, while make [Tab] would complete on all targets in Makefile. This project was conceived to produce programmable completion routines for the most common Linux/UNIX commands, reducing the amount of typing sysadmins and programmers need to do on a daily basis.
endef
-MASTER_SITES = http://www.caliban.org/files/bash/
+ARCHALL=1
+PACKAGES = CSWbashcmplt
+CATALOGNAME_CSWbashcmplt = bash_completion
+
+
+###### Upstream and OpenCSW files information #######
+
+MASTER_SITES = http://bash-completion.alioth.debian.org/files/
+
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(shell echo $(GARNAME) | tr '_' '-')-(\d+).tar.gz
-DISTFILES = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWbash_completion,)
+DISTNAME = $(shell echo $(GARNAME) | tr '_' '-')-$(GARVERSION)
+
+DISTFILES = $(DISTNAME).tar.gz
+# we automatically include all
DISTFILES += $(shell cd files; for FILE in *.completion; do echo $$FILE; done)
-# add blastwave paths
-PATCHFILES = blastwave.patch
+DISTFILES += changelog.CSW
-WORKSRC = $(WORKDIR)/$(GARNAME)
+# change the paths to use opencsw ones
+PATCHFILES = opencsw_paths.patch
-# no configure/Makefile
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
-INSTALL_SCRIPTS = manual
+
+##### Build and installation information #####
+
+# the configure script doesn't seem to take in account the prefix
+# env variable defined automatically by GAR
+CONFIGURE_ARGS += --prefix $(prefix)
+
+# no test script in bash_completion
TEST_SCRIPTS =
-install-manual:
- @ginstall -d $(DESTDIR)$(sysconfdir)
- @ginstall -d $(DESTDIR)$(sysconfdir)/bash_completion.d
- @ginstall -D $(WORKSRC)/bash_completion $(DESTDIR)$(sysconfdir)/bash_completion
+post-merge: merge-opencsw-completion merge-additional-docs merge-changelog
+
+# we add some completion scripts for Solaris
+merge-opencsw-completion:
@( for FILE in $(WORKDIR)/*.completion; do \
- NFILE="`basename $$FILE | sed -e 's/\.completion$$//'`"; \
- ginstall -D $$FILE $(DESTDIR)$(sysconfdir)/bash_completion.d/$$NFILE; \
+ NFILE="`basename $$FILE | sed -e 's/\.completion$$//'`"; \
+ ginstall -D $$FILE $(PKGROOT)$(sysconfdir)/bash_completion.d/$$NFILE; \
done )
- @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
- @( for FILE in BUGS README TODO Changelog; do \
- ginstall -D $(WORKSRC)/$$FILE $(DESTDIR)$(docdir)/$(GARNAME)/$$FILE; \
+ @$(MAKECOOKIE)
+
+
+merge-additional-docs:
+ @( for FILE in AUTHORS README TODO CHANGES; do \
+ ginstall -D "$(WORKSRC_FIRSTMOD)/$$FILE" "$(PKGROOT)$(docdir)/$(GARNAME)/$$FILE"; \
done )
+ @$(MAKECOOKIE)
+merge-changelog:
+ ginstall -D "$(WORKDIR)/changelog.CSW" "$(PKGROOT)$(docdir)/$(GARNAME)/changelog.CSW"
+ @$(MAKECOOKIE)
include gar/category.mk
Modified: csw/mgar/pkg/bash_completion/trunk/checksums
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/checksums 2009-04-05 09:29:04 UTC (rev 4195)
+++ csw/mgar/pkg/bash_completion/trunk/checksums 2009-04-05 13:48:44 UTC (rev 4196)
@@ -1,7 +1,7 @@
-9bca1cf97e8f8c73e3ef560cc9dead21 download/bash-completion-20060301.tar.gz
-2de14c97d596cf5ac0da21ea34ea93aa download/CSWbash_completion.gspec
+cd1c5648272917fbe0eef4ba30bb93f4 download/bash-completion-1.0.tar.gz
2acb33dad8ee4ea46b02f2cd86ced5e1 download/pkg-get.completion
0fcc270cda377374a9637d24c8b689b3 download/pkgadd.completion
7d304567cc880dd42e8ea277c991017f download/pkgrm.completion
cc213a6d8dd2d484f2bce4f7905437f8 download/smf.completion
-152cc17cbfe6875b15d9216f63bed3f9 download/blastwave.patch
+1745e51815578a18384ff36a449e0002 download/changelog.CSW
+d0c0d867babf351bca9ee97e03be550d download/opencsw_paths.patch
Deleted: csw/mgar/pkg/bash_completion/trunk/files/CSWbash_completion.gspec
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/files/CSWbash_completion.gspec 2009-04-05 09:29:04 UTC (rev 4195)
+++ csw/mgar/pkg/bash_completion/trunk/files/CSWbash_completion.gspec 2009-04-05 13:48:44 UTC (rev 4196)
@@ -1,4 +0,0 @@
-%var bitname bash_completion
-%var pkgname CSWbashcmplt
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYING
Deleted: csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch 2009-04-05 09:29:04 UTC (rev 4195)
+++ csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch 2009-04-05 13:48:44 UTC (rev 4196)
@@ -1,23 +0,0 @@
-diff --speed-large-files --minimal -Nru bash_completion.orig/bash_completion bash_completion/bash_completion
---- bash_completion.orig/bash_completion 2006-05-01 21:23:54.827097000 -0400
-+++ bash_completion/bash_completion 2006-05-01 21:23:49.947089000 -0400
-@@ -32,8 +32,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:-/opt/csw/etc/bash_completion}"
-+ BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/opt/csw/etc/bash_completion.d}"
- } 2>/dev/null || :
- readonly BASH_COMPLETION BASH_COMPLETION_DIR
-
-@@ -163,7 +163,7 @@
- have()
- {
- unset -v have
-- PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type $1 &>/dev/null &&
-+ PATH=$PATH:/opt/csw/sbin:/sbin:/usr/sbin:/usr/local/sbin type $1 &>/dev/null &&
- have="yes"
- }
-
Added: csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW (rev 0)
+++ csw/mgar/pkg/bash_completion/trunk/files/changelog.CSW 2009-04-05 13:48:44 UTC (rev 4196)
@@ -0,0 +1,6 @@
+bash_completion (1.0,REV=2009.04.05)
+
+ * New upstream version.
+ * Switched to gar v2.
+
+ -- Yann Rouillard <yann at opencsw.org> Sun, 05 Apr 2009 15:32:52 +0200
Copied: csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch (from rev 4177, csw/mgar/pkg/bash_completion/trunk/files/blastwave.patch)
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch (rev 0)
+++ csw/mgar/pkg/bash_completion/trunk/files/opencsw_paths.patch 2009-04-05 13:48:44 UTC (rev 4196)
@@ -0,0 +1,45 @@
+--- bash-completion-1.0/bash_completion 2009-04-02 22:01:39.000000000 +0200
++++ bash-completion-1.0/bash_completion.new 2009-04-04 19:21:58.156466726 +0200
+@@ -42,8 +42,8 @@
+
+ # Alter the following to reflect the location of this file.
+ #
+-[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
+-[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d
++[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/opt/csw/etc/bash_completion
++[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/opt/csw/etc/bash_completion.d
+ readonly BASH_COMPLETION BASH_COMPLETION_DIR
+
+ # Set a couple of useful vars
+@@ -2657,6 +2657,8 @@
+ [ -r "$configfile" ] &&
+ config=( "${config[@]}" "$configfile" )
+ else
++ [ -r /opt/csw/etc/ssh/ssh_config ] &&
++ config=( "${config[@]}" "/opt/csw/etc/ssh/ssh_config" )
+ [ -r /etc/ssh/ssh_config ] &&
+ config=( "${config[@]}" "/etc/ssh/ssh_config" )
+ [ -r "${HOME}/.ssh/config" ] &&
+@@ -2676,6 +2678,8 @@
+ [ -r "$global_kh" ] &&
+ kh=( "${kh[@]}" "$global_kh" )
+ if [ -z "$configfile" ]; then
++ [ -r /opt/csw/etc/ssh/ssh_known_hosts ] &&
++ kh=( "${kh[@]}" /opt/csw/etc/ssh/ssh_known_hosts )
+ [ -r /etc/ssh/ssh_known_hosts ] &&
+ kh=( "${kh[@]}" /etc/ssh/ssh_known_hosts )
+ [ -r /etc/ssh/ssh_known_hosts2 ] &&
+--- bash-completion-1.0/bash_completion.sh 2009-04-02 22:01:42.000000000 +0200
++++ bash-completion-1.0/bash_completion.sh.new 2009-04-04 19:22:33.430034421 +0200
+@@ -4,9 +4,9 @@
+ # Check for recent enough version of bash.
+ bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+ if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then
+- if [ -r /etc/bash_completion ]; then
++ if [ -r /opt/csw/etc/bash_completion ]; then
+ # Source completion code.
+- . /etc/bash_completion
++ . /opt/csw/etc/bash_completion
+ fi
+ fi
+ unset bash bminor bmajor
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list