diff options
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/ast-ksh/Makefile | 6 | ||||
| -rw-r--r-- | shells/ast-ksh/Makefile.common | 12 | ||||
| -rw-r--r-- | shells/bash-completion/Makefile | 17 | ||||
| -rw-r--r-- | shells/bash2-doc/Makefile | 14 | ||||
| -rw-r--r-- | shells/static-ast-ksh/Makefile | 6 |
5 files changed, 29 insertions, 26 deletions
diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile index 62fe3f00ae4..c72775d8bc8 100644 --- a/shells/ast-ksh/Makefile +++ b/shells/ast-ksh/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2007/01/31 00:04:12 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2008/06/20 01:09:35 joerg Exp $ # -.include "Makefile.common" +PKG_DESTDIR_SUPPORT= user-destdir -BROKEN_IN= pkgsrc-2006Q4 +.include "Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common index fc89a1ba19b..9ea103f7444 100644 --- a/shells/ast-ksh/Makefile.common +++ b/shells/ast-ksh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2007/01/07 09:14:10 rillig Exp $ +# $NetBSD: Makefile.common,v 1.23 2008/06/20 01:09:35 joerg Exp $ DISTNAME= ast-ksh-${ASTKSH_VERSION} PKGNAME= ast-ksh-${ASTKSH_VERSION:S/-//g} @@ -51,11 +51,11 @@ do-build: do-install: @set -e; \ - arch=`${WRKSRC:Q}/bin/package host`; \ - ${INSTALL_PROGRAM} ${WRKSRC:Q}/arch/"$${arch}"/bin/ksh \ - ${PREFIX:Q}/bin/ksh93; \ - ${INSTALL_MAN} ${WRKSRC:Q}/arch/"$${arch}"/man/man1/sh.1 \ - ${PREFIX:Q}/man/man1/ksh93.1 + arch=`${WRKSRC}/bin/package host`; \ + ${INSTALL_PROGRAM} ${WRKSRC}/arch/"$${arch}"/bin/ksh \ + ${DESTDIR}${PREFIX}/bin/ksh93; \ + ${INSTALL_MAN} ${WRKSRC}/arch/"$${arch}"/man/man1/sh.1 \ + ${DESTDIR}${PREFIX}/man/man1/ksh93.1 # Part of regression test do-test: diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index 68e2ba7171c..7328e3848a4 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/03/12 09:47:58 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:35 joerg Exp $ # DISTNAME= bash-completion-20060301 @@ -9,20 +9,21 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.caliban.org/bash/index.shtml COMMENT= Programmable completion specifications for bash +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= bash:run WRKSRC= ${WRKDIR}/bash_completion USE_LANGUAGES= # none -do-build: +NO_BUILD= yes + +INSTALLATION_DIRS= share/bash-completion/contrib share/doc/bash-completion do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bash-completion - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bash-completion - ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion - ${INSTALL_DATA} ${WRKSRC}/bash* ${PREFIX}/share/bash-completion - ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/contrib + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/bash-completion + ${INSTALL_DATA} ${WRKSRC}/bash* ${DESTDIR}${PREFIX}/share/bash-completion ${INSTALL_DATA} ${WRKSRC}/contrib/* \ - ${PREFIX}/share/bash-completion/contrib + ${DESTDIR}${PREFIX}/share/bash-completion/contrib .include "../../mk/bsd.pkg.mk" diff --git a/shells/bash2-doc/Makefile b/shells/bash2-doc/Makefile index 7778068c509..4e3e966e479 100644 --- a/shells/bash2-doc/Makefile +++ b/shells/bash2-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/06/15 13:24:50 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2008/06/20 01:09:35 joerg Exp $ DISTNAME= bash-doc-2.05b PKGNAME= bash-doc-2.05.2 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/bash/bash.html COMMENT= Documentation for the GNU Bourne Again Shell +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS= bash<=2.05nb1 WRKSRC= ${WRKDIR}/doc @@ -21,18 +23,18 @@ USE_TOOLS+= gzip DOCDIR= ${PREFIX}/share/doc/bash HTMLDIR= ${PREFIX}/share/doc/html/bash +INSTALLATION_DIRS= ${DOCDIR} ${HTMLDIR} + do-install: - ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_MAN} \ ${WRKSRC}/article.ps \ ${WRKSRC}/bashref.ps \ ${WRKSRC}/article.txt \ - ${PREFIX}/share/doc/bash - ${INSTALL_DATA_DIR} ${HTMLDIR} + ${DESTDIR}${PREFIX}/share/doc/bash ${INSTALL_MAN} \ ${WRKSRC}/bash.html \ ${WRKSRC}/bashref.html \ - ${HTMLDIR} - ${GZIP_CMD} ${DOCDIR}/*.ps + ${DESTDIR}${HTMLDIR} + ${GZIP_CMD} ${DESTDIR}${DOCDIR}/*.ps .include "../../mk/bsd.pkg.mk" diff --git a/shells/static-ast-ksh/Makefile b/shells/static-ast-ksh/Makefile index 6e768510740..31b1dfe1083 100644 --- a/shells/static-ast-ksh/Makefile +++ b/shells/static-ast-ksh/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.10 2007/01/31 00:04:12 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2008/06/20 01:09:35 joerg Exp $ # +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../shells/ast-ksh/Makefile.common" CONFLICTS= ast-ksh-[0-9]* # Override. -BROKEN_IN= pkgsrc-2006Q4 - DISTINFO_FILE= ${.CURDIR}/../../shells/ast-ksh/distinfo PATCHDIR= ${.CURDIR}/../../shells/ast-ksh/patches PKGDIR= ${.CURDIR}/../../shells/ast-ksh |