Date: Wed, 29 Aug 2001 17:40:02 -0700 (PDT) From: Christian Weisgerber <naddy@mips.inka.de> To: freebsd-ports@FreeBSD.org Subject: Re: ports/26092: ksh93 port not installing properly Message-ID: <200108300040.f7U0e2U35803@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/26092; it has been noted by GNATS.
From: Christian Weisgerber <naddy@mips.inka.de>
To: Pete Fritchman <petef@FreeBSD.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/26092: ksh93 port not installing properly
Date: Thu, 30 Aug 2001 02:38:02 +0200
--RnlQjJ0d97Da+TV1
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
> There's currently some magic to do this in pkg-plist on install, but
> this will only apply to packages. What would the maintainer think about
> adding something similiar to the do-install target? (something similiar
> to what's in ports/shells/zsh/Makefile)
Yes, I agree. Patch attached.
--
Christian "naddy" Weisgerber naddy@mips.inka.de
--RnlQjJ0d97Da+TV1
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ksh93.patch"
diff -uNr /usr/ports/shells/ksh93/Makefile ksh93/Makefile
--- /usr/ports/shells/ksh93/Makefile Sat Aug 4 21:00:09 2001
+++ ksh93/Makefile Thu Aug 30 02:29:44 2001
@@ -15,7 +15,6 @@
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 @@
.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
@@ -40,5 +39,12 @@
${PREFIX}/bin/ksh93
${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 -uNr /usr/ports/shells/ksh93/pkg-plist ksh93/pkg-plist
--- /usr/ports/shells/ksh93/pkg-plist Tue Feb 27 13:20:41 2001
+++ ksh93/pkg-plist Thu Aug 30 02:23:22 2001
@@ -1,4 +1,4 @@
@comment $FreeBSD: ports/shells/ksh93/pkg-plist,v 1.3 2001/02/26 05:14:14 steve Exp $
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
--RnlQjJ0d97Da+TV1--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108300040.f7U0e2U35803>