Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Oct 2013 21:27:38 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330461 - head/chinese/fortunetw
Message-ID:  <201310152127.r9FLRcvV011613@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Tue Oct 15 21:27:37 2013
New Revision: 330461
URL: http://svnweb.freebsd.org/changeset/ports/330461

Log:
  - Convert to staging
  - Remove long 'usage' instructions
  - Unsilence install commands

Modified:
  head/chinese/fortunetw/Makefile

Modified: head/chinese/fortunetw/Makefile
==============================================================================
--- head/chinese/fortunetw/Makefile	Tue Oct 15 21:17:55 2013	(r330460)
+++ head/chinese/fortunetw/Makefile	Tue Oct 15 21:27:37 2013	(r330461)
@@ -15,40 +15,29 @@ NO_BUILD=	yes
 
 STRCMD=		/usr/games/strfile
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/bsdchat ${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/folksong ${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/liuyong ${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/stephehchow ${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/tangshi ${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/xiaoxing ${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/yijing ${PREFIX}/share/games/fortune
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/bsdchat ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/folksong ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/liuyong ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/stephehchow ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/tangshi ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/xiaoxing ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/yijing ${STAGEDIR}${PREFIX}/share/games/fortune
 
 pre-install:
 .if !exists(${STRCMD})
 	@${ECHO_MSG}	"Please install the games distribution"
-	@exit 1
+	@${FALSE}
 .endif
 
 post-install:
-	@${STRCMD} ${PREFIX}/share/games/fortune/bsdchat
-	@${STRCMD} ${PREFIX}/share/games/fortune/folksong
-	@${STRCMD} ${PREFIX}/share/games/fortune/liuyong
-	@${STRCMD} ${PREFIX}/share/games/fortune/stephehchow
-	@${STRCMD} ${PREFIX}/share/games/fortune/tangshi
-	@${STRCMD} ${PREFIX}/share/games/fortune/xiaoxing
-	@${STRCMD} ${PREFIX}/share/games/fortune/yijing
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Usage:"
-	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/bsdchat"
-	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/folksong"
-	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/liuyong"
-	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/stephehchow"
-	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/tangshi"
-	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/xiaoxing"
-	@${ECHO_MSG} "${STRCMD} ${PREFIX}/share/games/fortune/yijing"
-	@${ECHO_MSG} ""
+	${STRCMD} ${STAGEDIR}${PREFIX}/share/games/fortune/bsdchat
+	${STRCMD} ${STAGEDIR}${PREFIX}/share/games/fortune/folksong
+	${STRCMD} ${STAGEDIR}${PREFIX}/share/games/fortune/liuyong
+	${STRCMD} ${STAGEDIR}${PREFIX}/share/games/fortune/stephehchow
+	${STRCMD} ${STAGEDIR}${PREFIX}/share/games/fortune/tangshi
+	${STRCMD} ${STAGEDIR}${PREFIX}/share/games/fortune/xiaoxing
+	${STRCMD} ${STAGEDIR}${PREFIX}/share/games/fortune/yijing
 
 .include <bsd.port.mk>



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