diff options
| author | steve <steve@FreeBSD.org> | 1998-07-18 04:38:17 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1998-07-18 04:38:17 +0800 |
| commit | 68f4cba0fb92da1eca4bc833686c41ee4cd8f0b0 (patch) | |
| tree | 09b9b4cc0d13691c1fbd94eaece171ce9bca7497 /shells | |
| parent | 476a812fec50207e4086fe1ccaaeedd7df600fd1 (diff) | |
| download | freebsd-ports-gnome-68f4cba0fb92da1eca4bc833686c41ee4cd8f0b0.tar.gz freebsd-ports-gnome-68f4cba0fb92da1eca4bc833686c41ee4cd8f0b0.tar.zst freebsd-ports-gnome-68f4cba0fb92da1eca4bc833686c41ee4cd8f0b0.zip | |
Guard against a nonexistant /usr/share/info/dir.
PR: 7297
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash/Makefile | 4 | ||||
| -rw-r--r-- | shells/bash/pkg-plist | 3 | ||||
| -rw-r--r-- | shells/bash2/Makefile | 4 | ||||
| -rw-r--r-- | shells/bash2/pkg-plist | 3 | ||||
| -rw-r--r-- | shells/bash3/Makefile | 4 | ||||
| -rw-r--r-- | shells/bash3/pkg-plist | 3 |
6 files changed, 15 insertions, 6 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 7faba0b72589..67d5c23959b8 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -3,7 +3,7 @@ # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.28 1998/04/28 05:09:46 ache Exp $ +# $Id: Makefile,v 1.29 1998/05/16 11:39:19 ache Exp $ # DISTNAME= bash-2.02 @@ -20,7 +20,7 @@ GNU_CONFIGURE= Yes MAN1= bash.1 bashbug.1 pre-install: - if [ ! -s ${PREFIX}/info/dir ]; then \ + if [ ! -s ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist index 34e6a439bb6f..86a6e5b99a46 100644 --- a/shells/bash/pkg-plist +++ b/shells/bash/pkg-plist @@ -4,10 +4,13 @@ bin/bash bin/bashbug man/man1/bash.1.gz man/man1/bashbug.1.gz +@unexec install-info --delete %D/info/bash.info %D/info/dir info/bash.info +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir share/doc/bash/article.ps.gz share/doc/bash/bashref.ps.gz share/doc/bash/bash.html share/doc/bash/bashref.html share/doc/bash/bashref_toc.html share/doc/bash/article.txt +@dirrm share/doc/bash diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 7faba0b72589..67d5c23959b8 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -3,7 +3,7 @@ # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.28 1998/04/28 05:09:46 ache Exp $ +# $Id: Makefile,v 1.29 1998/05/16 11:39:19 ache Exp $ # DISTNAME= bash-2.02 @@ -20,7 +20,7 @@ GNU_CONFIGURE= Yes MAN1= bash.1 bashbug.1 pre-install: - if [ ! -s ${PREFIX}/info/dir ]; then \ + if [ ! -s ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi diff --git a/shells/bash2/pkg-plist b/shells/bash2/pkg-plist index 34e6a439bb6f..86a6e5b99a46 100644 --- a/shells/bash2/pkg-plist +++ b/shells/bash2/pkg-plist @@ -4,10 +4,13 @@ bin/bash bin/bashbug man/man1/bash.1.gz man/man1/bashbug.1.gz +@unexec install-info --delete %D/info/bash.info %D/info/dir info/bash.info +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir share/doc/bash/article.ps.gz share/doc/bash/bashref.ps.gz share/doc/bash/bash.html share/doc/bash/bashref.html share/doc/bash/bashref_toc.html share/doc/bash/article.txt +@dirrm share/doc/bash diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile index 7faba0b72589..67d5c23959b8 100644 --- a/shells/bash3/Makefile +++ b/shells/bash3/Makefile @@ -3,7 +3,7 @@ # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.28 1998/04/28 05:09:46 ache Exp $ +# $Id: Makefile,v 1.29 1998/05/16 11:39:19 ache Exp $ # DISTNAME= bash-2.02 @@ -20,7 +20,7 @@ GNU_CONFIGURE= Yes MAN1= bash.1 bashbug.1 pre-install: - if [ ! -s ${PREFIX}/info/dir ]; then \ + if [ ! -s ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi diff --git a/shells/bash3/pkg-plist b/shells/bash3/pkg-plist index 34e6a439bb6f..86a6e5b99a46 100644 --- a/shells/bash3/pkg-plist +++ b/shells/bash3/pkg-plist @@ -4,10 +4,13 @@ bin/bash bin/bashbug man/man1/bash.1.gz man/man1/bashbug.1.gz +@unexec install-info --delete %D/info/bash.info %D/info/dir info/bash.info +@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir share/doc/bash/article.ps.gz share/doc/bash/bashref.ps.gz share/doc/bash/bash.html share/doc/bash/bashref.html share/doc/bash/bashref_toc.html share/doc/bash/article.txt +@dirrm share/doc/bash |