svn commit: r332349 - in head/shells: bash-devel bash-static-devel

[Emanuel Haupt]

Author: ehaupt
Date: Fri Nov  1 10:29:18 2013
New Revision: 332349
URL: http://svnweb.freebsd.org/changeset/ports/332349

Log:
  Support staging.

Deleted:
  head/shells/bash-devel/pkg-deinstall
  head/shells/bash-devel/pkg-install
Modified:
  head/shells/bash-devel/Makefile
  head/shells/bash-devel/pkg-plist
  head/shells/bash-static-devel/Makefile

Modified: head/shells/bash-devel/Makefile
==============================================================================
--- head/shells/bash-devel/Makefile	Fri Nov  1 10:26:17 2013	(r332348)
+++ head/shells/bash-devel/Makefile	Fri Nov  1 10:29:18 2013	(r332349)
@@ -33,7 +33,6 @@ HELP_DESC=		Enable builtin help
 
 USES=			bison
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMPLICITCD}
@@ -44,7 +43,6 @@ EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-
 EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-colonbreakswords
 .endif
 
-MAN1=			bash.1 bashbug.1
 INFO=			bash
 
 MAKE_JOBS_UNSAFE=	yes
@@ -107,22 +105,16 @@ post-configure:
 pre-build:
 	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build
 
-pre-install:
-	@${SETENV} PKG_PREFIX="${PREFIX}" \
-		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
-	@cd ${PREFIX}/bin ; ${LN} -sf bash rbash
+	@cd ${STAGEDIR}${PREFIX}/bin ; ${LN} -sf bash rbash
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ \
-		${WRKSRC}/doc/INTRO ${DOCSDIR}
+		${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR}
 	@for d in ${PORTDOCS:NFAQ:NINTRO}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${d} ${DOCSDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \
 	done
 .endif
-	@${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 regress: build
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test
@@ -130,6 +122,7 @@ regress: build
 ckp:
 	${MAKE} -DPATCH_DEBUG clean patch
 
+# requires ftp/ncftp3
 cklatest:
 	@${ECHO} -n "Currently at: "
 	@${MAKE} -V PATCHLEVEL

Modified: head/shells/bash-devel/pkg-plist
==============================================================================
--- head/shells/bash-devel/pkg-plist	Fri Nov  1 10:26:17 2013	(r332348)
+++ head/shells/bash-devel/pkg-plist	Fri Nov  1 10:29:18 2013	(r332349)
@@ -1,7 +1,13 @@
 @comment $FreeBSD$
 bin/bash
+ at 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
+ at 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
 bin/rbash
+ at exec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
+ at unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 bin/bashbug
+man/man1/bash.1.gz
+man/man1/bashbug.1.gz
 %%NLS%%share/locale/af/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/bash.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/bash.mo

Modified: head/shells/bash-static-devel/Makefile
==============================================================================
--- head/shells/bash-static-devel/Makefile	Fri Nov  1 10:26:17 2013	(r332348)
+++ head/shells/bash-static-devel/Makefile	Fri Nov  1 10:29:18 2013	(r332349)
@@ -5,5 +5,4 @@ MASTERDIR=	${.CURDIR}/../../shells/bash-
 
 OPTIONS_SLAVE=	STATIC
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"