Date: Tue, 24 Sep 2013 21:21:31 GMT From: Olivier Duchateau <olivierd@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/182358: [UPDATE] shells/mksh to R48b Message-ID: <201309242121.r8OLLV6w006532@oldred.freebsd.org> Resent-Message-ID: <201309242130.r8OLU0Eo084989@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182358 >Category: ports >Synopsis: [UPDATE] shells/mksh to R48b >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Sep 24 21:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: >Organization: >Environment: >Description: - Update to R48b - Convert to new option framework - Remove article from the COMMENT line - Support STAGEDIR >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (révision 328195) +++ Makefile (copie de travail) @@ -2,38 +2,37 @@ # $FreeBSD$ PORTNAME= mksh -DISTVERSION= R46 +DISTVERSION= R48b CATEGORIES= shells MASTER_SITES= http://www.mirbsd.org/MirOS/dist/mir/mksh/ \ http://pub.allbsd.org/MirOS/dist/mir/mksh/ DISTFILES= ${PORTNAME}-${DISTVERSION}.tgz MAINTAINER= miwi@FreeBSD.org -COMMENT= A MirBSD enhanced shell based on pdksh +COMMENT= MirBSD enhanced shell based on pdksh WRKSRC= ${WRKDIR}/${PORTNAME} -MAN1= mksh.1 +NEED_ROOT= yes -NO_STAGE= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> do-build: cd ${WRKSRC} && CFLAGS="${CFLAGS}" CC="${CC}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" SHELL=${SH} ${SH} ${WRKSRC}/Build.sh -r -c lto do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mksh ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/mksh.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${EXAMPLESDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/mksh ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/mksh.1 ${STAGEDIR}${MANPREFIX}/man/man1 +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${STAGEDIR}${EXAMPLESDIR} .endif post-install: @${ECHO_MSG} "updating /etc/shells" @${CP} /etc/shells /etc/shells.bak - @(${GREP} -v ${PREFIX}/bin/mksh /etc/shells.bak; \ - ${ECHO_CMD} ${PREFIX}/bin/mksh) > /etc/shells + @(${GREP} -v ${STAGEDIR}${PREFIX}/bin/mksh /etc/shells.bak; \ + ${ECHO_CMD} ${STAGEDIR}${PREFIX}/bin/mksh) > /etc/shells @${RM} /etc/shells.bak -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: distinfo =================================================================== --- distinfo (révision 328195) +++ distinfo (copie de travail) @@ -1,2 +1,2 @@ -SHA256 (mksh-R46.tgz) = dbe6bf60b111a962ed33eb16dffa4d726d62dc0d60ad5429f0d575fc430af05a -SIZE (mksh-R46.tgz) = 349524 +SHA256 (mksh-R48b.tgz) = e67686187ba6dfbf99b7f6b5f841dfb5cd9f980504f8b631d7d3bfd98d345792 +SIZE (mksh-R48b.tgz) = 362969 Index: pkg-plist =================================================================== --- pkg-plist (révision 328195) +++ pkg-plist (copie de travail) @@ -1,5 +1,6 @@ bin/mksh -@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 +man/man1/mksh.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.mkshrc %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309242121.r8OLLV6w006532>