Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2013 08:32:02 +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: r337651 - head/shells/ksh93
Message-ID:  <201312270832.rBR8W282032587@svn.freebsd.org>

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

Log:
  Support stage

Modified:
  head/shells/ksh93/Makefile
  head/shells/ksh93/pkg-plist   (contents, props changed)

Modified: head/shells/ksh93/Makefile
==============================================================================
--- head/shells/ksh93/Makefile	Fri Dec 27 08:24:48 2013	(r337650)
+++ head/shells/ksh93/Makefile	Fri Dec 27 08:32:02 2013	(r337651)
@@ -31,12 +31,9 @@ LDFLAGS+=	-lm
 MAKE_ENV=	CCFLAGS="${CFLAGS}"
 NO_WRKSUBDIR=	yes
 
-MAN1=		ksh93.1
-
 INITVERSION=	2013-05-24
 KSHVERSION=	2012-08-01
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSTATIC}
@@ -51,17 +48,10 @@ do-build:
 	@cd ${WRKSRC}/ && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${PREFIX}/bin/ksh93
-	${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${MAN1PREFIX}/man/man1/ksh93.1
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/
-	cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${EXAMPLESDIR}/
-.endif
-
-post-install:
-	@${ECHO} "Updating /etc/shells"
-	@${SED} -i '' '\|${PREFIX}/bin/ksh93|d' /etc/shells
-	@${ECHO} ${PREFIX}/bin/ksh93 >> /etc/shells
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/ksh93
+	${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ksh93.1
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}/
 
 test: build
 	@cd ${WRKSRC}/src/cmd/ksh93/tests/ && \

Modified: head/shells/ksh93/pkg-plist
==============================================================================
--- head/shells/ksh93/pkg-plist	Fri Dec 27 08:24:48 2013	(r337650)
+++ head/shells/ksh93/pkg-plist	Fri Dec 27 08:32:02 2013	(r337651)
@@ -1,4 +1,5 @@
 bin/ksh93
+man/man1/ksh93.1.gz
 @exec echo "Updating /etc/shells"; sed -i "" "\|%D/%F|d" /etc/shells; echo %D/%F >> /etc/shells
 @unexec echo "Updating /etc/shells"; sed -i "" "\|%D/%F|d" /etc/shells
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dirs



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