diff options
| author | garga <garga@FreeBSD.org> | 2006-02-13 17:46:26 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2006-02-13 17:46:26 +0800 |
| commit | cb23d0a82a0e6058f98186203f5f50535e7c74e5 (patch) | |
| tree | 8e4643b05c71505c3d771bde22965f7b087b0ebd /shells | |
| parent | cd9e7147fc56f8f740e0756e2bbbe8cebf3d555c (diff) | |
| download | freebsd-ports-gnome-cb23d0a82a0e6058f98186203f5f50535e7c74e5.tar.gz freebsd-ports-gnome-cb23d0a82a0e6058f98186203f5f50535e7c74e5.tar.zst freebsd-ports-gnome-cb23d0a82a0e6058f98186203f5f50535e7c74e5.zip | |
- Fix install on FreeBSD >= 6.x [1]
- Make portlint(1) happy [2]
PR: ports/92754 [1]
Submitted by: maintainer [1]
Reported by: kris [1]
Approved by: maintainer [2]
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/ksh93/Makefile | 15 | ||||
| -rw-r--r-- | shells/ksh93/pkg-plist | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 0c9d38d60436..d1686725e228 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -7,7 +7,6 @@ PORTNAME= ksh93 PORTVERSION= ${VERSION:S/-//g} CATEGORIES= shells -FETCH_ENV= HTTP_AUTH='basic:*:I accept www.opensource.org/licenses/cpl:.' MASTER_SITES= http://www.research.att.com/~gsf/download/tgz/ DISTNAME= ${PORTNAME}-${VERSION} DISTFILES= INIT.${VERSION}.tgz ast-ksh.${VERSION}.tgz @@ -17,8 +16,9 @@ MAINTAINER= joe@zircon.seattle.wa.us COMMENT= Official AT&T release of KornShell 93 VERSION= 2006-01-24 -RESTRICTED= "Source recipient must acknowledge license" +RESTRICTED= Source recipient must acknowledge license +FETCH_ENV= HTTP_AUTH='basic:*:I accept www.opensource.org/licenses/cpl:.' FETCH_CMD= /usr/bin/fetch -Rr # see bin/76134 NO_WRKSUBDIR= yes MAKE_ENV= CCFLAGS="${CFLAGS}" SHELL="${SH}" @@ -27,16 +27,21 @@ MAKE_ENV+= LDFLAGS=-static .endif MAN1= ksh93.1 -INSTALLROOT= ${WRKSRC}/arch/freebsd.${ARCH} .include <bsd.port.pre.mk> +.if (${OSVERSION} >= 600000) +INSTALLROOT= ${WRKSRC}/arch/freebsd${OSREL:R}.${ARCH} +.else +INSTALLROOT= ${WRKSRC}/arch/freebsd.${ARCH} +.endif + .if ${ARCH} == "sparc64" -BROKEN= "Does not compile on sparc64" +BROKEN= Does not compile on sparc64 .endif do-build: - @cd ${WRKSRC} && env -i ${MAKE_ENV} ${SH} bin/package make + @cd ${WRKSRC} && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package make do-install: ${INSTALL_PROGRAM} ${INSTALLROOT}/bin/ksh ${PREFIX}/bin/ksh93 diff --git a/shells/ksh93/pkg-plist b/shells/ksh93/pkg-plist index 6c29fc976008..fa4cb8a5e905 100644 --- a/shells/ksh93/pkg-plist +++ b/shells/ksh93/pkg-plist @@ -2,7 +2,7 @@ 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; 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 -share/examples/ksh93/dirs -share/examples/ksh93/popd -share/examples/ksh93/pushd -@dirrm share/examples/ksh93 +%%EXAMPLESDIR%%/dirs +%%EXAMPLESDIR%%/popd +%%EXAMPLESDIR%%/pushd +@dirrm %%EXAMPLESDIR%% |