Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2013 08:34:06 +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: r337652 - head/shells/lshell
Message-ID:  <201312270834.rBR8Y6nl032913@svn.freebsd.org>

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

Log:
  Support stage

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

Modified: head/shells/lshell/Makefile
==============================================================================
--- head/shells/lshell/Makefile	Fri Dec 27 08:32:02 2013	(r337651)
+++ head/shells/lshell/Makefile	Fri Dec 27 08:34:05 2013	(r337652)
@@ -12,31 +12,17 @@ COMMENT=	Shell environment to limited se
 USE_PYDISTUTILS=	yes
 USE_PYTHON=	yes
 
-SHELLS=		/etc/shells
-
-MAN1=	lshell.1
-
 PORTDOCS=	CHANGES COPYING README
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g; \
-		s|share/man|${LOCALBASE}/man|g; 45d' ${WRKSRC}/setup.py
+		s|share/man|${MANPREFIX}/man|g; 45d' ${WRKSRC}/setup.py
+
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	@${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
-	@if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \
-	${INSTALL_DATA} -p ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf ; \
-	fi
-	@${ECHO_MSG} "Updating ${SHELLS}"
-	@${CP} ${SHELLS} ${SHELLS}.bak
-	@(${GREP} -v ${PREFIX}/bin/${PORTNAME} ${SHELLS}.bak; \
-	  ${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > ${SHELLS}
-	@${RM} ${SHELLS}.bak
+	${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>

Modified: head/shells/lshell/pkg-plist
==============================================================================
--- head/shells/lshell/pkg-plist	Fri Dec 27 08:32:02 2013	(r337651)
+++ head/shells/lshell/pkg-plist	Fri Dec 27 08:34:05 2013	(r337652)
@@ -1,4 +1,5 @@
 bin/lshell
+man/man1/lshell.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; 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
 @unexec if cmp -s %D/etc/lshell.conf %D/etc/lshell.conf.sample; then rm -f %D/etc/lshell.conf; fi



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