Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2013 08:43:20 +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: r337655 - head/shells/osh
Message-ID:  <201312270843.rBR8hKrL036561@svn.freebsd.org>

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

Log:
  Support stage

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

Modified: head/shells/osh/Makefile
==============================================================================
--- head/shells/osh/Makefile	Fri Dec 27 08:41:30 2013	(r337654)
+++ head/shells/osh/Makefile	Fri Dec 27 08:43:20 2013	(r337655)
@@ -7,41 +7,17 @@ CATEGORIES=	shells
 MASTER_SITES=	http://v6shell.org/src/
 
 MAINTAINER=	miwi@FreeBSD.org
-COMMENT=	An implementation of the UNIX 6th Edition shell
+COMMENT=	Implementation of the UNIX 6th Edition shell
 
 MAKE_ENV+=	DOCDIR=${DOCSDIR} \
 		DESTEXPDIR=${EXAMPLESDIR} \
 		MANDIR=${MANPREFIX}/man/man1
 
-MAN1=		fd2.1 goto.1 if.1 osh.1 sh6.1 glob6.1
-
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|(DESTEXPDIR)=|\1?=|' \
 		${WRKSRC}/Makefile
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e /^install-doc/d \
-		-e /\ $$\(DESTDOCDIR\)/d \
-		-e 's/install-doc//' \
-		${WRKSRC}/Makefile
-.endif
-.if defined(NOPORTEXAMPLES)
-	@${REINPLACE_CMD} -e /^install-exp/d \
-		-e /\ $$\(DESTEXPDIR\)/d \
-		-e 's/install-exp//' \
-		${WRKSRC}/Makefile
-.endif
-
-post-install:
-	@${ECHO_MSG} "updating /etc/shells"
-	@${CP} /etc/shells /etc/shells.bak
-	@(${GREP} -v ${PREFIX}/bin/osh /etc/shells.bak; \
-	 ${ECHO_CMD} ${PREFIX}/bin/osh) > /etc/shells
-	@${RM} /etc/shells.bak
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/shells/osh/pkg-plist
==============================================================================
--- head/shells/osh/pkg-plist	Fri Dec 27 08:41:30 2013	(r337654)
+++ head/shells/osh/pkg-plist	Fri Dec 27 08:43:20 2013	(r337655)
@@ -4,5 +4,11 @@ bin/if
 bin/osh
 bin/sh6
 bin/glob6
+man/man1/fd2.1.gz
+man/man1/glob6.1.gz
+man/man1/goto.1.gz
+man/man1/if.1.gz
+man/man1/osh.1.gz
+man/man1/sh6.1.gz
 @exec echo "updating ${DESTDIR}/etc/shells"; cp ${DESTDIR}/etc/shells ${DESTDIR}/etc/shells.bak; (grep -v %D/%F ${DESTDIR}/etc/shells.bak; echo %D/%F) >${DESTDIR}/etc/shells
 @unexec echo "updating ${DESTDIR}/etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells



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