From b58de0435ff6436cebd8270e05d7f0c1d2310918 Mon Sep 17 00:00:00 2001 From: brad Date: Tue, 4 Jul 2000 21:30:17 +0000 Subject: [PATCH] - add HOMEPAGE - remove FAKE=Yes and license type - fixup INSTALL - add @comment with RCS id to PLIST --- shells/bash/Makefile | 13 ++++++------- shells/bash/pkg/DESCR | 2 ++ shells/bash/pkg/INSTALL | 15 +++++++-------- shells/bash/pkg/PLIST | 1 + 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/shells/bash/Makefile b/shells/bash/Makefile index fcfdce70f0d..53bbc360660 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,29 +1,28 @@ -# $OpenBSD: Makefile,v 1.14 2000/03/31 16:31:07 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2000/07/04 21:30:17 brad Exp $ DISTNAME= bash-1.14.7 CATEGORIES= shells -NEED_VERSION= 1.240 +NEED_VERSION= 1.310 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= bash +HOMEPAGE= http://www.gnu.org/software/bash/ + MAINTAINER= ports@openbsd.org -LICENSE_TYPE= GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes FLAVORS=static +FLAVOR?= + .if defined(STATIC) && ${STATIC:U} == YES FLAVOR=static .endif -FLAVOR?= - .if ${FLAVOR:L} == "static" MAKE_ENV= CPP_DEFINES="-DSYSDEP_LDFLAGS=-static" .endif -FAKE= Yes - .include diff --git a/shells/bash/pkg/DESCR b/shells/bash/pkg/DESCR index 497fcff47de..b102cf80f34 100644 --- a/shells/bash/pkg/DESCR +++ b/shells/bash/pkg/DESCR @@ -6,3 +6,5 @@ expansion, and a slew of other stuff. For more information on the features of Bash that are new to this type of shell, see the file `documentation/features.texi'. There is also a processed DVI file there, as well as a large man page. + +WWW: ${HOMEPAGE} diff --git a/shells/bash/pkg/INSTALL b/shells/bash/pkg/INSTALL index 69e2b7cc198..13e4ea80d83 100644 --- a/shells/bash/pkg/INSTALL +++ b/shells/bash/pkg/INSTALL @@ -1,8 +1,14 @@ #!/bin/sh -# $OpenBSD: INSTALL,v 1.1 1999/12/10 15:16:59 brad Exp $ +# $OpenBSD: INSTALL,v 1.2 2000/07/04 21:30:17 brad Exp $ # # Pre/post-installation setup of bash +# exit on errors, use a sane path and install prefix +# +set -e +PATH=/bin:/usr/bin:/sbin:/usr/sbin +PREFIX=${PKG_PREFIX:-/usr/local} + # Function: tell the user what s/he needs to do to use the port just installed # do_notice() @@ -17,12 +23,6 @@ do_notice() echo } -# exit on errors, use a sane path and install prefix -# -set -e -PATH=/bin:/usr/bin:/sbin:/usr/sbin -PREFIX=${PKG_PREFIX:-/usr/local} - # verify proper execution # if [ $# -ne 2 ]; then @@ -50,4 +50,3 @@ case $2 in esac exit 0 - diff --git a/shells/bash/pkg/PLIST b/shells/bash/pkg/PLIST index 8645a307377..2872bab4f29 100644 --- a/shells/bash/pkg/PLIST +++ b/shells/bash/pkg/PLIST @@ -1,3 +1,4 @@ +@comment $OpenBSD: PLIST,v 1.5 2000/07/04 21:30:17 brad Exp $ bin/bash bin/bashbug man/man1/bash.1