diff options
| author | Gabor Kovesdan <gabor@FreeBSD.org> | 2007-08-04 11:41:30 +0000 |
|---|---|---|
| committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2007-08-04 11:41:30 +0000 |
| commit | 42542fb07642b8336e808272918f3ae46aa67e0b (patch) | |
| tree | 98ff235c33c6493aa26457284f122652c38935f7 /shells | |
| parent | 4c9cd257fd4e6eca46807a43e128d298429ee3cd (diff) | |
| download | ports-42542fb07642b8336e808272918f3ae46aa67e0b.tar.gz ports-42542fb07642b8336e808272918f3ae46aa67e0b.zip | |
Notes
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash/Makefile | 10 | ||||
| -rw-r--r-- | shells/bash/pkg-install | 2 | ||||
| -rw-r--r-- | shells/mksh/Makefile | 4 | ||||
| -rw-r--r-- | shells/mksh/pkg-install | 2 | ||||
| -rw-r--r-- | shells/osh/Makefile | 10 |
5 files changed, 14 insertions, 14 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 8fa0d105e064..08764fbb96aa 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -107,22 +107,22 @@ pre-build: @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build pre-install: - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ + @${SETENV} PKG_PREFIX="${PREFIX}" \ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @cd ${PREFIX}/bin ; ${LN} -sf bash rbash .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} .if !defined(WITH_INCLUDED_FAQ) @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/FAQ \ - ${WRKSRC}/doc/INTRO ${DESTDIR}${DOCSDIR} + ${WRKSRC}/doc/INTRO ${DOCSDIR} .else @${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ - ${WRKSRC}/doc/INTRO ${DESTDIR}${DOCSDIR} + ${WRKSRC}/doc/INTRO ${DOCSDIR} .endif @for d in ${PORTDOCS:NFAQ:NINTRO}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${d} ${DESTDIR}${DOCSDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${d} ${DOCSDIR}; \ done .endif @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ diff --git a/shells/bash/pkg-install b/shells/bash/pkg-install index 37a63a755364..99417b66ba6e 100644 --- a/shells/bash/pkg-install +++ b/shells/bash/pkg-install @@ -5,7 +5,7 @@ BASH="$(echo ${PKG_PREFIX-/usr/local}/bin/bash | /usr/bin/sed -e 's|//|/|g')" RBASH="$(echo ${PKG_PREFIX-/usr/local}/bin/rbash | /usr/bin/sed -e 's|//|/|g')" -SHELLS="${PKG_DESTDIR-}/etc/shells" +SHELLS="/etc/shells" case $2 in POST-INSTALL) diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile index e875aa47ed21..9ada3f03b8e1 100644 --- a/shells/mksh/Makefile +++ b/shells/mksh/Makefile @@ -47,11 +47,11 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/mksh.1 ${MANPREFIX}/man/man1 pre-install: - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ + @${SETENV} PKG_PREFIX="${PREFIX}" \ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \ + @${SETENV} PKG_PREFIX="${PREFIX}" \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/shells/mksh/pkg-install b/shells/mksh/pkg-install index dea9b5231c91..87dea009ba0a 100644 --- a/shells/mksh/pkg-install +++ b/shells/mksh/pkg-install @@ -4,7 +4,7 @@ # MKSH="${PKG_PREFIX-/usr/local}/bin/mksh" -SHELLS="${PKG_DESTDIR-}/etc/shells" +SHELLS="/etc/shells" case $2 in POST-INSTALL) diff --git a/shells/osh/Makefile b/shells/osh/Makefile index 92db7c3e63a6..7345dec3754e 100644 --- a/shells/osh/Makefile +++ b/shells/osh/Makefile @@ -16,10 +16,10 @@ COMMENT= An implementation of the UNIX 6th Edition shell MAN1= fd2.1 goto.1 if.1 osh.1 sh6.1 glob6.1 post-install: - @${ECHO_MSG} "updating ${DESTDIR}/etc/shells" - @${CP} ${DESTDIR}/etc/shells ${DESTDIR}/etc/shells.bak - @(${GREP} -v ${PREFIX}/bin/osh ${DESTDIR}/etc/shells.bak; \ - ${ECHO_CMD} ${PREFIX}/bin/osh) > ${DESTDIR}/etc/shells - @${RM} ${DESTDIR}/etc/shells.bak + @${ECHO_MSG} "updating /etc/shells" + @${CP} /etc/shells /etc/shells.bak + @(${GREP} -v ${PREFIX}/bin/osh /etc/shells.bak; \ + ${ECHO_CMD} ${PREFIX}/bin/osh) > /etc/shells + @${RM} /etc/shells.bak .include <bsd.port.mk> |