diff options
| author | petef <petef@FreeBSD.org> | 2001-08-31 05:56:31 +0000 |
|---|---|---|
| committer | petef <petef@FreeBSD.org> | 2001-08-31 05:56:31 +0000 |
| commit | b86f862e6b897899e35d8240e80e7c8e5ffcb1e2 (patch) | |
| tree | 714e6338ce4baa70d029725159cd5ba0639bdd45 | |
| parent | cdaf71e4f2baa702270c35214c1aba4cded27f94 (diff) | |
| download | FreeBSD-ports-b86f862e6b897899e35d8240e80e7c8e5ffcb1e2.zip FreeBSD-ports-b86f862e6b897899e35d8240e80e7c8e5ffcb1e2.tar.gz | |
- remove DIST_SUBDIR
- touch -> ${TOUCH}
- add post-install target to update /etc/shells (to match pkg-plist @exec)
- make sure to remove /etc/shells.bak
PR: 26092
Submitted by: maintainer
| -rw-r--r-- | shells/ksh93/Makefile | 10 | ||||
| -rw-r--r-- | shells/ksh93/distinfo | 4 | ||||
| -rw-r--r-- | shells/ksh93/pkg-plist | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 504ffd9..8dbc94d 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -15,7 +15,6 @@ MAINTAINER= naddy@mips.inka.de RESTRICTED= "Source recipient must acknowledge license" DISTNAME= ${PORTNAME}-${VERSION} DISTFILES= INIT.${VERSION}.tgz ast-ksh.${VERSION}.tgz -DIST_SUBDIR= ${PORTNAME} NO_WRKSUBDIR= yes MAKE_ARGS= CC='${CC}' CCFLAGS='${CFLAGS}' SHELL='${SH}' @@ -27,7 +26,7 @@ MAN1= ksh93.1 .if defined(ACCEPT_AST_LICENSE) post-patch: - @touch ${WRKSRC}/lib/package/gen/ast.license.accepted + @${TOUCH} ${WRKSRC}/lib/package/gen/ast.license.accepted .else IS_INTERACTIVE= yes # must acknowledge license .endif @@ -41,4 +40,11 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/arch/freebsd.${ARCH}/man/man1/sh.1 \ ${PREFIX}/man/man1/ksh93.1 +post-install: + @${ECHO} "updating /etc/shells" + @${CP} /etc/shells /etc/shells.bak + @(${GREP} -v ${PREFIX}/bin/ksh93 /etc/shells.bak; \ + ${ECHO} ${PREFIX}/bin/ksh93) >/etc/shells + @${RM} -f /etc/shells.bak + .include <bsd.port.mk> diff --git a/shells/ksh93/distinfo b/shells/ksh93/distinfo index 1dd3e93..8822111 100644 --- a/shells/ksh93/distinfo +++ b/shells/ksh93/distinfo @@ -1,2 +1,2 @@ -MD5 (ksh93/INIT.2001-07-04.0000.tgz) = 5cb81cd79b6c4ffbd3249550541afa52 -MD5 (ksh93/ast-ksh.2001-07-04.0000.tgz) = 95c4d371f2c144759aad029f20717481 +MD5 (INIT.2001-07-04.0000.tgz) = 5cb81cd79b6c4ffbd3249550541afa52 +MD5 (ast-ksh.2001-07-04.0000.tgz) = 95c4d371f2c144759aad029f20717481 diff --git a/shells/ksh93/pkg-plist b/shells/ksh93/pkg-plist index 92fe399..9bdf639 100644 --- a/shells/ksh93/pkg-plist +++ b/shells/ksh93/pkg-plist @@ -1,4 +1,4 @@ @comment $FreeBSD$ bin/ksh93 -@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells -@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells +@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak +@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak |
