Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2013 08:39:32 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337653 - head/shells/mksh
Message-ID:  <201312270839.rBR8dWZf033540@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Dec 27 08:39:32 2013
New Revision: 337653
URL: http://svnweb.freebsd.org/changeset/ports/337653

Log:
  Support stage

Modified:
  head/shells/mksh/Makefile
  head/shells/mksh/pkg-plist

Modified: head/shells/mksh/Makefile
==============================================================================
--- head/shells/mksh/Makefile	Fri Dec 27 08:34:05 2013	(r337652)
+++ head/shells/mksh/Makefile	Fri Dec 27 08:39:32 2013	(r337653)
@@ -9,31 +9,17 @@ MASTER_SITES=	http://www.mirbsd.org/MirO
 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
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 do-build:
-	cd ${WRKSRC} && CFLAGS="${CFLAGS}" CC="${CC}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" SHELL=${SH} ${SH} ${WRKSRC}/Build.sh -r -c lto
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} 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}
-.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
-	@${RM} /etc/shells.bak
+	${INSTALL_PROGRAM} ${WRKSRC}/mksh ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mksh.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/dot.mkshrc ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/shells/mksh/pkg-plist
==============================================================================
--- head/shells/mksh/pkg-plist	Fri Dec 27 08:34:05 2013	(r337652)
+++ head/shells/mksh/pkg-plist	Fri Dec 27 08:39:32 2013	(r337653)
@@ -1,4 +1,5 @@
 bin/mksh
+man/man1/mksh.1.gz
 @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
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.mkshrc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312270839.rBR8dWZf033540>